初期化処理修正

diff --git a/frontend/src/yukihane/inqubus/conifg/Properties.java b/frontend/src/yukihane/inqubus/conifg/Properties.java
index cdcd408..88a0f6d 100644 (file)
--- a/frontend/src/yukihane/inqubus/conifg/Properties.java
+++ b/frontend/src/yukihane/inqubus/conifg/Properties.java
@@ -197,11 +197,6 @@ public enum Properties {
         return true;
     }
 
-    public File getOutputFile() {
-        // TODO
-        return new File("out/_converted");
-    }
-
     public String getFileNamePattern() {
         // TODO
         return "[{id}]{title}";

diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.form b/frontend/src/yukihane/inqubus/gui/MainFrame.form
index 2c7a8bd..70fb58f 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.form
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.form
@@ -183,20 +183,6 @@
                               <EmptySpace max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" attributes="0">
                                   <Group type="102" alignment="0" attributes="0">
-                                      <Component id="outputConvertCheckBox" min="-2" max="-2" attributes="0"/>
-                                      <EmptySpace max="-2" attributes="0"/>
-                                      <Component id="outputFileField" pref="317" max="32767" attributes="0"/>
-                                      <EmptySpace max="-2" attributes="0"/>
-                                      <Component id="outputFileSelectButton" min="-2" max="-2" attributes="0"/>
-                                  </Group>
-                                  <Group type="102" alignment="0" attributes="0">
-                                      <Component id="useCommentLocalCheckBox" min="-2" max="-2" attributes="0"/>
-                                      <EmptySpace max="-2" attributes="0"/>
-                                      <Component id="commentFileField" pref="317" max="32767" attributes="0"/>
-                                      <EmptySpace max="-2" attributes="0"/>
-                                      <Component id="commentFileSelectButton" min="-2" max="-2" attributes="0"/>
-                                  </Group>
-                                  <Group type="102" alignment="0" attributes="0">
                                       <Component id="useMovieLocalCheckBox" min="-2" max="-2" attributes="0"/>
                                       <EmptySpace max="-2" attributes="0"/>
                                       <Component id="movieFileField" pref="317" max="32767" attributes="0"/>
@@ -204,6 +190,22 @@
                                       <Component id="movieFileSelectButton" min="-2" max="-2" attributes="0"/>
                                   </Group>
                                   <Component id="idField" alignment="0" min="-2" pref="100" max="-2" attributes="0"/>
+                                  <Group type="102" alignment="1" attributes="0">
+                                      <Group type="103" groupAlignment="1" attributes="0">
+                                          <Group type="102" alignment="0" attributes="0">
+                                              <Component id="outputConvertCheckBox" min="-2" max="-2" attributes="0"/>
+                                              <EmptySpace max="-2" attributes="0"/>
+                                              <Component id="outputFileField" pref="317" max="32767" attributes="0"/>
+                                          </Group>
+                                          <Group type="102" alignment="1" attributes="0">
+                                              <Component id="useCommentLocalCheckBox" min="-2" max="-2" attributes="0"/>
+                                              <EmptySpace max="-2" attributes="0"/>
+                                              <Component id="commentFileField" pref="317" max="32767" attributes="0"/>
+                                          </Group>
+                                      </Group>
+                                      <EmptySpace max="-2" attributes="0"/>
+                                      <Component id="commentFileSelectButton" min="-2" max="-2" attributes="0"/>
+                                  </Group>
                               </Group>
                           </Group>
                           <Component id="applyButton" alignment="1" min="-2" max="-2" attributes="0"/>
@@ -238,7 +240,6 @@
                       <Group type="103" groupAlignment="3" attributes="0">
                           <Component id="outputLabel" alignment="3" min="-2" max="-2" attributes="0"/>
                           <Component id="outputFileField" alignment="3" min="-2" max="-2" attributes="0"/>
-                          <Component id="outputFileSelectButton" alignment="3" min="-2" max="-2" attributes="0"/>
                           <Component id="outputConvertCheckBox" alignment="3" min="-2" max="-2" attributes="0"/>
                       </Group>
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
@@ -289,7 +290,7 @@
                 <Property name="text" type="java.lang.String" value="local"/>
               </Properties>
               <Events>
-                <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="useCommentLocalCheckBoxItemStateChanged"/>
+                <EventHandler event="itemStateChanged" listener="java.awt.event.ItemListener" parameters="java.awt.event.ItemEvent" handler="useMovieLocalCheckBoxItemStateChanged"/>
               </Events>
             </Component>
             <Component class="javax.swing.JTextField" name="commentFileField">
@@ -314,11 +315,6 @@
             </Component>
             <Component class="javax.swing.JTextField" name="outputFileField">
             </Component>
-            <Component class="javax.swing.JButton" name="outputFileSelectButton">
-              <Properties>
-                <Property name="text" type="java.lang.String" value="..."/>
-              </Properties>
-            </Component>
             <Component class="javax.swing.JButton" name="applyButton">
               <Properties>
                 <Property name="text" type="java.lang.String" value="&#x9069;&#x7528;"/>

diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java
index f801bc8..f7c6464 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -72,7 +72,6 @@ public class MainFrame extends javax.swing.JFrame {
         outputLabel = new javax.swing.JLabel();
         outputConvertCheckBox = new javax.swing.JCheckBox();
         outputFileField = new javax.swing.JTextField();
-        outputFileSelectButton = new javax.swing.JButton();
         applyButton = new javax.swing.JButton();
         jMenuBar1 = new javax.swing.JMenuBar();
         jMenu1 = new javax.swing.JMenu();
@@ -144,7 +143,7 @@ public class MainFrame extends javax.swing.JFrame {
         useCommentLocalCheckBox.setText("local");
         useCommentLocalCheckBox.addItemListener(new java.awt.event.ItemListener() {
             public void itemStateChanged(java.awt.event.ItemEvent evt) {
-                useCommentLocalCheckBoxItemStateChanged(evt);
+                useMovieLocalCheckBoxItemStateChanged(evt);
             }
         });
 
@@ -159,8 +158,6 @@ public class MainFrame extends javax.swing.JFrame {
             }
         });
 
-        outputFileSelectButton.setText("...");
-
         applyButton.setText("適用");
 
         javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
@@ -179,24 +176,24 @@ public class MainFrame extends javax.swing.JFrame {
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                             .addGroup(jPanel3Layout.createSequentialGroup()
-                                .addComponent(outputConvertCheckBox)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(outputFileField, javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(outputFileSelectButton))
-                            .addGroup(jPanel3Layout.createSequentialGroup()
-                                .addComponent(useCommentLocalCheckBox)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(commentFileField, javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)
-                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                                .addComponent(commentFileSelectButton))
-                            .addGroup(jPanel3Layout.createSequentialGroup()
                                 .addComponent(useMovieLocalCheckBox)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addComponent(movieFileField, javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)
                                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                                 .addComponent(movieFileSelectButton))
-                            .addComponent(idField, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                            .addComponent(idField, javax.swing.GroupLayout.PREFERRED_SIZE, 100, javax.swing.GroupLayout.PREFERRED_SIZE)
+                            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
+                                .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                                    .addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel3Layout.createSequentialGroup()
+                                        .addComponent(outputConvertCheckBox)
+                                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                        .addComponent(outputFileField, javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE))
+                                    .addGroup(jPanel3Layout.createSequentialGroup()
+                                        .addComponent(useCommentLocalCheckBox)
+                                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                        .addComponent(commentFileField, javax.swing.GroupLayout.DEFAULT_SIZE, 317, Short.MAX_VALUE)))
+                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                                .addComponent(commentFileSelectButton))))
                     .addComponent(applyButton, javax.swing.GroupLayout.Alignment.TRAILING))
                 .addContainerGap())
         );
