slf4j用のプレースホルダに修正

diff --git a/frontend/src/saccubus/worker/impl/convert/Convert.java b/frontend/src/saccubus/worker/impl/convert/Convert.java
index dbf3473..07c8ebd 100644 (file)
--- a/frontend/src/saccubus/worker/impl/convert/Convert.java
+++ b/frontend/src/saccubus/worker/impl/convert/Convert.java
@@ -63,7 +63,7 @@ public class Convert extends Worker<ConvertResult, ConvertProgress> {
         this.profile = profile;
         this.videoFile = video;
         this.commentFile = comment;
-        logger.info("convert video:{0}, comment:{1}", new Object[]{videoFile, commentFile});
+        logger.info("convert video:{}, comment:{}", videoFile, commentFile);
     }
 
     @Override
@@ -137,7 +137,7 @@ public class Convert extends Worker<ConvertResult, ConvertProgress> {
             try {
                 duration = util.getDuration();
             } catch (IOException ex) {
-                logger.info("動画再生時間を取得できませんでした: {0}", target);
+                logger.info("動画再生時間を取得できませんでした: {}", target);
                 duration = Integer.MAX_VALUE;
             }
             return executeFfmpeg(arguments, duration);
@@ -224,7 +224,7 @@ public class Convert extends Worker<ConvertResult, ConvertProgress> {
                         final String strTime = m.group(1);
                         final double time = Double.parseDouble(strTime);
                         per = 100.0 * time / duration;
-                        logger.trace("time:{0}, duration:{1}", new Object[]{time, duration});
+                        logger.trace("time:{}, duration:{}", time, duration);
                     }
                     publish(new ConvertProgress(PROCESS, per, msg));
                 } else if (!msg.endsWith("No accelerated colorspace conversion found")) {

diff --git a/frontend/src/yukihane/inqubus/filewatch/FileWatch.java b/frontend/src/yukihane/inqubus/filewatch/FileWatch.java
index dc8754b..a4019b2 100644 (file)
--- a/frontend/src/yukihane/inqubus/filewatch/FileWatch.java
+++ b/frontend/src/yukihane/inqubus/filewatch/FileWatch.java
@@ -36,8 +36,8 @@ public final class FileWatch implements Runnable {
         this.files = new HashSet<>(res.files);
         this.directories = new HashSet<>(res.dirs);
         if (logger.isDebugEnabled()) {
-            logger.debug("search dirs: {0}", directories);
-            logger.debug("exist files: {0}", files);
+            logger.debug("search dirs: {}", directories);
+            logger.debug("exist files: {}", files);
         }
     }
 
@@ -63,7 +63,7 @@ public final class FileWatch implements Runnable {
                 result.files.add(path);
             }
         } catch (IOException ex) {
-            logger.warn("パスの処理中にエラー: {0}", new Object[]{path});
+            logger.warn("パスの処理中にエラー: {}", path);
         }
     }
 
@@ -104,7 +104,7 @@ public final class FileWatch implements Runnable {
                         final Path p = (Path) event.context();
                         final Path target = dir.resolve(p);
                         if (Files.isRegularFile(target)) {
-                            logger.debug("ファイル追加: {0}", target);
+                            logger.debug("ファイル追加: {}", target);
                             synchronized (files) {
                                 files.add(target);
                             }
@@ -112,7 +112,7 @@ public final class FileWatch implements Runnable {
                     } else if (kind == ENTRY_DELETE) {
                         final Path p = (Path) event.context();
                         final Path target = dir.resolve(p);
-                        logger.debug("ファイル削除: {0}", target);
+                        logger.debug("ファイル削除: {}", target);
                         synchronized (files) {
                             files.remove(target);
                         }

diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java
index 310e131..2448bac 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -559,7 +559,7 @@ public class MainFrame extends JFrame {
             final int row = tblDisplay.getSelectedRow();
             final Target t = targetModel.getTarget(row);
             final boolean res = taskManager.cancel(t.getRowId());
-            logger.debug("停止: {0} {1}", new Object[]{t.getVideoId(), res});
+            logger.debug("停止: {} {}", t.getVideoId(), res);
             if (res) {
                 targetModel.setStatus(t.getRowId(), null, TaskStatus.CANCELLED, -1.0, "キャンセル");
             }

diff --git a/frontend/src/yukihane/inqubus/manager/TaskManage.java b/frontend/src/yukihane/inqubus/manager/TaskManage.java
index afb205c..7295607 100644 (file)
--- a/frontend/src/yukihane/inqubus/manager/TaskManage.java
+++ b/frontend/src/yukihane/inqubus/manager/TaskManage.java
@@ -186,13 +186,13 @@ public class TaskManage {
 
         @Override
         public void process(V progress) {
-            logger.trace("process: {0}", progress);
+            logger.trace("process: {}", progress);
             notify(TaskStatus.DOING, progress.getPercentage(), progress.getMessage());
         }
 
         @Override
         public final void cancelled() {
-            logger.debug("cancelled: {0}", toString());
+            logger.debug("cancelled: {}", toString());
             synchronized (TaskManage.this) {
                 removeRequest(rowId);
             }
@@ -205,7 +205,7 @@ public class TaskManage {
          */
         @Override
         public void done(T result) {
-            logger.debug("done: {0}", result);
+            logger.debug("done: {}", result);
             notify(TaskStatus.DONE);
         }
 

diff --git a/frontend/src/yukihane/inqubus/model/TargetsTableModel.java b/frontend/src/yukihane/inqubus/model/TargetsTableModel.java
index 013e680..57e1f94 100644 (file)
--- a/frontend/src/yukihane/inqubus/model/TargetsTableModel.java
+++ b/frontend/src/yukihane/inqubus/model/TargetsTableModel.java
@@ -99,7 +99,7 @@ public class TargetsTableModel extends AbstractTableModel {
             }
         }
         if (pos < 0) {
-            logger.error("本来存在すべきレコードが存在しません id:{0}", id);
+            logger.error("本来存在すべきレコードが存在しません id:{}", id);
             return;
         }