コンフィグ読み書きテストケース

[coroid/inqubus.git] / frontend / src / yukihane / inqubus / config / Properties.java

diff --git a/frontend/src/yukihane/inqubus/config/Properties.java b/frontend/src/yukihane/inqubus/config/Properties.java
index f22da47..d777431 100644 (file)
--- a/frontend/src/yukihane/inqubus/config/Properties.java
+++ b/frontend/src/yukihane/inqubus/config/Properties.java
@@ -2,7 +2,6 @@ package yukihane.inqubus.config;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.XMLConfiguration;
@@ -12,69 +11,92 @@ public enum Properties {
     INSTANCE;
     private final XMLConfiguration config = new XMLConfiguration();
 
-    public String getId() {
-        return config.getString("network.account.id", "");
+    void clear() {
+        config.clear();
     }
 
     /*
      * ネットワーク - アカウント
      */
+    private static final String ACCOUNT_ID = "network.account.id";
+
+    public String getId() {
+        return config.getString(ACCOUNT_ID, "");
+    }
+
     public void setId(String s) {
-        config.setProperty("network.account.id", s);
+        config.setProperty(ACCOUNT_ID, s);
     }
+    private static final String ACCOUNT_PASSWORD = "network.account.password";
 
     public String getPassword() {
-        return config.getString("network.account.password", "");
+        return config.getString(ACCOUNT_PASSWORD, "");
     }
 
     public void setPassword(String s) {
-        config.setProperty("network.account.password", s);
+        config.setProperty(ACCOUNT_PASSWORD, s);
     }
 
     /*
      * ネットワーク - プロキシ
      */
+    private static final String PROXY_USE = "network.proxy.use";
+
     public boolean getUseProxy() {
-        return config.getBoolean("network.proxy.use", false);
+        return config.getBoolean(PROXY_USE, false);
     }
 
     public void setUseProxy(boolean s) {
-        config.setProperty("network.proxy.use", s);
+        config.setProperty(PROXY_USE, s);
     }
+    private static final String PROXY_HOST = "network.proxy.host";
 
     public String getProxyHost() {
-        return config.getString("network.proxy.host", "");
+        return config.getString(PROXY_HOST, "localhost");
     }
 
     public void setProxyHost(String s) {
-        config.setProperty("network.proxy.host", s);
+        config.setProperty(PROXY_HOST, s);
+    }
+    private static final String PROXY_PORT = "network.proxy.port";
+
+    public String getProxyPort() {
+        return config.getString(PROXY_PORT, "8080");
+    }
+
+    public void setProxyPort(String s) {
+        config.setProperty(PROXY_PORT, s);
     }
 
     /*
      * ファイル - 動画
      */
-    public File getVideoDir() {
-        return new File(config.getString("file.video.dir", "in/video"));
+    private static final String FILE_VIDEO_DIR = "file.video.dir";
+
+    public String getVideoDir() {
+        return config.getString(FILE_VIDEO_DIR, "in/video");
     }
 
-    public void setVideoDir(File s) {
-        config.setProperty("file.video.dir", s.toString());
+    public void setVideoDir(String s) {
+        config.setProperty(FILE_VIDEO_DIR, s);
     }
+    private static final String FILE_VIDEO_FILENAME = "file.video.filename";
 
     public String getVideoFileNamePattern() {
-        return config.getString("file.video.filename", "[{id}]{title}");
+        return config.getString(FILE_VIDEO_FILENAME, "[{id}]{title}");
     }
 
     public void setVideoFileNamePattern(String s) {
-        config.setProperty("file.video.filename", s.toString());
+        config.setProperty(FILE_VIDEO_FILENAME, s.toString());
     }
+    private static final String FILE_VIDEO_LOCAL = "file.video.local";
 
     public boolean getVideoUseLocal() {
-        return config.getBoolean("file.video.local", false);
+        return config.getBoolean(FILE_VIDEO_LOCAL, false);
     }
 
     public void setVideoUseLocal(boolean s) {
-        config.setProperty("file.video.local", s);
+        config.setProperty(FILE_VIDEO_LOCAL, s);
     }
 
     /*
@@ -82,12 +104,12 @@ public enum Properties {
      */
     private static final String FILE_COMMENT_DIR = "file.comment.dir";
 
-    public File getCommentDir() {
-        return new File(config.getString(FILE_COMMENT_DIR, "in/comment"));
+    public String getCommentDir() {
+        return config.getString(FILE_COMMENT_DIR, "in/comment");
     }
 
-    public void setCommentDir(File s) {
-        config.setProperty(FILE_COMMENT_DIR, s.toString());
+    public void setCommentDir(String s) {
+        config.setProperty(FILE_COMMENT_DIR, s);
     }
     private static final String FILE_COMMENT_FILENAME = "file.comment.filename";
 
@@ -113,12 +135,12 @@ public enum Properties {
      */
     private static final String FILE_OUTPUT_DIR = "file.output.dir";
 
-    public File getOutputDir() {
-        return new File(config.getString(FILE_OUTPUT_DIR, "out"));
+    public String getOutputDir() {
+        return config.getString(FILE_OUTPUT_DIR, "out");
     }
 
-    public void setOutputDir(File s) {
-        config.setProperty(FILE_OUTPUT_DIR, s.toString());
+    public void setOutputDir(String s) {
+        config.setProperty(FILE_OUTPUT_DIR, s);
     }
     private static final String FILE_OUTPUT_FILENAME = "file.output.filename";