From: yukihane <yukihane.feather@gmail.com>
Date: Mon, 22 Aug 2011 06:08:22 +0000 (+0900)
Subject: workerのパッケージを移動
X-Git-Tag: test20110903_ver2.a.0~175
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b602923106c8f2e251b9306dd46aa0b94f337cf2;p=coroid%2Finqubus.git

workerのパッケージを移動
---

diff --git a/frontend/src/saccubus/prompt/Prompt.java b/frontend/src/saccubus/prompt/Prompt.java
index 2889c22..681855b 100644
--- 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.converter.Download;
-import saccubus.converter.classic.profile.Profile;
+import saccubus.worker.Download;
+import saccubus.worker.classic.profile.Profile;
 
 /**
  * <p>
@@ -61,7 +61,7 @@ public class Prompt {
             throw new IOException(e);
         }
 
-        Download conv = new Download("dummy0", profile);
+        Download conv = new Download(profile, "dummy0");
         ExecutorService es = Executors.newSingleThreadExecutor();
         Future<Boolean> future = es.submit((Callable<Boolean>) conv);
         try {
@@ -151,7 +151,7 @@ public class Prompt {
 //        SProperties setting = SProperties.loadSetting(mail, pass);
 //        Converter conv = new Converter(tag, setting.toProfile(), TextProgressListener.EMPTY_LISTENER, new ConvertStopFlag(
 //                ConvertStopFlag.StateChangeListener.EMPTY_LISTENER));
-        Download conv = new Download(tag, null/*この部分*/);
+        Download conv = new Download(null/*この部分*/, tag);
         System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
         System.out.println("Saccubus on CUI");
         System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
diff --git a/frontend/src/saccubus/properties/BasicSetting.java b/frontend/src/saccubus/properties/BasicSetting.java
index c5728ed..2753465 100644
--- a/frontend/src/saccubus/properties/BasicSetting.java
+++ b/frontend/src/saccubus/properties/BasicSetting.java
@@ -3,7 +3,7 @@ package saccubus.properties;
 
 import java.io.File;
 import java.util.Properties;
