NicoFeedクラス移動

diff --git a/src/nicobrowser/config/Config.java b/src/nicobrowser/config/Config.java
index 8b8e6db..ae54645 100644 (file)
--- a/src/nicobrowser/config/Config.java
+++ b/src/nicobrowser/config/Config.java
@@ -19,34 +19,6 @@ import org.apache.commons.logging.LogFactory;
 
 public final class Config {
 
-    /**
-     * feedurl.txtから取得した情報を格納する.
-     */
-    public static class NicoFeed {
-
-        private final String url;
-        private final int number;
-
-        public NicoFeed(String url, int number) {
-            this.url = url;
-            this.number = number;
-        }
-
-        /** @return 上位いくつまでダウンロード対象とするか. */
-        public int getNumber() {
-            return number;
-        }
-
-        /** @return フィードのURL. */
-        public String getUrl() {
-            return url;
-        }
-
-        @Override
-        public String toString() {
-            return getUrl() + ", " + getNumber();
-        }
-    }
     private static Log log = LogFactory.getLog(Config.class);
     private static Config instance;
     private final PropertiesConfiguration properties;

diff --git a/src/nicobrowser/config/NicoFeed.java b/src/nicobrowser/config/NicoFeed.java
new file mode 100644 (file)
index 0000000..fa3af76
--- /dev/null
+++ b/src/nicobrowser/config/NicoFeed.java
@@ -0,0 +1,30 @@
+package nicobrowser.config;
+
+    /**
+     * feedurl.txtから取得した情報を格納する.
+     */
+    public class NicoFeed {
+
+        private final String url;
+        private final int number;
+
+        public NicoFeed(String url, int number) {
+            this.url = url;
+            this.number = number;
+        }
+
+        /** @return 上位いくつまでダウンロード対象とするか. */
+        public int getNumber() {
+            return number;
+        }
+
+        /** @return フィードのURL. */
+        public String getUrl() {
+            return url;
+        }
+
+        @Override
+        public String toString() {
+            return getUrl() + ", " + getNumber();
+        }
+    }

diff --git a/src/nicobrowser/main/Main.java b/src/nicobrowser/main/Main.java
index 6051e9b..f184d51 100644 (file)
--- a/src/nicobrowser/main/Main.java
+++ b/src/nicobrowser/main/Main.java
@@ -16,11 +16,11 @@ import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
 import nicobrowser.config.Config;
 import nicobrowser.GetFlvResult;
-import nicobrowser.config.Config.NicoFeed;
 import nicobrowser.NamePattern;
 import nicobrowser.NicoHttpClient;
 import nicobrowser.ProgressListener;
 import nicobrowser.VideoInfo;
+import nicobrowser.config.NicoFeed;
 import nicobrowser.entity.NicoContent;
 import nicobrowser.entity.NicoContent.Status;
 import nicobrowser.gui.config.ConfigFrame;

diff --git a/test/nicobrowser/config/ConfigTest.java b/test/nicobrowser/config/ConfigTest.java
index 5088274..2ec0c35 100644 (file)
--- a/test/nicobrowser/config/ConfigTest.java
+++ b/test/nicobrowser/config/ConfigTest.java
@@ -6,7 +6,6 @@ import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
-import nicobrowser.config.Config.NicoFeed;
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.BeforeClass;
@@ -232,14 +231,14 @@ public class ConfigTest {
         System.out.println("testGetFeeds");
         initConfig();
 
-        List<Config.NicoFeed> feeds = Config.getInstance().getNicoFeeds();
+        List<NicoFeed> feeds = Config.getInstance().getNicoFeeds();
         assertEquals(5, feeds.size());
 
         NicoFeed feed = feeds.get(2);
         assertEquals("http://www.nicovideo.jp/tag/科学?sort=f&rss=2.0", feed.getUrl());
         assertEquals(3, feed.getNumber());
 
-        for (Config.NicoFeed nf : feeds) {
+        for (NicoFeed nf : feeds) {
             System.out.println(nf);
         }
     }