クラス名変更

git-svn-id: http://192.168.11.7/svn/repository/NicoBrowser/branches/dev20100601_search@333 bdf3b611-c98c-6041-8292-703d9c9adbe7

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 {

diff --git a/src/nicobrowser/search/SearchKind.java b/src/nicobrowser/search/SortKind.java
similarity index 79%
rename from src/nicobrowser/search/SearchKind.java
rename to src/nicobrowser/search/SortKind.java
index 9ee40e6..34c21c9 100644 (file)
--- a/src/nicobrowser/search/SearchKind.java
+++ b/src/nicobrowser/search/SortKind.java
@@ -1,12 +1,12 @@
 /* $Id$ */
 package nicobrowser.search;
 
-public enum SearchKind {
+public enum SortKind {
 
     LastCommentDate("n"), PostDate("f"), PlayTimes("v"), MyListRegistration("m");
     private final String key;
 
-    private SearchKind(String key) {
+    private SortKind(String key) {
         this.key = key;
     }
 

diff --git a/src/nicobrowser/search/SearchOrder.java b/src/nicobrowser/search/SortOrder.java
similarity index 75%
rename from src/nicobrowser/search/SearchOrder.java
rename to src/nicobrowser/search/SortOrder.java
index cf71adf..b562b50 100644 (file)
--- a/src/nicobrowser/search/SearchOrder.java
+++ b/src/nicobrowser/search/SortOrder.java
@@ -1,12 +1,12 @@
 /* $Id$ */
 package nicobrowser.search;
 
-public enum SearchOrder {
+public enum SortOrder {
 
     Descending("d"), Ascending("a");
     private final String key;
 
-    private SearchOrder(String key) {
+    private SortOrder(String key) {
         this.key = key;
     }
 

diff --git a/test/nicobrowser/NicoHttpClientTest.java b/test/nicobrowser/NicoHttpClientTest.java
index f028235..d573312 100644 (file)
--- a/test/nicobrowser/NicoHttpClientTest.java
+++ b/test/nicobrowser/NicoHttpClientTest.java
@@ -15,8 +15,8 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.EntityTransaction;
 import javax.persistence.Persistence;
 import nicobrowser.entity.NicoContent.Status;
-import nicobrowser.search.SearchKind;
-import nicobrowser.search.SearchOrder;
+import nicobrowser.search.SortKind;
+import nicobrowser.search.SortOrder;
 import nicobrowser.search.SearchResult;
 import org.apache.http.HttpException;
 import org.junit.After;
@@ -227,7 +227,7 @@ public class NicoHttpClientTest {
         System.out.println("search");
         instance.login(OK_MAIL, OK_PASS);
 
-        SearchResult result = instance.search("初音ミク", SearchKind.PlayTimes, SearchOrder.Descending, 1);
+        SearchResult result = instance.search("初音ミク", SortKind.PlayTimes, SortOrder.Descending, 1);
         ArrayList<NicoContent> conts = result.getContents();
         System.out.println("検索結果件数： " + conts.size());
         assertEquals("1ページの上限20件がヒット", 20, conts.size());