-import saccubus.converter.classic.profile.User;
+import saccubus.worker.classic.profile.User;
 
 /**
  * 基本設定.
diff --git a/frontend/src/saccubus/properties/ConvertSetting.java b/frontend/src/saccubus/properties/ConvertSetting.java
index e8657ef..4133f34 100644
--- a/frontend/src/saccubus/properties/ConvertSetting.java
+++ b/frontend/src/saccubus/properties/ConvertSetting.java
@@ -3,7 +3,7 @@ package saccubus.properties;
 
 import java.io.File;
 import java.util.Properties;
-import saccubus.converter.classic.profile.NgSetting;
+import saccubus.worker.classic.profile.NgSetting;
 
 /**
  * 変換設定.
diff --git a/frontend/src/saccubus/properties/MovieSetting.java b/frontend/src/saccubus/properties/MovieSetting.java
index 9597c52..1487aa7 100644
--- a/frontend/src/saccubus/properties/MovieSetting.java
+++ b/frontend/src/saccubus/properties/MovieSetting.java
@@ -3,7 +3,7 @@ package saccubus.properties;
 
 import java.io.File;
 import java.util.Properties;
-import saccubus.converter.classic.profile.FfmpegOption;
+import saccubus.worker.classic.profile.FfmpegOption;
 
 /**
  * 動画設定.
diff --git a/frontend/src/saccubus/converter/Convert.java b/frontend/src/saccubus/worker/Convert.java
similarity index 97%
rename from frontend/src/saccubus/converter/Convert.java
rename to frontend/src/saccubus/worker/Convert.java
index f066aab..286cf84 100644
--- a/frontend/src/saccubus/converter/Convert.java
+++ b/frontend/src/saccubus/worker/Convert.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.converter;
+package saccubus.worker;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -14,14 +14,14 @@ import java.util.logging.Logger;
 import javax.swing.SwingWorker;
 import org.apache.commons.lang.StringUtils;
 import saccubus.conv.ConvertToVideoHook;
-import saccubus.converter.profile.ConvertProfile;
-import saccubus.converter.profile.FfmpegProfile;
-import saccubus.converter.profile.GeneralProfile;
+import saccubus.worker.profile.ConvertProfile;
+import saccubus.worker.profile.FfmpegProfile;
+import saccubus.worker.profile.GeneralProfile;
 import yukihane.mediainfowrapper.Info;
 import yukihane.mediainfowrapper.MediaInfo;
 import yukihane.mediainfowrapper.Size;
-import saccubus.converter.profile.ConvertProfile.HideCondition;
-import saccubus.converter.profile.Profile;
+import saccubus.worker.profile.ConvertProfile.HideCondition;
+import saccubus.worker.profile.Profile;
 import yukihane.swf.Cws2Fws;
 
 /**
diff --git a/frontend/src/saccubus/converter/ConvertProgress.java b/frontend/src/saccubus/worker/ConvertProgress.java
similarity index 89%
rename from frontend/src/saccubus/converter/ConvertProgress.java
rename to frontend/src/saccubus/worker/ConvertProgress.java
index 9f9e17e..68ce0e9 100644
--- a/frontend/src/saccubus/converter/ConvertProgress.java
+++ b/frontend/src/saccubus/worker/ConvertProgress.java
@@ -1,4 +1,4 @@
-package saccubus.converter;
+package saccubus.worker;
 
 /**
  *
diff --git a/frontend/src/saccubus/converter/ConvertResult.java b/frontend/src/saccubus/worker/ConvertResult.java
similarity index 89%
rename from frontend/src/saccubus/converter/ConvertResult.java
rename to frontend/src/saccubus/worker/ConvertResult.java
index 2dfbde3..796dead 100644
--- a/frontend/src/saccubus/converter/ConvertResult.java
+++ b/frontend/src/saccubus/worker/ConvertResult.java
@@ -1,4 +1,4 @@
-package saccubus.converter;
+package saccubus.worker;
 
 /**
  *
diff --git a/frontend/src/saccubus/converter/Download.java b/frontend/src/saccubus/worker/Download.java
similarity index 97%
rename from frontend/src/saccubus/converter/Download.java
rename to frontend/src/saccubus/worker/Download.java
index 1bb77c4..30ebd89 100644
--- a/frontend/src/saccubus/converter/Download.java
+++ b/frontend/src/saccubus/worker/Download.java
@@ -1,4 +1,4 @@
-package saccubus.converter;
+package saccubus.worker;
 
 import java.io.File;
 import java.io.IOException;
@@ -13,11 +13,11 @@ import nicobrowser.ProgressListener;
 import nicobrowser.WayBackInfo;
 import nicobrowser.entity.NicoContent.Status;
 import org.apache.http.HttpException;
-import saccubus.converter.profile.CommentProfile;
-import saccubus.converter.profile.GeneralProfile;
-import saccubus.converter.profile.OutputProfile;
-import saccubus.converter.profile.Profile;
-import saccubus.converter.profile.ProxyProfile;
+import saccubus.worker.profile.CommentProfile;
+import saccubus.worker.profile.GeneralProfile;
+import saccubus.worker.profile.OutputProfile;
+import saccubus.worker.profile.Profile;
+import saccubus.worker.profile.ProxyProfile;
 
 /**
  * <p>タイトル: さきゅばす</p>
diff --git a/frontend/src/saccubus/converter/DownloadProgress.java b/frontend/src/saccubus/worker/DownloadProgress.java
similarity index 89%
rename from frontend/src/saccubus/converter/DownloadProgress.java
rename to frontend/src/saccubus/worker/DownloadProgress.java
index 8cbca39..e4035d3 100644
--- a/frontend/src/saccubus/converter/DownloadProgress.java
+++ b/frontend/src/saccubus/worker/DownloadProgress.java
@@ -1,4 +1,4 @@
-package saccubus.converter;
+package saccubus.worker;
 
 /**
  *
diff --git a/frontend/src/saccubus/converter/DownloadResult.java b/frontend/src/saccubus/worker/DownloadResult.java
similarity index 89%
rename from frontend/src/saccubus/converter/DownloadResult.java
rename to frontend/src/saccubus/worker/DownloadResult.java
index 4383c54..b19876e 100644
--- a/frontend/src/saccubus/converter/DownloadResult.java
+++ b/frontend/src/saccubus/worker/DownloadResult.java
@@ -1,4 +1,4 @@
-package saccubus.converter;
+package saccubus.worker;
 
 /**
  *
diff --git a/frontend/src/saccubus/converter/TestFrame.java b/frontend/src/saccubus/worker/TestFrame.java
similarity index 95%
rename from frontend/src/saccubus/converter/TestFrame.java
rename to frontend/src/saccubus/worker/TestFrame.java
index 91a7dc4..2476a53 100644
--- a/frontend/src/saccubus/converter/TestFrame.java
+++ b/frontend/src/saccubus/worker/TestFrame.java
@@ -2,7 +2,7 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package saccubus.converter;
+package saccubus.worker;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -15,13 +15,13 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
-import saccubus.converter.profile.CommentProfile;
-import saccubus.converter.profile.GeneralProfile;
-import saccubus.converter.profile.LoginProfile;
-import saccubus.converter.profile.OutputProfile;
-import saccubus.converter.profile.Profile;
-import saccubus.converter.profile.ProxyProfile;
-import saccubus.converter.profile.VideoProfile;
+import saccubus.worker.profile.CommentProfile;
+import saccubus.worker.profile.GeneralProfile;
+import saccubus.worker.profile.LoginProfile;
+import saccubus.worker.profile.OutputProfile;
+import saccubus.worker.profile.Profile;
+import saccubus.worker.profile.ProxyProfile;
+import saccubus.worker.profile.VideoProfile;
 
 /**
  *
diff --git a/frontend/src/saccubus/converter/classic/profile/CommentGetInfo.java b/frontend/src/saccubus/worker/classic/profile/CommentGetInfo.java
similarity index 95%
rename from frontend/src/saccubus/converter/classic/profile/CommentGetInfo.java
rename to frontend/src/saccubus/worker/classic/profile/CommentGetInfo.java
index bf9dd85..628b958 100644
--- a/frontend/src/saccubus/converter/classic/profile/CommentGetInfo.java
+++ b/frontend/src/saccubus/worker/classic/profile/CommentGetInfo.java
@@ -1,4 +1,4 @@
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
 
 /**
  * コメント取得に関するプロファイルです.
diff --git a/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java b/frontend/src/saccubus/worker/classic/profile/Ffmpeg.java
similarity index 95%
rename from frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
rename to frontend/src/saccubus/worker/classic/profile/Ffmpeg.java
index 51ff9b6..bf04a7a 100644
--- a/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
+++ b/frontend/src/saccubus/worker/classic/profile/Ffmpeg.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
 
 import java.io.File;
 
@@ -7,7 +7,7 @@ import java.io.File;
  *
  * @author yuki
  */
