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

[coroid/inqubus.git] / frontend / src / yukihane / inqubus / gui / MainFrame.java

diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java
index f7c6464..eeb464e 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -13,6 +13,8 @@ import java.io.File;
 import java.io.FilenameFilter;
 import java.util.Collection;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.swing.JButton;
@@ -20,8 +22,7 @@ import javax.swing.JTextField;
 import javax.swing.TransferHandler;
 import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
-import org.apache.commons.io.FilenameUtils;
-import yukihane.inqubus.conifg.Properties;
+import yukihane.inqubus.config.Properties;
 import yukihane.inqubus.model.Target;
 import yukihane.inqubus.model.TargetsTableModel;
 
@@ -32,6 +33,7 @@ import yukihane.inqubus.model.TargetsTableModel;
 public class MainFrame extends javax.swing.JFrame {
 
     private static final long serialVersionUID = 1L;
+    private static final Logger logger = Logger.getLogger(MainFrame.class.getName());
     private final TargetsTableModel targetModel = new TargetsTableModel();
 
     /** Creates new form MainFrame */
@@ -308,11 +310,11 @@ private void useMovieLocalCheckBoxItemStateChanged(java.awt.event.ItemEvent evt)
     if (source == useMovieLocalCheckBox) {
         btn = movieFileSelectButton;
         field = movieFileField;
-        dir = p.getMovieDirectory();
+        dir = new File(p.getVideoDir());
     } else {
         btn = commentFileSelectButton;
         field = commentFileField;
-        dir = p.getCommentDirectory();
+        dir = new File(p.getCommentDir());
     }
 
     final boolean useLocal = (evt.getStateChange() == ItemEvent.SELECTED);
@@ -327,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
@@ -345,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 = new File(p.getVideoDir());
         final File file = searchFileMatchId(dir, id);
         if (file != null) {
             movieFileField.setText(file.getPath());
@@ -353,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 = new File(p.getCommentDir());
         final File file = searchFileMatchId(dir, id);
         if (file != null) {
             commentFileField.setText(file.getPath());
@@ -419,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());
 
     }
 
@@ -460,7 +462,8 @@ private void idFieldFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_
             try {
                 Transferable transferable = support.getTransferable();
                 if (transferable.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) {
-                    List<File> data = (List<File>) transferable.getTransferData(DataFlavor.javaFileListFlavor);
+                    @SuppressWarnings("unchecked")
+                    final List<File> data = (List<File>) transferable.getTransferData(DataFlavor.javaFileListFlavor);
                     Collection<Target> targets = Target.from(data);
                     targetModel.addTarget(targets);
                 } else if (transferable.isDataFlavorSupported(DataFlavor.stringFlavor)) {
@@ -477,13 +480,14 @@ private void idFieldFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_
                 }
                 return false;
             } catch (Exception e) {
-                e.printStackTrace();
+                logger.log(Level.SEVERE, null, e);
                 return false;
             }
         }
     }
 
     private class TableTransferHandler extends DownloadListTransferHandler {
+        private static final long serialVersionUID = 1L;
 
         @Override
         public boolean canImport(TransferHandler.TransferSupport support) {