worker系クラスのパッケージ移動

diff --git a/frontend/src/saccubus/prompt/Prompt.java b/frontend/src/saccubus/prompt/Prompt.java
index 39ebf6b..1242aa6 100644 (file)
--- a/frontend/src/saccubus/prompt/Prompt.java
+++ b/frontend/src/saccubus/prompt/Prompt.java
@@ -12,8 +12,8 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
-import saccubus.worker.Download;
-import saccubus.worker.DownloadResult;
+import saccubus.worker.download.Download;
+import saccubus.worker.download.DownloadResult;
 import saccubus.worker.classic.profile.Profile;
 
 /**

diff --git a/frontend/src/saccubus/worker/Worker.java b/frontend/src/saccubus/worker/Worker.java
index 7ff7250..d3c5e28 100644 (file)
--- a/frontend/src/saccubus/worker/Worker.java
+++ b/frontend/src/saccubus/worker/Worker.java
@@ -8,8 +8,8 @@ import java.util.concurrent.Callable;
  * @author yuki
  */
 public abstract class Worker<T, V> implements Callable<T> {
-    private static int serialNumber = 0;
 
+    private static int serialNumber = 0;
     private final int id;
     private final WorkerListener<V> listener;
 
@@ -27,9 +27,4 @@ public abstract class Worker<T, V> implements Callable<T> {
             listener.process(value);
         }
     }
-
-    public interface WorkerListener<V> {
-
-        void process(V progress);
-    }
 }

diff --git a/frontend/src/saccubus/worker/WorkerListener.java b/frontend/src/saccubus/worker/WorkerListener.java
new file mode 100644 (file)
index 0000000..36f7e1b
--- /dev/null
+++ b/frontend/src/saccubus/worker/WorkerListener.java
@@ -0,0 +1,10 @@
+package saccubus.worker;
+
+/**
+ *
+ * @author yuki
+ */
+public interface WorkerListener<V> {
+
+    void process(V progress);
+}

diff --git a/frontend/src/saccubus/worker/WorkerStatus.java b/frontend/src/saccubus/worker/WorkerStatus.java
new file mode 100644 (file)
index 0000000..8f0b30b
--- /dev/null
+++ b/frontend/src/saccubus/worker/WorkerStatus.java
@@ -0,0 +1,10 @@
+package saccubus.worker;
+
+/**
+ *
+ * @author yuki
+ */
+public enum WorkerStatus {
+
+    READY, PROGRESS, DONE
+}

diff --git a/frontend/src/saccubus/worker/Convert.java b/frontend/src/saccubus/worker/convert/Convert.java
similarity index 99%
rename from frontend/src/saccubus/worker/Convert.java
rename to frontend/src/saccubus/worker/convert/Convert.java
index c01cff6..5d32b57 100644 (file)
--- a/frontend/src/saccubus/worker/Convert.java
+++ b/frontend/src/saccubus/worker/convert/Convert.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.worker;
+package saccubus.worker.convert;
 
 import static org.apache.commons.io.FilenameUtils.getBaseName;
 import static org.apache.commons.lang.StringUtils.*;
@@ -16,6 +16,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.SwingWorker;
 import saccubus.conv.ConvertToVideoHook;
+import saccubus.worker.Worker;
+import saccubus.worker.WorkerListener;
 import saccubus.worker.profile.ConvertProfile;
 import saccubus.worker.profile.ConvertProfile.HideCondition;
 import saccubus.worker.profile.FfmpegProfile;