-public class Ffmpeg implements saccubus.converter.profile.ConvertProfile {
+public class Ffmpeg implements saccubus.worker.profile.ConvertProfile {
 
     private final File ffmpeg;
     private final File vhook;
diff --git a/frontend/src/saccubus/converter/classic/profile/FfmpegOption.java b/frontend/src/saccubus/worker/classic/profile/FfmpegOption.java
similarity index 96%
rename from frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
rename to frontend/src/saccubus/worker/classic/profile/FfmpegOption.java
index 4f2065a..2002e3f 100644
--- a/frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
+++ b/frontend/src/saccubus/worker/classic/profile/FfmpegOption.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -11,7 +11,7 @@ import org.apache.commons.lang.StringUtils;
  *
  * @author yuki
  */
-public class FfmpegOption implements saccubus.converter.profile.FfmpegProfile {
+public class FfmpegOption implements saccubus.worker.profile.FfmpegProfile {
 
     private final String extOption;
     private final String mainOption;
diff --git a/frontend/src/saccubus/converter/classic/profile/GeneralSetting.java b/frontend/src/saccubus/worker/classic/profile/GeneralSetting.java
similarity index 76%
rename from frontend/src/saccubus/converter/classic/profile/GeneralSetting.java
rename to frontend/src/saccubus/worker/classic/profile/GeneralSetting.java
index d9231d8..eea28c6 100644
--- a/frontend/src/saccubus/converter/classic/profile/GeneralSetting.java
+++ b/frontend/src/saccubus/worker/classic/profile/GeneralSetting.java
@@ -1,9 +1,9 @@
 /* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
 
 import java.io.File;
 
-public class GeneralSetting implements saccubus.converter.profile.GeneralProfile {
+public class GeneralSetting implements saccubus.worker.profile.GeneralProfile {
 
     private final File tempDir;
 
diff --git a/frontend/src/saccubus/converter/classic/profile/InputFileSetting.java b/frontend/src/saccubus/worker/classic/profile/InputFileSetting.java
similarity index 93%
rename from frontend/src/saccubus/converter/classic/profile/InputFileSetting.java
rename to frontend/src/saccubus/worker/classic/profile/InputFileSetting.java
index e1ccd58..d7d3852 100644
--- a/frontend/src/saccubus/converter/classic/profile/InputFileSetting.java
+++ b/frontend/src/saccubus/worker/classic/profile/InputFileSetting.java
@@ -1,9 +1,9 @@
 /* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
 
 import java.io.File;
-import saccubus.converter.profile.CommentProfile;
-import saccubus.converter.profile.VideoProfile;
+import saccubus.worker.profile.CommentProfile;
+import saccubus.worker.profile.VideoProfile;
 
 /**
  *
diff --git a/frontend/src/saccubus/converter/classic/profile/LoginInfo.java b/frontend/src/saccubus/worker/classic/profile/LoginInfo.java
similarity index 72%
rename from frontend/src/saccubus/converter/classic/profile/LoginInfo.java
rename to frontend/src/saccubus/worker/classic/profile/LoginInfo.java
index e9f5387..49e0a4f 100644
--- a/frontend/src/saccubus/converter/classic/profile/LoginInfo.java
+++ b/frontend/src/saccubus/worker/classic/profile/LoginInfo.java
@@ -1,12 +1,12 @@
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
 
-import saccubus.converter.classic.profile.Proxy;
+import saccubus.worker.classic.profile.Proxy;
 
 /**
  *
  * @author yuki
  */
-public class LoginInfo implements saccubus.converter.profile.LoginProfile {
+public class LoginInfo implements saccubus.worker.profile.LoginProfile {
 
     private final String mail;
     private final String pass;
diff --git a/frontend/src/saccubus/converter/classic/profile/NgSetting.java b/frontend/src/saccubus/worker/classic/profile/NgSetting.java
similarity index 70%
rename from frontend/src/saccubus/converter/classic/profile/NgSetting.java
rename to frontend/src/saccubus/worker/classic/profile/NgSetting.java
index 234e802..6fc04dc 100644
--- a/frontend/src/saccubus/converter/classic/profile/NgSetting.java
+++ b/frontend/src/saccubus/worker/classic/profile/NgSetting.java
@@ -1,11 +1,11 @@
 /* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
 
 /**
  * NG設定.
  * @author yuki
  */
-public class NgSetting implements saccubus.converter.profile.ConvertProfile.HideCondition {
+public class NgSetting implements saccubus.worker.profile.ConvertProfile.HideCondition {
 
     private final String word;
     private final String id;
diff --git a/frontend/src/saccubus/converter/classic/profile/OutputFileSetting.java b/frontend/src/saccubus/worker/classic/profile/OutputFileSetting.java
similarity index 89%
rename from frontend/src/saccubus/converter/classic/profile/OutputFileSetting.java
rename to frontend/src/saccubus/worker/classic/profile/OutputFileSetting.java
index 1d529f9..4e6f0ff 100644
--- a/frontend/src/saccubus/converter/classic/profile/OutputFileSetting.java
+++ b/frontend/src/saccubus/worker/classic/profile/OutputFileSetting.java
@@ -1,4 +1,4 @@
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
 
 import java.io.File;
 
@@ -6,7 +6,7 @@ import java.io.File;
  *
  * @author yuki
  */
-public class OutputFileSetting implements saccubus.converter.profile.OutputProfile {
+public class OutputFileSetting implements saccubus.worker.profile.OutputProfile {
 
     private final boolean convert;
     private final boolean appendPrefixVideoId;
diff --git a/frontend/src/saccubus/converter/classic/profile/Profile.java b/frontend/src/saccubus/worker/classic/profile/Profile.java
similarity index 90%
rename from frontend/src/saccubus/converter/classic/profile/Profile.java
rename to frontend/src/saccubus/worker/classic/profile/Profile.java
index 08a40fd..3f89661 100644
--- a/frontend/src/saccubus/converter/classic/profile/Profile.java
+++ b/frontend/src/saccubus/worker/classic/profile/Profile.java
@@ -1,14 +1,14 @@
 /* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
 
-import saccubus.converter.profile.CommentProfile;
-import saccubus.converter.profile.VideoProfile;
+import saccubus.worker.profile.CommentProfile;
+import saccubus.worker.profile.VideoProfile;
 
 /**
  * Converterに処理させるための設定.
  * @author yuki
  */
-public class Profile implements saccubus.converter.profile.Profile {
+public class Profile implements saccubus.worker.profile.Profile {
 
     private final GeneralSetting generalSetting;
     private final LoginInfo loginInfo;
diff --git a/frontend/src/saccubus/converter/classic/profile/Proxy.java b/frontend/src/saccubus/worker/classic/profile/Proxy.java
similarity index 86%
rename from frontend/src/saccubus/converter/classic/profile/Proxy.java
rename to frontend/src/saccubus/worker/classic/profile/Proxy.java
index 70657e3..4fb9225 100644
--- a/frontend/src/saccubus/converter/classic/profile/Proxy.java
+++ b/frontend/src/saccubus/worker/classic/profile/Proxy.java
@@ -1,5 +1,5 @@
 /* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
 
 import org.apache.commons.lang.StringUtils;
 
@@ -7,7 +7,7 @@ import org.apache.commons.lang.StringUtils;
  *
  * @author yuki
  */
-public class Proxy implements saccubus.converter.profile.ProxyProfile {
+public class Proxy implements saccubus.worker.profile.ProxyProfile {
 
     private String host;
     private int port;
diff --git a/frontend/src/saccubus/converter/classic/profile/User.java b/frontend/src/saccubus/worker/classic/profile/User.java
similarity index 78%
rename from frontend/src/saccubus/converter/classic/profile/User.java
rename to frontend/src/saccubus/worker/classic/profile/User.java
index 2a667a5..4cdeabb 100644
--- a/frontend/src/saccubus/converter/classic/profile/User.java
+++ b/frontend/src/saccubus/worker/classic/profile/User.java
@@ -1,11 +1,11 @@
 /* $Id$ */
-package saccubus.converter.classic.profile;
+package saccubus.worker.classic.profile;
 
 /**
  * ニコニコ動画ユーザ設定.
  * @author yuki
  */
-public class User implements saccubus.converter.profile.LoginProfile {
+public class User implements saccubus.worker.profile.LoginProfile {
 
     private final String mail;
     private final String password;
diff --git a/frontend/src/saccubus/converter/profile/CommentProfile.java b/frontend/src/saccubus/worker/profile/CommentProfile.java
similarity index 97%
rename from frontend/src/saccubus/converter/profile/CommentProfile.java
rename to frontend/src/saccubus/worker/profile/CommentProfile.java
index 5957f0c..022bc0b 100644
--- a/frontend/src/saccubus/converter/profile/CommentProfile.java
+++ b/frontend/src/saccubus/worker/profile/CommentProfile.java
@@ -1,4 +1,4 @@
-package saccubus.converter.profile;
+package saccubus.worker.profile;
 
 /**
  * 変換対象となるコメントファイル情報を保持するためのプロファイルです.
diff --git a/frontend/src/saccubus/converter/profile/ConvertProfile.java b/frontend/src/saccubus/worker/profile/ConvertProfile.java
similarity index 97%
rename from frontend/src/saccubus/converter/profile/ConvertProfile.java
rename to frontend/src/saccubus/worker/profile/ConvertProfile.java
index cb2ed1e..2d526aa 100644
--- a/frontend/src/saccubus/converter/profile/ConvertProfile.java
+++ b/frontend/src/saccubus/worker/profile/ConvertProfile.java
@@ -1,4 +1,4 @@
-package saccubus.converter.profile;
+package saccubus.worker.profile;
 
 import java.io.File;
 
diff --git a/frontend/src/saccubus/converter/profile/FfmpegProfile.java b/frontend/src/saccubus/worker/profile/FfmpegProfile.java
similarity index 89%
rename from frontend/src/saccubus/converter/profile/FfmpegProfile.java
rename to frontend/src/saccubus/worker/profile/FfmpegProfile.java
index 8978a2b..96e730d 100644
--- a/frontend/src/saccubus/converter/profile/FfmpegProfile.java
+++ b/frontend/src/saccubus/worker/profile/FfmpegProfile.java
@@ -1,4 +1,4 @@
-package saccubus.converter.profile;
+package saccubus.worker.profile;
 
 /**
  *
diff --git a/frontend/src/saccubus/converter/profile/GeneralProfile.java b/frontend/src/saccubus/worker/profile/GeneralProfile.java
similarity index 90%
rename from frontend/src/saccubus/converter/profile/GeneralProfile.java
rename to frontend/src/saccubus/worker/profile/GeneralProfile.java
index 6de4509..f7136ee 100644
--- a/frontend/src/saccubus/converter/profile/GeneralProfile.java
+++ b/frontend/src/saccubus/worker/profile/GeneralProfile.java
@@ -1,4 +1,4 @@
-package saccubus.converter.profile;
+package saccubus.worker.profile;
 
 import java.io.File;
 
diff --git a/frontend/src/saccubus/converter/profile/Inputable.java b/frontend/src/saccubus/worker/profile/Inputable.java
similarity index 96%
rename from frontend/src/saccubus/converter/profile/Inputable.java
rename to frontend/src/saccubus/worker/profile/Inputable.java
index c664d80..6489ce0 100644
--- a/frontend/src/saccubus/converter/profile/Inputable.java
+++ b/frontend/src/saccubus/worker/profile/Inputable.java
@@ -1,4 +1,4 @@
-package saccubus.converter.profile;
+package saccubus.worker.profile;
 
 import java.io.File;
 
diff --git a/frontend/src/saccubus/converter/profile/LoginProfile.java b/frontend/src/saccubus/worker/profile/LoginProfile.java
similarity index 90%
rename from frontend/src/saccubus/converter/profile/LoginProfile.java
rename to frontend/src/saccubus/worker/profile/LoginProfile.java
index 4cfa0c3..7f37bb5 100644
--- a/frontend/src/saccubus/converter/profile/LoginProfile.java
+++ b/frontend/src/saccubus/worker/profile/LoginProfile.java
@@ -1,4 +1,4 @@
-package saccubus.converter.profile;
+package saccubus.worker.profile;
 
 /**
  * ニコニコ動画サービスへのログイン情報を保持するためのプロファイルです.
diff --git a/frontend/src/saccubus/converter/profile/OutputProfile.java b/frontend/src/saccubus/worker/profile/OutputProfile.java
similarity index 96%
rename from frontend/src/saccubus/converter/profile/OutputProfile.java
rename to frontend/src/saccubus/worker/profile/OutputProfile.java
index f38d326..edafa77 100644
--- a/frontend/src/saccubus/converter/profile/OutputProfile.java
+++ b/frontend/src/saccubus/worker/profile/OutputProfile.java
@@ -1,4 +1,4 @@
-package saccubus.converter.profile;
+package saccubus.worker.profile;
 
 import java.io.File;
 
diff --git a/frontend/src/saccubus/converter/profile/Profile.java b/frontend/src/saccubus/worker/profile/Profile.java
similarity index 93%
rename from frontend/src/saccubus/converter/profile/Profile.java
rename to frontend/src/saccubus/worker/profile/Profile.java
index 9fb719c..516663e 100644
--- a/frontend/src/saccubus/converter/profile/Profile.java
+++ b/frontend/src/saccubus/worker/profile/Profile.java
@@ -1,4 +1,4 @@
-package saccubus.converter.profile;
+package saccubus.worker.profile;
 
 /**
  * {@link saccubus.converter.Converter.Converter}が必要とするプロファイルです.
diff --git a/frontend/src/saccubus/converter/profile/ProxyProfile.java b/frontend/src/saccubus/worker/profile/ProxyProfile.java
similarity index 93%
rename from frontend/src/saccubus/converter/profile/ProxyProfile.java
rename to frontend/src/saccubus/worker/profile/ProxyProfile.java
index 848b640..edfffe2 100644
--- a/frontend/src/saccubus/converter/profile/ProxyProfile.java
+++ b/frontend/src/saccubus/worker/profile/ProxyProfile.java
@@ -1,4 +1,4 @@
-package saccubus.converter.profile;
+package saccubus.worker.profile;
 
 /**
  * プロキシ設定を保持するためのプロファイルです.
diff --git a/frontend/src/saccubus/converter/profile/VideoProfile.java b/frontend/src/saccubus/worker/profile/VideoProfile.java
similarity index 82%
rename from frontend/src/saccubus/converter/profile/VideoProfile.java
rename to frontend/src/saccubus/worker/profile/VideoProfile.java
index 3f08c41..1ddaba8 100644
--- a/frontend/src/saccubus/converter/profile/VideoProfile.java
+++ b/frontend/src/saccubus/worker/profile/VideoProfile.java
@@ -1,4 +1,4 @@
-package saccubus.converter.profile;
+package saccubus.worker.profile;
 
 /**
  * 変換対象となる動画ファイル情報を保持するためのプロファイルです.
diff --git a/frontend/test/saccubus/converter/ConverterTest.java b/frontend/test/saccubus/worker/ConverterTest.java
similarity index 95%
rename from frontend/test/saccubus/converter/ConverterTest.java
rename to frontend/test/saccubus/worker/ConverterTest.java
index 9d22ce7..7811620 100644
--- a/frontend/test/saccubus/converter/ConverterTest.java
+++ b/frontend/test/saccubus/worker/ConverterTest.java
@@ -2,8 +2,9 @@
  * To change this template, choose Tools | Templates
  * and open the template in the editor.
  */
-package saccubus.converter;
+package saccubus.worker;
 
+import saccubus.worker.Download;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -34,7 +35,7 @@ public class ConverterTest {
 
     @Test
     public void testConverter() throws Exception {
-        Download conv = new Download("sm7139747", null);
+        Download conv = new Download(null, "sm7139747");
         conv.call();
     }
 //    /**