@@ -223,7 +220,6 @@ public class MainFrame extends javax.swing.JFrame {
                 .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(outputLabel)
                     .addComponent(outputFileField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
-                    .addComponent(outputFileSelectButton)
                     .addComponent(outputConvertCheckBox))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                 .addComponent(applyButton)
@@ -288,7 +284,7 @@ public class MainFrame extends javax.swing.JFrame {
 
             @Override
             public boolean accept(File dir, String name) {
-                return pattern.matcher(name).matches();
+                return pattern.matcher(name).find();
             }
         });
 
@@ -313,7 +309,7 @@ private void useMovieLocalCheckBoxItemStateChanged(java.awt.event.ItemEvent evt)
         btn = movieFileSelectButton;
         field = movieFileField;
         dir = p.getMovieDirectory();
-    } else{
+    } else {
         btn = commentFileSelectButton;
         field = commentFileField;
         dir = p.getCommentDirectory();
@@ -336,29 +332,9 @@ private void useMovieLocalCheckBoxItemStateChanged(java.awt.event.ItemEvent evt)
     field.setText(text);
 }//GEN-LAST:event_useMovieLocalCheckBoxItemStateChanged
 
-private void useCommentLocalCheckBoxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_useCommentLocalCheckBoxItemStateChanged
-    final boolean useLocal = (evt.getStateChange() == ItemEvent.SELECTED);
-    commentFileSelectButton.setEnabled(useLocal);
-
-    final Properties p = Properties.INSTANCE;
-    String text;
-    if (useLocal) {
-        final File f = searchFileMatchId(p.getCommentDirectory(), idField.getText());
-        if (f != null) {
-            text = f.getPath();
-        } else {
-            text = "";
-        }
-    } else {
-        text = p.getFileNamePattern();
-    }
-    commentFileField.setText(text);
-}//GEN-LAST:event_useCommentLocalCheckBoxItemStateChanged
-
 private void outputConvertCheckBoxItemStateChanged(java.awt.event.ItemEvent evt) {//GEN-FIRST:event_outputConvertCheckBoxItemStateChanged
     final boolean convert = (evt.getStateChange() == ItemEvent.SELECTED);
     outputFileField.setEnabled(convert);
-    outputFileSelectButton.setEnabled(convert);
 }//GEN-LAST:event_outputConvertCheckBoxItemStateChanged
 
 private void idFieldFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_idFieldFocusLost
