From b3ff122e270347e7079e84f7c85c0d4d2874fe22 Mon Sep 17 00:00:00 2001
From: yukihane <yukihane.feather@gmail.com>
Date: Wed, 24 Aug 2011 14:18:07 +0900
Subject: [PATCH] =?utf8?q?=E3=82=B3=E3=83=B3=E3=83=95=E3=82=A3=E3=82=B0?=
 =?utf8?q?=E3=82=AF=E3=83=A9=E3=82=B9=E3=83=91=E3=83=83=E3=82=B1=E3=83=BC?=
 =?utf8?q?=E3=82=B8=E7=A7=BB=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../inqubus/{config/Properties.java => Config.java}         |  4 ++--
 frontend/src/yukihane/inqubus/Main.java                     |  3 +--
 frontend/src/yukihane/inqubus/gui/MainFrame.java            |  8 ++++----
 .../inqubus/{config/PropertiesTest.java => ConfigTest.java} | 13 +++++++------
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename frontend/src/yukihane/inqubus/{config/Properties.java => Config.java} (99%)
 rename frontend/test/yukihane/inqubus/{config/PropertiesTest.java => ConfigTest.java} (94%)

diff --git a/frontend/src/yukihane/inqubus/config/Properties.java b/frontend/src/yukihane/inqubus/Config.java
similarity index 99%
rename from frontend/src/yukihane/inqubus/config/Properties.java
rename to frontend/src/yukihane/inqubus/Config.java
index d777431..891024b 100644
--- a/frontend/src/yukihane/inqubus/config/Properties.java
+++ b/frontend/src/yukihane/inqubus/Config.java
@@ -1,4 +1,4 @@
-package yukihane.inqubus.config;
+package yukihane.inqubus;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -6,7 +6,7 @@ import java.util.List;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.XMLConfiguration;
 
-public enum Properties {
+public enum Config {
 
     INSTANCE;
     private final XMLConfiguration config = new XMLConfiguration();
diff --git a/frontend/src/yukihane/inqubus/Main.java b/frontend/src/yukihane/inqubus/Main.java
index 16ef44f..450faea 100644
--- a/frontend/src/yukihane/inqubus/Main.java
+++ b/frontend/src/yukihane/inqubus/Main.java
@@ -9,7 +9,6 @@ import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
 import javax.swing.UnsupportedLookAndFeelException;
 import org.apache.commons.configuration.ConfigurationException;
-import yukihane.inqubus.config.Properties;
 import yukihane.inqubus.gui.MainFrame;
 
 /**
@@ -24,7 +23,7 @@ public class Main {
         final FileSystem fileSystem = FileSystems.getDefault();
         final Path path = fileSystem.getPath("inqubus.xml");
         try {
-            Properties.INSTANCE.load(path.toString());
+            Config.INSTANCE.load(path.toString());
         } catch (ConfigurationException ex) {
             logger.log(Level.FINE, "コンフィグファイルが無いためデフォルト値で起動", ex);
         }
diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java
index 64095c8..27e6e3b 100644
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -32,7 +32,7 @@ import javax.swing.JTextField;
 import javax.swing.KeyStroke;
 import javax.swing.TransferHandler;
 import saccubus.MainFrame_AboutBox;
-import yukihane.inqubus.config.Properties;
+import yukihane.inqubus.Config;
 import yukihane.inqubus.model.Target;
 import yukihane.inqubus.model.TargetsTableModel;
 
@@ -315,7 +315,7 @@ public class MainFrame extends javax.swing.JFrame {
     }
 
     private void useMovieLocalCheckBoxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_useMovieLocalCheckBoxItemStateChanged
-        final Properties p = Properties.INSTANCE;
+        final Config p = Config.INSTANCE;
 
         final ItemSelectable source = evt.getItemSelectable();
 
@@ -355,7 +355,7 @@ public class MainFrame extends javax.swing.JFrame {
     }//GEN-LAST:event_outputConvertCheckBoxItemStateChanged
 
     private void idFieldFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_idFieldFocusLost
-        final Properties p = Properties.INSTANCE;
+        final Config p = Config.INSTANCE;
         final String id = idField.getText();
         if (id.isEmpty()) {
             return;
@@ -406,7 +406,7 @@ public class MainFrame extends javax.swing.JFrame {
     private void initInputPanel() {
         idField.setText("");
 
-        final Properties p = Properties.INSTANCE;
+        final Config p = Config.INSTANCE;
 
         final boolean movieLocal = p.getVideoUseLocal();
         useMovieLocalCheckBox.setSelected(movieLocal);
diff --git a/frontend/test/yukihane/inqubus/config/PropertiesTest.java b/frontend/test/yukihane/inqubus/ConfigTest.java
similarity index 94%
rename from frontend/test/yukihane/inqubus/config/PropertiesTest.java
rename to frontend/test/yukihane/inqubus/ConfigTest.java
index c06a010..3720a69 100644
--- a/frontend/test/yukihane/inqubus/config/PropertiesTest.java
+++ b/frontend/test/yukihane/inqubus/ConfigTest.java
@@ -1,5 +1,6 @@
-package yukihane.inqubus.config;
+package yukihane.inqubus;
 
+import yukihane.inqubus.Config;
 import java.io.File;
 import static org.junit.Assert.*;
 
@@ -14,25 +15,25 @@ import org.junit.Test;
  *
  * @author yuki
  */
-public class PropertiesTest {
+public class ConfigTest {
 
-    private final Properties p = Properties.INSTANCE;
+    private final Config p = Config.INSTANCE;
 
     @Before
     public void setUp() {
-        Properties.INSTANCE.clear();
+        Config.INSTANCE.clear();
     }
 
     @After
     public void tearDown() {
-        Properties.INSTANCE.clear();
+        Config.INSTANCE.clear();
     }
 
     @Test
     public void testLoadFail() {
         FileSystem fs = FileSystems.getDefault();
         System.out.println(fs.getPath(".").toAbsolutePath());
-        Properties p = Properties.INSTANCE;
+        Config p = Config.INSTANCE;
         try {
             p.load("test/testdata/error.xml");
             fail("ファイルが存在しないので読み込みに失敗するはず");
-- 
2.11.0