From aeac204ec37763e4f6adcb6bf0a47fd1c9784f1a Mon Sep 17 00:00:00 2001
From: yukihane <yukihane.feather@gmail.com>
Date: Wed, 10 Aug 2011 14:29:14 +0900
Subject: [PATCH] =?utf8?q?System.out.print*=20=E3=83=A1=E3=82=BD=E3=83=83?=
 =?utf8?q?=E3=83=89=E3=82=92=E5=89=8A=E9=99=A4=20(cherry=20picked=20from?=
 =?utf8?q?=20commit=20a03d1976f8678970636ce2819c8e355c4eed7389)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 frontend/src/saccubus/conv/Chat.java               | 32 ++++++++++++----------
 frontend/src/saccubus/converter/FfmpegCommand.java | 15 ++++++----
 .../saccubus/converter/filegetter/FileLocator.java | 10 +++++--
 3 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/frontend/src/saccubus/conv/Chat.java b/frontend/src/saccubus/conv/Chat.java
index 6dd3485..0b9f7b0 100644
--- a/frontend/src/saccubus/conv/Chat.java
+++ b/frontend/src/saccubus/conv/Chat.java
@@ -2,29 +2,33 @@ package saccubus.conv;
 
 import java.io.*;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import saccubus.util.IOUtil;
 
 /**
  * <p>
  * タイトル: さきゅばす
  * </p>
- * 
+ *
  * <p>
  * 説明: ニコニコ動画の動画をコメントつきで保存
  * </p>
- * 
+ *
  * <p>
  * 著作権: Copyright (c) 2007 PSI
  * </p>
- * 
+ *
  * <p>
  * 会社名:
  * </p>
- * 
+ *
  * @author 未入力
  * @version 1.0
  */
 public class Chat {
+    private static final Logger logger = Logger.getLogger(Chat.class.getName());
+
 	private static final int CMD_LOC_DEF = 0;
 
 	private static final int CMD_LOC_TOP = 1;
@@ -106,13 +110,13 @@ public class Chat {
 	public Chat() {
 	}
 
-	public void setDate(String date_str) {
-		Date = Integer.parseInt(date_str);
-		// System.out.println("date:" + date_str);
-	}
+    public void setDate(String date_str) {
+        Date = Integer.parseInt(date_str);
+        logger.log(Level.FINE, "date:" + date_str);
+    }
 
 	public void setMail(String mail_str) {
-		// System.out.println("mail:" + mail_str);
+		logger.log(Level.FINE, "mail:" + mail_str);
 		Color = CMD_COLOR_DEF;
 		Size = CMD_SIZE_DEF;
 		Location = CMD_LOC_DEF;
@@ -164,7 +168,7 @@ public class Chat {
 			} else if (str.equals("black")) {
 				Color = CMD_COLOR_BLACK;
 			} else {
-				// System.out.println("Unknown command:" + str);
+				logger.log(Level.WARNING, "Unknown command:" + str);
 			}
 		}
 	}
@@ -175,11 +179,11 @@ public class Chat {
 		} catch (Exception e) {
 			No = -1;
 		}
-		// System.out.println("no:" + no_str);
+		logger.log(Level.FINE, "no:" + no_str);
 	}
 
 	public void setUserID(String user_id_str) {
-		// System.out.println("user_id:" + user_id_str);
+		logger.log(Level.FINE, "user_id:" + user_id_str);
 		try {
 			UserID = Integer.parseInt(user_id_str);
 		} catch (Exception e) {
@@ -188,7 +192,7 @@ public class Chat {
 	}
 
 	public void setVpos(String vpos_str) {
-		// System.out.println("vpos:" + vpos_str);
+		logger.log(Level.FINE, "vpos:" + vpos_str);
 		try {
 			Vpos = Integer.parseInt(vpos_str);
 		} catch (Exception e) {
@@ -198,7 +202,7 @@ public class Chat {
 	}
 
 	public void setComment(String com_str) {
-		// System.out.println("Comment[" + com_str.length() + "]:" + com_str);
+		logger.log(Level.FINE, "Comment[" + com_str.length() + "]:" + com_str);
 		if (Comment.equals("")) {
 			Comment += com_str;
 		} else {
diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java
index da8641a..2ba38db 100644
--- a/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.apache.commons.lang.StringUtils;
 import saccubus.ConvertStopFlag;
 import saccubus.conv.ConvertToVideoHook;
@@ -27,7 +29,7 @@ import yukihane.swf.Cws2Fws;
  * @author yuki
  */
 public class FfmpegCommand extends AbstractCommand {
-
+    private static final Logger logger = Logger.getLogger(FfmpegCommand.class.getName());
     private final File commentMiddleFile;
     private final File tcommMiddleFile;
     private final File TMP_CWS;
@@ -161,14 +163,15 @@ public class FfmpegCommand extends AbstractCommand {
 
         cmdList.add(convertedVideoFile.getPath());
 
-        System.out.print("arg:");
+        final StringBuilder argMsg = new StringBuilder();
+        argMsg.append("arg:");
         for (String s : cmdList) {
-            System.out.print(" " + s);
+            argMsg.append(" ").append(s);
         }
-        System.out.println();
+        logger.log(Level.INFO, argMsg.toString());
 
         try {
-            System.out.println("\n\n----\nProcessing FFmpeg...\n----\n\n");
+            logger.log(Level.INFO, "\n\n----\nProcessing FFmpeg...\n----\n\n");
             Process process = Runtime.getRuntime().exec(cmdList.toArray(new String[0]));
             BufferedReader ebr = new BufferedReader(new InputStreamReader(
                     process.getErrorStream()));
@@ -178,7 +181,7 @@ public class FfmpegCommand extends AbstractCommand {
                 if (state.startsWith("frame=")) {
                     sendText(state);
                 } else if (!state.endsWith("No accelerated colorspace conversion found")) {
-                    System.out.println(e);
+                    logger.log(Level.INFO, e);
                 }
 
                 try {
diff --git a/frontend/src/saccubus/converter/filegetter/FileLocator.java b/frontend/src/saccubus/converter/filegetter/FileLocator.java
index a20b6f2..54f4f32 100644
--- a/frontend/src/saccubus/converter/filegetter/FileLocator.java
+++ b/frontend/src/saccubus/converter/filegetter/FileLocator.java
@@ -3,7 +3,8 @@ package saccubus.converter.filegetter;
 
 import java.io.File;
 import java.io.FilenameFilter;
-import org.apache.commons.io.FilenameUtils;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  *
@@ -46,9 +47,10 @@ class FileLocator {
         }
     }
 
-    private final File searchFile() {
+    private File searchFile() {
         FilenameFilter filter = new FilenameFilter() {
 
+            @Override
             public boolean accept(File dir, String name) {
                 if (name.startsWith(prefix)) {
                     for (String suffix : suffixes) {
@@ -65,7 +67,9 @@ class FileLocator {
             return null;
         }
         if (res.length > 1) {
-            System.out.println("複数の候補ファイルがヒットしました. 意図しないファイルが選択されている可能性があります:" + res[0]);
+            final String message = "複数の候補ファイルがヒットしました. 意図しないファイルが選択されている可能性があります:"
+                    + res[0];
+            Logger.getLogger(FileLocator.class.getName()).log(Level.WARNING, message);
         }
         return res[0];
     }
-- 
2.11.0