OSDN Git Service

変数名変更
authoryukihane <yukihane.feather@gmail.com>
Fri, 19 Aug 2011 10:04:17 +0000 (19:04 +0900)
committeryukihane <yukihane.feather@gmail.com>
Fri, 19 Aug 2011 10:04:17 +0000 (19:04 +0900)
frontend/src/saccubus/MainFrame.java

index faf7552..e431d0f 100644 (file)
@@ -106,7 +106,7 @@ public class MainFrame extends JFrame {
     private JTextField videoIdField = new JTextField();
     private JLabel wayBackLabel = new JLabel();
     private JTextField wayBackField = new JTextField();
     private JTextField videoIdField = new JTextField();
     private JLabel wayBackLabel = new JLabel();
     private JTextField wayBackField = new JTextField();
-    JButton DoButton = new JButton();
+    private JButton doButton = new JButton();
     public static final String DoButtonDefString = "変換";
     public static final String DoButtonStopString = "停止";
     public static final String DoButtonWaitString = "待機";
     public static final String DoButtonDefString = "変換";
     public static final String DoButtonStopString = "停止";
     public static final String DoButtonWaitString = "待機";
@@ -484,13 +484,10 @@ public class MainFrame extends JFrame {
         setFFMpegOptionCheckbox();
 
 
         setFFMpegOptionCheckbox();
 
 
-        videoInfoPanel.add(DoButton, gridBagConstraints71);
 
         videoIdLabel.setText("URL/ID");
         wayBackLabel.setText("過去ログ");
         videoIdField.setText("http://www.nicovideo.jp/watch/");
 
         videoIdLabel.setText("URL/ID");
         wayBackLabel.setText("過去ログ");
         videoIdField.setText("http://www.nicovideo.jp/watch/");
-        DoButton.setText(DoButtonDefString);
-        DoButton.addActionListener(new MainFrame_DoButton_actionAdapter(this));
 
         final GroupLayout oppLayout = new GroupLayout(opPanel);
         opPanel.setLayout(oppLayout);
 
         final GroupLayout oppLayout = new GroupLayout(opPanel);
         opPanel.setLayout(oppLayout);
@@ -514,11 +511,15 @@ public class MainFrame extends JFrame {
                         .addComponent(wayBackField))
                 );
 
                         .addComponent(wayBackField))
                 );
 
+        doButton.setText(DoButtonDefString);
+        doButton.addActionListener(new MainFrame_DoButton_actionAdapter(this));
 
         videoInfoPanel.add(opPanel, new GridBagConstraints(0, 0, 1, 1, 1.0,
                 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 0, 0), 0, 0));
 
         videoInfoPanel.add(opPanel, new GridBagConstraints(0, 0, 1, 1, 1.0,
                 0.0, GridBagConstraints.CENTER, GridBagConstraints.BOTH,
                 new Insets(0, 0, 0, 0), 0, 0));
+        videoInfoPanel.add(doButton, gridBagConstraints71);
 
 
+        
         mainTabbedPane.add(BasicInfoTabPanel, "基本設定");
         mainTabbedPane.add(SavingInfoTabPanel, "保存設定");
         mainTabbedPane.add(FFMpegTabPanel, "動画設定");
         mainTabbedPane.add(BasicInfoTabPanel, "基本設定");
         mainTabbedPane.add(SavingInfoTabPanel, "保存設定");
         mainTabbedPane.add(FFMpegTabPanel, "動画設定");
@@ -946,10 +947,10 @@ public class MainFrame extends JFrame {
                     public void run() {
                         switch (s) {
                             case STOPPING:
                     public void run() {
                         switch (s) {
                             case STOPPING:
-                                DoButton.setText(DoButtonWaitString);
+                                doButton.setText(DoButtonWaitString);
                                 break;
                             case FINISHED:
                                 break;
                             case FINISHED:
-                                DoButton.setText(DoButtonDefString);
+                                doButton.setText(DoButtonDefString);
                         }
                     }
                 });
                         }
                     }
                 });
@@ -958,7 +959,7 @@ public class MainFrame extends JFrame {
 
         Converter = new Converter(url, wayBackField.getText(), getSetting().toProfile(), sl,
                 new ConvertStopFlag(scl));
 
         Converter = new Converter(url, wayBackField.getText(), getSetting().toProfile(), sl,
                 new ConvertStopFlag(scl));
-        DoButton.setText(DoButtonStopString);
+        doButton.setText(DoButtonStopString);
         new Thread(Converter).start();
 
     }
         new Thread(Converter).start();
 
     }