log出力部分をslf4j使用に変更

diff --git a/src/nicobrowser/NicoHttpClient.java b/src/nicobrowser/NicoHttpClient.java
index 345df4d..01fae95 100644 (file)
--- a/src/nicobrowser/NicoHttpClient.java
+++ b/src/nicobrowser/NicoHttpClient.java
@@ -48,8 +48,8 @@ import nicobrowser.util.Result;
 import nicobrowser.util.Util;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpException;
@@ -85,7 +85,7 @@ import org.xml.sax.SAXException;
  */
 public class NicoHttpClient {
 
-    private static Log logger = LogFactory.getLog(NicoHttpClient.class);
+    private static Logger logger = LoggerFactory.getLogger(NicoHttpClient.class);
     private final DefaultHttpClient http;
     private static final String LOGIN_PAGE =
             "https://secure.nicovideo.jp/secure/login?site=niconico";
@@ -518,7 +518,7 @@ public class NicoHttpClient {
             @Override
             public void handleSimpleTag(HTML.Tag t, MutableAttributeSet a, int pos) {
                 logger.debug("--------<" + t.toString() + ">--------");
-                logger.debug(a);
+                logger.debug(a.toString());
                 if (HTML.Tag.IMG.equals(t)) {
                     imageLink = a.getAttribute(HTML.Attribute.SRC).toString();
                 }
@@ -533,7 +533,7 @@ public class NicoHttpClient {
                     }
                 }
                 logger.debug("--------<" + t.toString() + ">--------");
-                logger.debug(a);
+                logger.debug(a.toString());
             }
 
             @Override
@@ -550,7 +550,7 @@ public class NicoHttpClient {
                     description.append(data);
                 }
                 logger.debug("--------TEXT--------");
-                logger.debug(data);
+                logger.debug(data.toString());
             }
 
             private void printAttributes(MutableAttributeSet a) {

diff --git a/src/nicobrowser/config/Config.java b/src/nicobrowser/config/Config.java
index b354554..bb691c6 100644 (file)
--- a/src/nicobrowser/config/Config.java
+++ b/src/nicobrowser/config/Config.java
@@ -9,8 +9,6 @@ import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.commons.configuration.Configuration;
@@ -18,12 +16,12 @@ import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class Config {
 
-    private static Log log = LogFactory.getLog(Config.class);
+    private static Logger log = LoggerFactory.getLogger(Config.class);
     private static Config instance;
     private static final String APPLICATION_NAME = "nicobrowser";
     private static final String CONFIG_NAME = APPLICATION_NAME + ".properties";
@@ -199,14 +197,14 @@ public final class Config {
         try {
             properties = new PropertiesConfiguration(CONFIG_FILE);
         } catch (Exception ex) {
-            log.fatal("コンフィグの読み込みに失敗: " + CONFIG_FILE);
+            log.error("コンフィグの読み込みに失敗: " + CONFIG_FILE, ex);
             throw new RuntimeException(ex);
         }
 
         try {
             FileUtils.readLines(FEEDURL_FILE);
         } catch (IOException ex) {
-            log.fatal("コンフィグの読み込みに失敗: " + CONFIG_FILE);
+            log.error("コンフィグの読み込みに失敗: " + CONFIG_FILE, ex);
             throw new RuntimeException(ex);
         }
     }
@@ -312,7 +310,7 @@ public final class Config {
                 }
             }
         } catch (IOException ex) {
-            Logger.getLogger(Config.class.getName()).log(Level.SEVERE, "読み込みに失敗: " + MYLIST_CONFIG_NAME, ex);
+            log.error("読み込みに失敗: " + MYLIST_CONFIG_NAME, ex);
         }
         String[] res = properties.getStringArray(P_DOWNLOAD_MYLIST);
         mylists.addAll(Arrays.asList(res));

diff --git a/src/nicobrowser/gui/config/ConfigFrame.java b/src/nicobrowser/gui/config/ConfigFrame.java
index 24b41df..8850f62 100644 (file)
--- a/src/nicobrowser/gui/config/ConfigFrame.java
+++ b/src/nicobrowser/gui/config/ConfigFrame.java
@@ -10,8 +10,6 @@ package nicobrowser.gui.config;
 import java.awt.Desktop;
 import java.io.File;
 import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 import javax.swing.JTextField;
@@ -20,6 +18,8 @@ import nicobrowser.config.Config;
 import org.apache.commons.configuration.ConfigurationException;
 import org.apache.commons.configuration.PropertiesConfiguration;
 import org.apache.commons.io.FilenameUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *
@@ -28,6 +28,7 @@ import org.apache.commons.io.FilenameUtils;
 public class ConfigFrame extends javax.swing.JFrame {
 
     private static final long serialVersionUID = 1L;
+    private static final Logger logger = LoggerFactory.getLogger(ConfigFrame.class);
     private final Config config;
 
     /** Creates new form ConfigFrame */
@@ -473,7 +474,7 @@ public class ConfigFrame extends javax.swing.JFrame {
             config.updateConfigFile(p);
             JOptionPane.showMessageDialog(this, Config.getConfigfile().getAbsolutePath() + "\nを更新しました");
         } catch (ConfigurationException ex) {
-            Logger.getLogger(ConfigFrame.class.getName()).log(Level.SEVERE, null, ex);
+            logger.error(null, ex);
             JOptionPane.showMessageDialog(this, "保存に失敗しました", "エラー", JOptionPane.ERROR_MESSAGE);
         }
     }//GEN-LAST:event_savaButtonActionPerformed
