コンパイルエラー解消

diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java
index eed7037..bbca4ad 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -310,11 +310,11 @@ private void useMovieLocalCheckBoxItemStateChanged(java.awt.event.ItemEvent evt)
     if (source == useMovieLocalCheckBox) {
         btn = movieFileSelectButton;
         field = movieFileField;
-        dir = p.getMovieDirectory();
+        dir = p.getVideoDir();
     } else {
         btn = commentFileSelectButton;
         field = commentFileField;
-        dir = p.getCommentDirectory();
+        dir = p.getCommentDir();
     }
 
     final boolean useLocal = (evt.getStateChange() == ItemEvent.SELECTED);
@@ -329,7 +329,7 @@ private void useMovieLocalCheckBoxItemStateChanged(java.awt.event.ItemEvent evt)
             text = "";
         }
     } else {
-        text = p.getFileNamePattern();
+        text = p.getVideoFileNamePattern();
     }
     field.setText(text);
 }//GEN-LAST:event_useMovieLocalCheckBoxItemStateChanged
@@ -347,7 +347,7 @@ private void idFieldFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_
     }
 
     if (useMovieLocalCheckBox.isSelected() && movieFileField.getText().isEmpty()) {
-        final File dir = p.getMovieDirectory();
+        final File dir = p.getVideoDir();
         final File file = searchFileMatchId(dir, id);
         if (file != null) {
             movieFileField.setText(file.getPath());
@@ -355,7 +355,7 @@ private void idFieldFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_
     }
 
     if (useCommentLocalCheckBox.isSelected() && commentFileField.getText().isEmpty()) {
-        final File dir = p.getCommentDirectory();
+        final File dir = p.getCommentDir();
         final File file = searchFileMatchId(dir, id);
         if (file != null) {
             commentFileField.setText(file.getPath());
@@ -421,24 +421,24 @@ private void idFieldFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_
 
         final Properties p = Properties.INSTANCE;
 
-        final boolean movieLocal = p.getUseMovieFileLocal();
+        final boolean movieLocal = p.getVideoUseLocal();
         useMovieLocalCheckBox.setSelected(movieLocal);
         movieFileSelectButton.setEnabled(movieLocal);
         if (!movieLocal) {
-            movieFileField.setText(p.getFileNamePattern());
+            movieFileField.setText(p.getVideoFileNamePattern());
         }
 
-        final boolean commentLocal = p.getCommentFileLocal();
+        final boolean commentLocal = p.getCommentUseLocal();
         useCommentLocalCheckBox.setSelected(commentLocal);
         commentFileSelectButton.setEnabled(commentLocal);
         if (!commentLocal) {
-            commentFileField.setText(p.getFileNamePattern());
+            commentFileField.setText(p.getCommentFileNamePattern());
         }
 
-        final boolean convert = p.getOutputConvert();
+        final boolean convert = p.getOutputEnable();
         outputConvertCheckBox.setSelected(convert);
         outputFileField.setEnabled(convert);
-        outputFileField.setText(p.getFileNamePattern());
+        outputFileField.setText(p.getOutputFileNamePattern());
 
     }
 

diff --git a/frontend/test/yukihane/inqubus/config/PropertiesTest.java b/frontend/test/yukihane/inqubus/config/PropertiesTest.java
index d0f0a80..7421ed3 100644 (file)
--- a/frontend/test/yukihane/inqubus/config/PropertiesTest.java
+++ b/frontend/test/yukihane/inqubus/config/PropertiesTest.java
@@ -47,7 +47,7 @@ public class PropertiesTest {
     @Test
     public void testCreteConfig() throws ConfigurationException{
         Properties p = Properties.INSTANCE;
-        p.setCommentDownload(true);
+        p.setCommentUseLocal(false);
         p.save(new File("test/testdata/save.xml"));
     }
 }