デバッグ出力を追加

diff --git a/frontend/src/saccubus/MainFrame.java b/frontend/src/saccubus/MainFrame.java
index 4c19291..77914b9 100644 (file)
--- a/frontend/src/saccubus/MainFrame.java
+++ b/frontend/src/saccubus/MainFrame.java
@@ -46,6 +46,7 @@ import org.apache.commons.lang.StringUtils;
 import saccubus.ConvertStopFlag.State;
 import saccubus.converter.profile.FfmpegOption;
 import saccubus.converter.profile.NgSetting;
+import saccubus.converter.profile.Profile;
 import saccubus.net.TextProgressListener;
 import saccubus.properties.BasicSetting;
 import saccubus.properties.ConvertSetting;
@@ -83,7 +84,7 @@ public class MainFrame extends JFrame {
 
     private static final long serialVersionUID = 2564486741331062989L;
     public static final String PRODUCT_NAME = "いんきゅばす";
-    public static final String VERSION = "1.7.2 (NicoBrowser" + Main.VERSION + ")";
+    public static final String VERSION = "1.7.3 (NicoBrowser" + Main.VERSION + ")";
     public static final Image WinIcon = Toolkit.getDefaultToolkit().createImage(saccubus.MainFrame.class.getResource(
             "icon32.png"));
     // TODO GUIが無いためフィールドに保持.
@@ -366,6 +367,7 @@ public class MainFrame extends JFrame {
         contentPane.setLayout(borderLayout1);
         setSize(new Dimension(400, 450));
         setTitle(PRODUCT_NAME + " " + VERSION);
+        System.out.println(getTitle());
         this.addWindowListener(new MainFrame_this_windowAdapter(this));
         statusBar.setText(" ");
         jMenuFile.setText("ファイル");
@@ -896,6 +898,8 @@ public class MainFrame extends JFrame {
     private JPanel FFmpegOptionComboBoxPanel = null;
 
     public void DoButton_actionPerformed(ActionEvent e) {
+        System.out.println("doButton: " + doButton.getText());
+        System.out.println("Converter: " + (Converter == null ? "null" : Converter.isConverted()));
         if (Converter == null || Converter.isConverted()) {
             try {
                 executeConvert();
@@ -910,6 +914,7 @@ public class MainFrame extends JFrame {
         } else { /* 開始しているので、ストップする。 */
             final ConvertStopFlag flag = Converter.getStopFlag();
             if (!flag.needStop()) { /* まだストップしていない。 */
+                System.out.println("request stop");
                 flag.requestStop();
             }
         }
@@ -919,6 +924,7 @@ public class MainFrame extends JFrame {
         String url;
 
         // NicoBrowserファイルを利用する場合は、ファイル名からビデオIDを特定.
+        System.out.println("kind: " + videoSaveInfoPanel.getVideoUseNiBrButton().isSelected());
         if (videoSaveInfoPanel.getVideoUseNiBrButton().isSelected()) {
             try {
                 String fileName = videoSaveInfoPanel.getNibrFileField().getText();
@@ -935,6 +941,7 @@ public class MainFrame extends JFrame {
             }
         } else {
             url = videoIdField.getText();
+            System.out.println("VIDEO ID: " + url);
         }
 
         TextProgressListener sl = new TextProgressListener() {
@@ -967,11 +974,14 @@ public class MainFrame extends JFrame {
             }
         };
 
-        Converter = new Converter(url, wayBackField.getText(), getSetting().toProfile(), sl,
+        final Profile profile = getSetting().toProfile();
+        System.out.println(profile);
+
+        Converter = new Converter(url, wayBackField.getText(), profile, sl,
                 new ConvertStopFlag(scl));
         doButton.setText(DoButtonStopString);
         new Thread(Converter).start();
-
+        System.out.println("Thread invoked");
     }
 
     /* FFmpegへのパス */
@@ -1634,6 +1644,7 @@ class MainFrame_DoButton_actionAdapter implements ActionListener {
     private MainFrame adaptee;
 
     MainFrame_DoButton_actionAdapter(MainFrame adaptee) {
+        System.out.println("MainFrame_DoButton_actionAdapter コンストラクタ");
         this.adaptee = adaptee;
     }
 

diff --git a/frontend/src/saccubus/converter/AbstractCommand.java b/frontend/src/saccubus/converter/AbstractCommand.java
index 9982e5f..b66a69d 100644 (file)
--- a/frontend/src/saccubus/converter/AbstractCommand.java
+++ b/frontend/src/saccubus/converter/AbstractCommand.java
@@ -25,7 +25,14 @@ public abstract class AbstractCommand {
     }
 
     protected void sendText(String text) {
+        sendText(text, true);
+    }
+
+    protected void sendText(String text, boolean debugOut) {
         getListener().setText(text);
+        if (debugOut) {
+            System.out.println(text);
+        }
     }
 
     /**

diff --git a/frontend/src/saccubus/converter/Converter.java b/frontend/src/saccubus/converter/Converter.java
index dc657d0..678e362 100644 (file)
--- a/frontend/src/saccubus/converter/Converter.java
+++ b/frontend/src/saccubus/converter/Converter.java
@@ -48,7 +48,9 @@ public class Converter extends AbstractCommand implements Runnable, Callable<Boo
         Setting = setting;
     }
 
+    @Override
     public Boolean call() throws Exception {
+        System.out.println("Convert Thread Start");
         boolean result = false;
         try {
             result = runConvert();
@@ -58,6 +60,7 @@ public class Converter extends AbstractCommand implements Runnable, Callable<Boo
         return Boolean.valueOf(result);
     }
 
+    @Override
     public void run() {
         try {
             call();

diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java
index 2ba38db..862f9d5 100644 (file)
--- a/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@ -179,7 +179,7 @@ public class FfmpegCommand extends AbstractCommand {
             while ((e = ebr.readLine()) != null) {
                 String state = e;
                 if (state.startsWith("frame=")) {
-                    sendText(state);
+                    sendText(state, false);
                 } else if (!state.endsWith("No accelerated colorspace conversion found")) {
                     logger.log(Level.INFO, e);
                 }

diff --git a/frontend/src/saccubus/converter/filegetter/LoginInfo.java b/frontend/src/saccubus/converter/filegetter/LoginInfo.java
index 53c8f75..48217f5 100644 (file)
--- a/frontend/src/saccubus/converter/filegetter/LoginInfo.java
+++ b/frontend/src/saccubus/converter/filegetter/LoginInfo.java
@@ -4,6 +4,7 @@
  */
 package saccubus.converter.filegetter;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
 import saccubus.converter.profile.Proxy;
 
 /**
@@ -33,4 +34,10 @@ public class LoginInfo {
     public Proxy getProxy() {
         return proxy;
     }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this).append("mail: " + !mail.isEmpty()).append("pass: " + !pass.isEmpty()).append(
+                proxy).toString();
+    }
 }

diff --git a/frontend/src/saccubus/converter/profile/CommentGetInfo.java b/frontend/src/saccubus/converter/profile/CommentGetInfo.java
index 6392eeb..7c83734 100644 (file)
--- a/frontend/src/saccubus/converter/profile/CommentGetInfo.java
+++ b/frontend/src/saccubus/converter/profile/CommentGetInfo.java
@@ -4,6 +4,8 @@
  */
 package saccubus.converter.profile;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 /**
  * コメント取得に関するプロファイルです.
  * @author yuki
@@ -34,4 +36,9 @@ public class CommentGetInfo {
     public boolean isReduceComment() {
         return reduceComment;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }

diff --git a/frontend/src/saccubus/converter/profile/Ffmpeg.java b/frontend/src/saccubus/converter/profile/Ffmpeg.java
index 2195992..2806cf2 100644 (file)
--- a/frontend/src/saccubus/converter/profile/Ffmpeg.java
+++ b/frontend/src/saccubus/converter/profile/Ffmpeg.java
@@ -2,6 +2,7 @@
 package saccubus.converter.profile;
 
 import java.io.File;
+import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  *
@@ -86,4 +87,9 @@ public class Ffmpeg {
     public NgSetting getNgSetting() {
         return ngSetting;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }

diff --git a/frontend/src/saccubus/converter/profile/GeneralSetting.java b/frontend/src/saccubus/converter/profile/GeneralSetting.java
index bd4dbbc..417e961 100644 (file)
--- a/frontend/src/saccubus/converter/profile/GeneralSetting.java
+++ b/frontend/src/saccubus/converter/profile/GeneralSetting.java
@@ -2,6 +2,7 @@
 package saccubus.converter.profile;
 
 import java.io.File;
+import org.apache.commons.lang.builder.ToStringBuilder;
 
 public class GeneralSetting {
 
@@ -14,4 +15,9 @@ public class GeneralSetting {
     public File getTempDir() {
         return tempDir;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }

diff --git a/frontend/src/saccubus/converter/profile/InputFileSetting.java b/frontend/src/saccubus/converter/profile/InputFileSetting.java
index 696c574..226bd8c 100644 (file)
--- a/frontend/src/saccubus/converter/profile/InputFileSetting.java
+++ b/frontend/src/saccubus/converter/profile/InputFileSetting.java
@@ -1,6 +1,8 @@
 /* $Id$ */
 package saccubus.converter.profile;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 /**
  *
  * @author yuki
@@ -33,5 +35,9 @@ public class InputFileSetting {
     public boolean isDelete() {
         return delete;
     }
-}
 
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
+}

diff --git a/frontend/src/saccubus/converter/profile/NgSetting.java b/frontend/src/saccubus/converter/profile/NgSetting.java
index 31bc8c6..c37b545 100644 (file)
--- a/frontend/src/saccubus/converter/profile/NgSetting.java
+++ b/frontend/src/saccubus/converter/profile/NgSetting.java
@@ -1,6 +1,8 @@
 /* $Id$ */
 package saccubus.converter.profile;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 /**
  * NG設定.
  * @author yuki
@@ -22,4 +24,9 @@ public class NgSetting {
     public String getId() {
         return id;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }

diff --git a/frontend/src/saccubus/converter/profile/OutputFileSetting.java b/frontend/src/saccubus/converter/profile/OutputFileSetting.java
index 9a00850..625c56f 100644 (file)
--- a/frontend/src/saccubus/converter/profile/OutputFileSetting.java
+++ b/frontend/src/saccubus/converter/profile/OutputFileSetting.java
@@ -4,6 +4,8 @@
  */
 package saccubus.converter.profile;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 /**
  *
  * @author yuki
@@ -44,4 +46,9 @@ public class OutputFileSetting {
     public SFile getFile() {
         return file;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }

diff --git a/frontend/src/saccubus/converter/profile/Profile.java b/frontend/src/saccubus/converter/profile/Profile.java
index 9e52571..6a9c430 100644 (file)
--- a/frontend/src/saccubus/converter/profile/Profile.java
+++ b/frontend/src/saccubus/converter/profile/Profile.java
@@ -1,6 +1,7 @@
 /* $Id$ */
 package saccubus.converter.profile;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
 import saccubus.converter.filegetter.LoginInfo;
 
 /**
@@ -82,4 +83,9 @@ public class Profile {
     public GeneralSetting getGeneralSetting() {
         return generalSetting;
     }
+
+    @Override
+    public String toString(){
+        return ToStringBuilder.reflectionToString(this);
+    }
 }

diff --git a/frontend/src/saccubus/converter/profile/Proxy.java b/frontend/src/saccubus/converter/profile/Proxy.java
index 443cf4f..1f3b664 100644 (file)
--- a/frontend/src/saccubus/converter/profile/Proxy.java
+++ b/frontend/src/saccubus/converter/profile/Proxy.java
@@ -2,6 +2,7 @@
 package saccubus.converter.profile;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  *
@@ -33,4 +34,9 @@ public class Proxy {
     public int getPort() {
         return port;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }

diff --git a/frontend/src/saccubus/converter/profile/SFile.java b/frontend/src/saccubus/converter/profile/SFile.java
index e1b019a..63019cb 100644 (file)
--- a/frontend/src/saccubus/converter/profile/SFile.java
+++ b/frontend/src/saccubus/converter/profile/SFile.java
@@ -2,6 +2,7 @@
 package saccubus.converter.profile;
 
 import java.io.File;
+import org.apache.commons.lang.builder.ToStringBuilder;
 
 /**
  * さきゅばすで扱うファイルは、「保存するディレクトリ」と、「保存されたファイルそのもの」の2パターンある。
@@ -40,4 +41,9 @@ public class SFile {
     public File getFile() {
         return file;
     }
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }