Worker実装クラスのパッケージ移動

diff --git a/frontend/src/saccubus/prompt/Prompt.java b/frontend/src/saccubus/prompt/Prompt.java
index 1242aa6..d7b9c16 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.Download;
-import saccubus.worker.download.DownloadResult;
+import saccubus.worker.impl.download.Download;
+import saccubus.worker.impl.download.DownloadResult;
 import saccubus.worker.classic.profile.Profile;
 
 /**

diff --git a/frontend/src/saccubus/worker/convert/Convert.java b/frontend/src/saccubus/worker/impl/convert/Convert.java
similarity index 99%
rename from frontend/src/saccubus/worker/convert/Convert.java
rename to frontend/src/saccubus/worker/impl/convert/Convert.java
index 1c908bc..3f581f3 100644 (file)
--- a/frontend/src/saccubus/worker/convert/Convert.java
+++ b/frontend/src/saccubus/worker/impl/convert/Convert.java
@@ -1,9 +1,9 @@
 /* $Id$ */
-package saccubus.worker.convert;
+package saccubus.worker.impl.convert;
 
 import static org.apache.commons.io.FilenameUtils.getBaseName;
 import static org.apache.commons.lang.StringUtils.*;
-import static saccubus.worker.convert.ConvertStatus.*;
+import static saccubus.worker.impl.convert.ConvertStatus.*;
 
 import java.io.BufferedReader;
 import java.io.File;

diff --git a/frontend/src/saccubus/worker/convert/ConvertProgress.java b/frontend/src/saccubus/worker/impl/convert/ConvertProgress.java
similarity index 93%
rename from frontend/src/saccubus/worker/convert/ConvertProgress.java
rename to frontend/src/saccubus/worker/impl/convert/ConvertProgress.java
index 59387e0..44b9527 100644 (file)
--- a/frontend/src/saccubus/worker/convert/ConvertProgress.java
+++ b/frontend/src/saccubus/worker/impl/convert/ConvertProgress.java
@@ -1,4 +1,4 @@
-package saccubus.worker.convert;
+package saccubus.worker.impl.convert;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 

diff --git a/frontend/src/saccubus/worker/convert/ConvertResult.java b/frontend/src/saccubus/worker/impl/convert/ConvertResult.java
similarity index 93%
rename from frontend/src/saccubus/worker/convert/ConvertResult.java
rename to frontend/src/saccubus/worker/impl/convert/ConvertResult.java
index 57fc96f..3ccb9d5 100644 (file)
--- a/frontend/src/saccubus/worker/convert/ConvertResult.java
+++ b/frontend/src/saccubus/worker/impl/convert/ConvertResult.java
@@ -1,4 +1,4 @@
-package saccubus.worker.convert;
+package saccubus.worker.impl.convert;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 

diff --git a/frontend/src/saccubus/worker/convert/ConvertStatus.java b/frontend/src/saccubus/worker/impl/convert/ConvertStatus.java
similarity index 73%
rename from frontend/src/saccubus/worker/convert/ConvertStatus.java
rename to frontend/src/saccubus/worker/impl/convert/ConvertStatus.java
index 5f87899..dc48959 100644 (file)
--- a/frontend/src/saccubus/worker/convert/ConvertStatus.java
+++ b/frontend/src/saccubus/worker/impl/convert/ConvertStatus.java
@@ -1,4 +1,4 @@
-package saccubus.worker.convert;
+package saccubus.worker.impl.convert;
 
 /**
  *

diff --git a/frontend/src/saccubus/worker/download/Download.java b/frontend/src/saccubus/worker/impl/download/Download.java
similarity index 98%
rename from frontend/src/saccubus/worker/download/Download.java
rename to frontend/src/saccubus/worker/impl/download/Download.java
index 6e61373..51810e1 100644 (file)
--- a/frontend/src/saccubus/worker/download/Download.java
+++ b/frontend/src/saccubus/worker/impl/download/Download.java
@@ -1,6 +1,6 @@
-package saccubus.worker.download;
+package saccubus.worker.impl.download;
 
-import static saccubus.worker.download.DownloadStatus.*;
+import static saccubus.worker.impl.download.DownloadStatus.*;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/frontend/src/saccubus/worker/download/DownloadProgress.java b/frontend/src/saccubus/worker/impl/download/DownloadProgress.java
similarity index 93%
rename from frontend/src/saccubus/worker/download/DownloadProgress.java
rename to frontend/src/saccubus/worker/impl/download/DownloadProgress.java
index c63acae..62a265d 100644 (file)
--- a/frontend/src/saccubus/worker/download/DownloadProgress.java
+++ b/frontend/src/saccubus/worker/impl/download/DownloadProgress.java
@@ -1,4 +1,4 @@
-package saccubus.worker.download;
+package saccubus.worker.impl.download;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
 

diff --git a/frontend/src/saccubus/worker/download/DownloadResult.java b/frontend/src/saccubus/worker/impl/download/DownloadResult.java
similarity index 95%
rename from frontend/src/saccubus/worker/download/DownloadResult.java
rename to frontend/src/saccubus/worker/impl/download/DownloadResult.java
index 1532301..326d9bb 100644 (file)
--- a/frontend/src/saccubus/worker/download/DownloadResult.java
+++ b/frontend/src/saccubus/worker/impl/download/DownloadResult.java
@@ -1,4 +1,4 @@
-package saccubus.worker.download;
+package saccubus.worker.impl.download;
 
 import java.io.File;
 import org.apache.commons.lang.builder.ToStringBuilder;

diff --git a/frontend/src/saccubus/worker/download/DownloadStatus.java b/frontend/src/saccubus/worker/impl/download/DownloadStatus.java
similarity index 72%
rename from frontend/src/saccubus/worker/download/DownloadStatus.java
rename to frontend/src/saccubus/worker/impl/download/DownloadStatus.java
index 66580ff..c6378a4 100644 (file)
--- a/frontend/src/saccubus/worker/download/DownloadStatus.java
+++ b/frontend/src/saccubus/worker/impl/download/DownloadStatus.java
@@ -1,4 +1,4 @@
-package saccubus.worker.download;
+package saccubus.worker.impl.download;
 
 /**
  *

diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java
index 1aa5bf7..76461fd 100644 (file)
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -50,11 +50,11 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;
 import saccubus.MainFrame_AboutBox;
 import saccubus.util.WayBackTimeParser;
-import saccubus.worker.convert.ConvertProgress;
-import saccubus.worker.download.DownloadProgress;
+import saccubus.worker.impl.convert.ConvertProgress;
+import saccubus.worker.impl.download.DownloadProgress;
 import saccubus.worker.WorkerListener;
-import saccubus.worker.convert.ConvertResult;
-import saccubus.worker.download.DownloadResult;
+import saccubus.worker.impl.convert.ConvertResult;
+import saccubus.worker.impl.download.DownloadResult;
 import saccubus.worker.profile.CommentProfile;
 import saccubus.worker.profile.ConvertProfile;
 import saccubus.worker.profile.DownloadProfile;

diff --git a/frontend/src/yukihane/inqubus/manager/TaskManage.java b/frontend/src/yukihane/inqubus/manager/TaskManage.java
index 35a719e..47d4f10 100644 (file)
--- a/frontend/src/yukihane/inqubus/manager/TaskManage.java
+++ b/frontend/src/yukihane/inqubus/manager/TaskManage.java
@@ -8,12 +8,12 @@ import java.util.concurrent.Future;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import saccubus.worker.WorkerListener;
-import saccubus.worker.convert.Convert;
-import saccubus.worker.convert.ConvertProgress;
-import saccubus.worker.convert.ConvertResult;
-import saccubus.worker.download.Download;
-import saccubus.worker.download.DownloadProgress;
-import saccubus.worker.download.DownloadResult;
+import saccubus.worker.impl.convert.Convert;
+import saccubus.worker.impl.convert.ConvertProgress;
+import saccubus.worker.impl.convert.ConvertResult;
+import saccubus.worker.impl.download.Download;
+import saccubus.worker.impl.download.DownloadProgress;
+import saccubus.worker.impl.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 44e61ee..3c1eab6 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.Download;
+import saccubus.worker.impl.download.Download;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;