diff --git a/frontend/src/saccubus/worker/ConvertProgress.java b/frontend/src/saccubus/worker/convert/ConvertProgress.java
similarity index 87%
rename from frontend/src/saccubus/worker/ConvertProgress.java
rename to frontend/src/saccubus/worker/convert/ConvertProgress.java
index 68ce0e9..b3ecdeb 100644 (file)
--- a/frontend/src/saccubus/worker/ConvertProgress.java
+++ b/frontend/src/saccubus/worker/convert/ConvertProgress.java
@@ -1,4 +1,4 @@
-package saccubus.worker;
+package saccubus.worker.convert;
 
 /**
  *

diff --git a/frontend/src/saccubus/worker/ConvertResult.java b/frontend/src/saccubus/worker/convert/ConvertResult.java
similarity index 91%
rename from frontend/src/saccubus/worker/ConvertResult.java
rename to frontend/src/saccubus/worker/convert/ConvertResult.java
index d340ec4..948b9cf 100644 (file)
--- a/frontend/src/saccubus/worker/ConvertResult.java
+++ b/frontend/src/saccubus/worker/convert/ConvertResult.java
@@ -1,4 +1,4 @@
-package saccubus.worker;
+package saccubus.worker.convert;
 
 /**
  *

diff --git a/frontend/src/saccubus/worker/Download.java b/frontend/src/saccubus/worker/download/Download.java
similarity index 98%
rename from frontend/src/saccubus/worker/Download.java
rename to frontend/src/saccubus/worker/download/Download.java
index 9480486..e369fff 100644 (file)
--- a/frontend/src/saccubus/worker/Download.java
+++ b/frontend/src/saccubus/worker/download/Download.java
@@ -1,4 +1,4 @@
-package saccubus.worker;
+package saccubus.worker.download;
 
 import java.io.File;
 import java.io.IOException;
@@ -13,6 +13,8 @@ import nicobrowser.ProgressListener;
 import nicobrowser.WayBackInfo;
 import nicobrowser.entity.NicoContent.Status;
 import org.apache.http.HttpException;
+import saccubus.worker.Worker;
+import saccubus.worker.WorkerListener;
 import saccubus.worker.profile.CommentProfile;
 import saccubus.worker.profile.GeneralProfile;
 import saccubus.worker.profile.OutputProfile;

diff --git a/frontend/src/saccubus/worker/DownloadProgress.java b/frontend/src/saccubus/worker/download/DownloadProgress.java
similarity index 87%
rename from frontend/src/saccubus/worker/DownloadProgress.java
rename to frontend/src/saccubus/worker/download/DownloadProgress.java
index e4035d3..2fbb7a3 100644 (file)
--- a/frontend/src/saccubus/worker/DownloadProgress.java
+++ b/frontend/src/saccubus/worker/download/DownloadProgress.java
@@ -1,4 +1,4 @@
-package saccubus.worker;
+package saccubus.worker.download;
 
 /**
  *

diff --git a/frontend/src/saccubus/worker/DownloadResult.java b/frontend/src/saccubus/worker/download/DownloadResult.java
similarity index 94%
rename from frontend/src/saccubus/worker/DownloadResult.java
rename to frontend/src/saccubus/worker/download/DownloadResult.java
index 44280de..e38ac21 100644 (file)
--- a/frontend/src/saccubus/worker/DownloadResult.java
+++ b/frontend/src/saccubus/worker/download/DownloadResult.java
@@ -1,4 +1,4 @@
-package saccubus.worker;
+package saccubus.worker.download;
 
 import java.io.File;
 

diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java
index 6d2144b..8e8de63 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -49,9 +49,9 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import saccubus.MainFrame_AboutBox;
 import saccubus.util.WayBackTimeParser;
-import saccubus.worker.ConvertProgress;
-import saccubus.worker.DownloadProgress;
-import saccubus.worker.Worker.WorkerListener;
+import saccubus.worker.convert.ConvertProgress;
+import saccubus.worker.download.DownloadProgress;
+import saccubus.worker.WorkerListener;
 import saccubus.worker.profile.CommentProfile;
 import saccubus.worker.profile.DownloadProfile;
 import saccubus.worker.profile.GeneralProfile;

diff --git a/frontend/src/yukihane/inqubus/manager/Request.java b/frontend/src/yukihane/inqubus/manager/Request.java
index 5abb30f..45741c2 100644 (file)
--- a/frontend/src/yukihane/inqubus/manager/Request.java
+++ b/frontend/src/yukihane/inqubus/manager/Request.java
@@ -1,9 +1,8 @@
 package yukihane.inqubus.manager;
 
-import java.io.File;
-import saccubus.worker.ConvertProgress;
-import saccubus.worker.DownloadProgress;
-import saccubus.worker.Worker.WorkerListener;
+import saccubus.worker.convert.ConvertProgress;
+import saccubus.worker.download.DownloadProgress;
+import saccubus.worker.WorkerListener;
 import saccubus.worker.profile.ConvertProfile;
 import saccubus.worker.profile.DownloadProfile;
 

diff --git a/frontend/src/yukihane/inqubus/manager/TaskManager.java b/frontend/src/yukihane/inqubus/manager/TaskManager.java
index 563e176..6ad7e2f 100644 (file)
--- a/frontend/src/yukihane/inqubus/manager/TaskManager.java
+++ b/frontend/src/yukihane/inqubus/manager/TaskManager.java
@@ -6,10 +6,10 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.FutureTask;
-import saccubus.worker.Convert;
-import saccubus.worker.ConvertResult;
-import saccubus.worker.Download;
-import saccubus.worker.DownloadResult;
+import saccubus.worker.convert.Convert;
+import saccubus.worker.convert.ConvertResult;
+import saccubus.worker.download.Download;
+import saccubus.worker.download.DownloadResult;
 import saccubus.worker.profile.ConvertProfile;
 import saccubus.worker.profile.DownloadProfile;
 

diff --git a/frontend/test/saccubus/worker/ConverterTest.java b/frontend/test/saccubus/worker/ConverterTest.java
index 7811620..44e61ee 100644 (file)
--- a/frontend/test/saccubus/worker/ConverterTest.java
+++ b/frontend/test/saccubus/worker/ConverterTest.java
@@ -4,7 +4,7 @@
  */
 package saccubus.worker;
 
-import saccubus.worker.Download;
+import saccubus.worker.download.Download;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;