Configクラスをパッケージ移動

diff --git a/src/nicobrowser/Config.java b/src/nicobrowser/config/Config.java
similarity index 99%
rename from src/nicobrowser/Config.java
rename to src/nicobrowser/config/Config.java
index 2e0b89e..8b8e6db 100644 (file)
--- a/src/nicobrowser/Config.java
+++ b/src/nicobrowser/config/Config.java
@@ -1,5 +1,5 @@
 /*$Id$*/
-package nicobrowser;
+package nicobrowser.config;
 
 import java.io.BufferedReader;
 import java.io.File;

diff --git a/src/nicobrowser/gui/config/ConfigFrame.java b/src/nicobrowser/gui/config/ConfigFrame.java
index c4dbd88..98e178d 100644 (file)
--- a/src/nicobrowser/gui/config/ConfigFrame.java
+++ b/src/nicobrowser/gui/config/ConfigFrame.java
@@ -7,14 +7,13 @@
  */
 package nicobrowser.gui.config;
 
-import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.JTextField;
 import javax.swing.UIManager;
-import nicobrowser.Config;
+import nicobrowser.config.Config;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.io.FilenameUtils;

diff --git a/src/nicobrowser/main/Main.java b/src/nicobrowser/main/Main.java
index 2448e15..6051e9b 100644 (file)
--- a/src/nicobrowser/main/Main.java
+++ b/src/nicobrowser/main/Main.java
@@ -14,9 +14,9 @@ import javax.persistence.Persistence;
 import javax.persistence.Query;
 import javax.swing.JFrame;
 import javax.swing.SwingUtilities;
-import nicobrowser.Config;
+import nicobrowser.config.Config;
 import nicobrowser.GetFlvResult;
-import nicobrowser.Config.NicoFeed;
+import nicobrowser.config.Config.NicoFeed;
 import nicobrowser.NamePattern;
 import nicobrowser.NicoHttpClient;
 import nicobrowser.ProgressListener;

diff --git a/src/nicobrowser/update/DBUpdater.java b/src/nicobrowser/update/DBUpdater.java
index ce6199c..572ecbf 100644 (file)
--- a/src/nicobrowser/update/DBUpdater.java
+++ b/src/nicobrowser/update/DBUpdater.java
@@ -12,7 +12,7 @@ import java.sql.DriverManager;
 import java.sql.Statement;
 import liquibase.commandline.Main;
 import liquibase.exception.CommandLineParsingException;
-import nicobrowser.Config;
+import nicobrowser.config.Config;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

diff --git a/test/nicobrowser/ConfigTest.java b/test/nicobrowser/config/ConfigTest.java
similarity index 99%
rename from test/nicobrowser/ConfigTest.java
rename to test/nicobrowser/config/ConfigTest.java
index 50af87d..5088274 100644 (file)
--- a/test/nicobrowser/ConfigTest.java
+++ b/test/nicobrowser/config/ConfigTest.java
@@ -1,12 +1,12 @@
 /*$Id$*/
-package nicobrowser;
+package nicobrowser.config;
 
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
 import java.util.Arrays;
 import java.util.List;
-import nicobrowser.Config.NicoFeed;
+import nicobrowser.config.Config.NicoFeed;
 import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.BeforeClass;