@@ -491,7 +492,7 @@ public class ConfigFrame extends javax.swing.JFrame {
         try {
             d.edit(file);
         } catch (IOException ex) {
-            Logger.getLogger(ConfigFrame.class.getName()).log(Level.SEVERE, null, ex);
+            logger.error(null, ex);
             JOptionPane.showMessageDialog(this, ex.getMessage(), "エラー", JOptionPane.ERROR_MESSAGE);
         }
     }

diff --git a/src/nicobrowser/main/Main.java b/src/nicobrowser/main/Main.java
index b04179d..ffc1656 100644 (file)
--- a/src/nicobrowser/main/Main.java
+++ b/src/nicobrowser/main/Main.java
@@ -32,13 +32,13 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.PosixParser;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Main {
 
     public static final String VERSION = "0.10.0";
-    private static Log log = LogFactory.getLog(Main.class);
+    private static Logger log = LoggerFactory.getLogger(Main.class);
 
     public static void main(String[] args) throws Exception {
         final boolean res = Config.createNewConfigFiles();

diff --git a/src/nicobrowser/update/DBUpdater.java b/src/nicobrowser/update/DBUpdater.java
index 572ecbf..22d9aaf 100644 (file)
--- a/src/nicobrowser/update/DBUpdater.java
+++ b/src/nicobrowser/update/DBUpdater.java
@@ -13,12 +13,12 @@ import java.sql.Statement;
 import liquibase.commandline.Main;
 import liquibase.exception.CommandLineParsingException;
 import nicobrowser.config.Config;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class DBUpdater {
 
-    private static Log log = LogFactory.getLog(DBUpdater.class);
+    private static Logger log = LoggerFactory.getLogger(DBUpdater.class);
     private static final String UPDATE_FILE = "db_update_script.xml";
     private static final String SYNC_FILE = "db_for_sync_script.xml";
 
@@ -42,7 +42,7 @@ public class DBUpdater {
             con.close();
             log.info("DBのアップデートが終了しました.");
         } catch (Exception ex) {
-            log.fatal("DBのアップデートに失敗しました.", ex);
+            log.error("DBのアップデートに失敗しました.", ex);
             throw ex;
         }
     }
@@ -66,7 +66,7 @@ public class DBUpdater {
 
             log.info("DBのアップデートが終了しました.");
         } catch (CommandLineParsingException ex) {
-            log.fatal("DBのアップデートに失敗しました.", ex);
+            log.error("DBのアップデートに失敗しました.", ex);
             throw ex;
         }
     }
@@ -88,7 +88,7 @@ public class DBUpdater {
 
             log.info("DBのアップデートが終了しました.");
         } catch (CommandLineParsingException ex) {
-            log.fatal("DBのアップデートに失敗しました.", ex);
+            log.error("DBのアップデートに失敗しました.", ex);
             throw ex;
         }
     }

diff --git a/src/nicobrowser/util/Util.java b/src/nicobrowser/util/Util.java
index 1d8c44f..7438c8e 100644 (file)
--- a/src/nicobrowser/util/Util.java
+++ b/src/nicobrowser/util/Util.java
@@ -6,11 +6,12 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 import java.util.TreeMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Util {
 
+    private static final Logger logger = LoggerFactory.getLogger(Util.class);
     static ResultParse rp = new ResultParse();
     static UserInfo ui = new UserInfo();
 
@@ -56,7 +57,7 @@ public class Util {
         try {
             return new URL(res);
         } catch (MalformedURLException ex) {
-            Logger.getLogger(Util.class.getName()).log(Level.SEVERE, null, ex);
+            logger.error(null, ex);
             return null;
         }
     }

diff --git a/test/nicobrowser/NicoHttpClientRssTest.java b/test/nicobrowser/NicoHttpClientRssTest.java
index ea66cfa..e4170c1 100644 (file)
--- a/test/nicobrowser/NicoHttpClientRssTest.java
+++ b/test/nicobrowser/NicoHttpClientRssTest.java
@@ -7,8 +7,6 @@ package nicobrowser;
 import java.net.MalformedURLException;
 import java.util.List;
 import nicobrowser.entity.NicoContent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.junit.Test;
 
 /**
@@ -17,12 +15,11 @@ import org.junit.Test;
  */
 public class NicoHttpClientRssTest {
 
-    static final Log log = LogFactory.getLog(NicoHttpClientRssTest.class);
     final NicoHttpClient client = new NicoHttpClient();
 
     @Test
     public void testNewArraivalCategory() throws MalformedURLException {
-        log.info("testNewArraivalCategory");
+        System.out.println("testNewArraivalCategory");
 
         String page = "http://www.nicovideo.jp/tag/科学?sort=f&rss=2.0";
         List<NicoContent> contents = client.getContentsFromRss(page);
@@ -33,7 +30,7 @@ public class NicoHttpClientRssTest {
 
     @Test
     public void testNewArraival() {
-        log.info("testNewArraival");
+        System.out.println("testNewArraival");
 
         String page = "http://www.nicovideo.jp/newarrival?rss=2.0";
         List<NicoContent> contents = client.getContentsFromRss(page);
@@ -44,7 +41,7 @@ public class NicoHttpClientRssTest {
 
     @Test
     public void testNewArraivalCommentMovie() {
-        log.info("testNewArraivalCommentMovie");
+        System.out.println("testNewArraivalCommentMovie");
 
         String page = "http://www.nicovideo.jp/recent?rss=2.0";
         List<NicoContent> contents = client.getContentsFromRss(page);
@@ -55,7 +52,7 @@ public class NicoHttpClientRssTest {
 
     @Test
     public void testRanking() {
-        log.info("testRanking");
+        System.out.println("testRanking");
 
         String page = "http://www.nicovideo.jp/ranking/mylist/daily/science?rss=2.0";
         List<NicoContent> contents = client.getContentsFromRss(page);