コード中のSystem.out.printlnを削除

diff --git a/frontend/src/saccubus/conv/NicoXMLReader.java b/frontend/src/saccubus/conv/NicoXMLReader.java
index 8fb5425..4f58ab6 100644 (file)
--- a/frontend/src/saccubus/conv/NicoXMLReader.java
+++ b/frontend/src/saccubus/conv/NicoXMLReader.java
@@ -4,6 +4,8 @@ import java.util.EnumSet;
 import java.util.Set;
 import java.util.regex.Pattern;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.Attributes;
 
@@ -29,6 +31,7 @@ import org.xml.sax.Attributes;
  */
 public class NicoXMLReader extends DefaultHandler {
 
+    private static final Logger logger = LoggerFactory.getLogger(NicoXMLReader.class);
     private final Set<ProcessType> processTypes;
     private final Packet packet;
     private final Pattern ngWord;
@@ -87,7 +90,7 @@ public class NicoXMLReader extends DefaultHandler {
         final StringBuilder reg = new StringBuilder();
         for (int i = 0; i < elt.length; i++) {
             final String e = elt[i];
-            System.out.println(e);
+            logger.debug(e);
             if (i > 0) {
                 reg.append("|");
             }
@@ -100,7 +103,7 @@ public class NicoXMLReader extends DefaultHandler {
                 reg.append("(.*(").append(Pattern.quote(e)).append(")+.*)");
             }
         }
-        System.out.println("reg:" + reg);
+        logger.debug("reg:" + reg);
         return Pattern.compile(reg.toString());
     }
 
@@ -116,7 +119,7 @@ public class NicoXMLReader extends DefaultHandler {
      */
     @Override
     public void startDocument() {
-        System.out.println("Start converting to interval file.");
+        logger.debug("Start converting to interval file.");
     }
 
     /**
@@ -134,7 +137,6 @@ public class NicoXMLReader extends DefaultHandler {
     public void startElement(final String uri, final String localName, final String qName,
             final Attributes attributes) {
         if (qName.equalsIgnoreCase("chat")) {
-            // System.out.println("----------");
             item = new Chat();
             itemKicked = false;
 
@@ -227,7 +229,6 @@ public class NicoXMLReader extends DefaultHandler {
      */
     @Override
     public void endDocument() {
-        // System.out.println("----------");
-        System.out.println("Converting finished.");
+        logger.debug("Converting finished.");
     }
 }

diff --git a/frontend/src/saccubus/util/FfmpegUtil.java b/frontend/src/saccubus/util/FfmpegUtil.java
index 534b109..1f5d542 100644 (file)
--- a/frontend/src/saccubus/util/FfmpegUtil.java
+++ b/frontend/src/saccubus/util/FfmpegUtil.java
@@ -106,7 +106,7 @@ public final class FfmpegUtil {
                 sb.append(str);
             }
             final String res = sb.toString();
-            System.out.println(res);
+            logger.debug(res);
             execResultCache = res;
             return res;
         }

diff --git a/frontend/src/yukihane/inqubus/filewatch/FileWatch.java b/frontend/src/yukihane/inqubus/filewatch/FileWatch.java
index a4019b2..583bb9a 100644 (file)
--- a/frontend/src/yukihane/inqubus/filewatch/FileWatch.java
+++ b/frontend/src/yukihane/inqubus/filewatch/FileWatch.java
@@ -89,7 +89,7 @@ public final class FileWatch implements Runnable {
 
                 final Path dir = keys.get(wk);
                 if (dir == null) {
-                    System.err.println("WatchKey not recognized!!");
+                    logger.warn("WatchKey not recognized!!");
                     continue;
                 }
 
@@ -120,7 +120,7 @@ public final class FileWatch implements Runnable {
                 }
 
                 if (!wk.reset()) {
-                    System.out.println("No longer valid");
+                    logger.warn("No longer valid");
                     wk.cancel();
                     ws.close();
                     break;

diff --git a/frontend/src/yukihane/inqubus/saccubus/prompt/Prompt.java b/frontend/src/yukihane/inqubus/saccubus/prompt/Prompt.java
index 0b13781..2a48d11 100644 (file)
--- a/frontend/src/yukihane/inqubus/saccubus/prompt/Prompt.java
+++ b/frontend/src/yukihane/inqubus/saccubus/prompt/Prompt.java
@@ -1,6 +1,8 @@
 package yukihane.inqubus.saccubus.prompt;
 
 import java.io.IOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import saccubus.util.WayBackTimeParser;
 import saccubus.worker.impl.convert.Convert;
 import saccubus.worker.impl.convert.ConvertResult;
@@ -31,6 +33,8 @@ import saccubus.worker.profile.DownloadProfile;
  */
 public class Prompt {
 
+    private static final Logger logger = LoggerFactory.getLogger(Prompt.class);
+
     public void main(String[] args) throws IOException, Exception {
         final String mail = args[0];
         final String pass = args[1];
@@ -38,20 +42,21 @@ public class Prompt {
         final long time = args.length < 4 ? -1L : WayBackTimeParser.parse(args[3]);
         final DownloadProfile downloadSetting = new DownloadProfileImpl(mail, pass, time);
         final Download down = new Download(downloadSetting, tag);
-        System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
-        System.out.println("Saccubus on CUI");
-        System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
-        System.out.println("Mailaddr: " + mail);
-        System.out.println("Password: hidden");
-        System.out.println("VideoID: " + tag);
-        System.out.println("WaybackTime: " + time);
-        System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
+        logger.info("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
+        logger.info("Saccubus on CUI");
+        logger.info("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
+        logger.info("Mailaddr: " + mail);
+        logger.info("Password: hidden");
+        logger.info("VideoID: " + tag);
+        logger.info("WaybackTime: " + time);
+        logger.info("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
         final DownloadResult dRes = down.call();
 
         final ConvertProfile setting = new ConvertProfileImpl(tag, "");
         final Convert conv = new Convert(setting, dRes.getDownloadVideo(), dRes.getDownloadComment());
         final ConvertResult cRes = conv.call();
+        logger.info("RESULT CODE: {}", cRes);
 
-        System.out.println("Finished.");
+        logger.info("Finished.");
     }
 }