@@ -433,7 +409,6 @@ private void idFieldFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_
     private javax.swing.JLabel movieLabel;
     private javax.swing.JCheckBox outputConvertCheckBox;
     private javax.swing.JTextField outputFileField;
-    private javax.swing.JButton outputFileSelectButton;
     private javax.swing.JLabel outputLabel;
     private javax.swing.JCheckBox useCommentLocalCheckBox;
     private javax.swing.JCheckBox useMovieLocalCheckBox;
@@ -447,16 +422,21 @@ private void idFieldFocusLost(java.awt.event.FocusEvent evt) {//GEN-FIRST:event_
         final boolean movieLocal = p.getUseMovieFileLocal();
         useMovieLocalCheckBox.setSelected(movieLocal);
         movieFileSelectButton.setEnabled(movieLocal);
+        if (!movieLocal) {
+            movieFileField.setText(p.getFileNamePattern());
+        }
 
         final boolean commentLocal = p.getCommentFileLocal();
         useCommentLocalCheckBox.setSelected(commentLocal);
         commentFileSelectButton.setEnabled(commentLocal);
+        if (!commentLocal) {
+            commentFileField.setText(p.getFileNamePattern());
+        }
 
         final boolean convert = p.getOutputConvert();
         outputConvertCheckBox.setSelected(convert);
         outputFileField.setEnabled(convert);
-        outputFileField.setText(p.getOutputFile().toString());
-        outputFileSelectButton.setEnabled(convert);
+        outputFileField.setText(p.getFileNamePattern());
 
     }