クラス名変更

[coroid/NicoBrowser.git] / src / nicobrowser / NicoHttpClient.java

diff --git a/src/nicobrowser/NicoHttpClient.java b/src/nicobrowser/NicoHttpClient.java
index 6b62f02..8a908f8 100644 (file)
--- a/src/nicobrowser/NicoHttpClient.java
+++ b/src/nicobrowser/NicoHttpClient.java
@@ -6,8 +6,8 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.regex.Matcher;
 import nicobrowser.entity.NicoContent;
-import nicobrowser.search.SearchKind;
-import nicobrowser.search.SearchOrder;
+import nicobrowser.search.SortKind;
+import nicobrowser.search.SortOrder;
 import com.sun.syndication.feed.synd.SyndContentImpl;
 import com.sun.syndication.feed.synd.SyndEntryImpl;
 import com.sun.syndication.feed.synd.SyndFeed;
@@ -151,17 +151,17 @@ public class NicoHttpClient {
     /**
      * キーワード検索を行う.
      * @param word 検索キーワード
-     * @param kind 検索種別
+     * @param sort ソート種別
      * @param order ソート順
      * @page 検索結果ページのうち, 結果を返すページ.
      * @return 検索結果.
      */
-    public SearchResult search(String word, SearchKind kind, SearchOrder order, int page) throws IOException {
+    public SearchResult search(SearchKind kind, String word, SortKind sort, SortOrder order, int page) throws IOException {
         log.debug("検索:" + word);
 
         InputStream is = null;
         ArrayList<NicoContent> conts = new ArrayList<NicoContent>();
-        String url = SEARCH_HEAD + word + "?page=" + Integer.toString(page) + "&sort=" + kind.getKey() + "&order=" + order.
+        String url = SEARCH_HEAD + word + "?page=" + Integer.toString(page) + "&sort=" + sort.getKey() + "&order=" + order.
                 getKey();
 
         try {