profileのパッケージ変更

diff --git a/frontend/src/saccubus/converter/Converter.java b/frontend/src/saccubus/converter/Converter.java
index e557b21..e372f9b 100644 (file)
--- a/frontend/src/saccubus/converter/Converter.java
+++ b/frontend/src/saccubus/converter/Converter.java
@@ -13,12 +13,12 @@ import nicobrowser.entity.NicoContent.Status;
 import org.apache.http.HttpException;
 import saccubus.ConvertStopFlag;
 import saccubus.net.TextProgressListener;
-import yukihane.saccubus.converter.profile.CommentProfile;
-import yukihane.saccubus.converter.profile.FfmpegProfile;
-import yukihane.saccubus.converter.profile.GeneralProfile;
-import yukihane.saccubus.converter.profile.OutputProfile;
-import yukihane.saccubus.converter.profile.Profile;
-import yukihane.saccubus.converter.profile.ProxyProfile;
+import saccubus.converter.profile.CommentProfile;
+import saccubus.converter.profile.FfmpegProfile;
+import saccubus.converter.profile.GeneralProfile;
+import saccubus.converter.profile.OutputProfile;
+import saccubus.converter.profile.Profile;
+import saccubus.converter.profile.ProxyProfile;
 
 /**
  * <p>タイトル: さきゅばす</p>

diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java
index d66a9bd..c20ece2 100644 (file)
--- a/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@ -14,14 +14,14 @@ import java.util.logging.Logger;
 import org.apache.commons.lang.StringUtils;
 import saccubus.ConvertStopFlag;
 import saccubus.conv.ConvertToVideoHook;
-import yukihane.saccubus.converter.profile.ConvertProfile;
-import yukihane.saccubus.converter.profile.FfmpegProfile;
-import yukihane.saccubus.converter.profile.GeneralProfile;
+import saccubus.converter.profile.ConvertProfile;
+import saccubus.converter.profile.FfmpegProfile;
+import saccubus.converter.profile.GeneralProfile;
 import saccubus.net.TextProgressListener;
 import yukihane.mediainfowrapper.Info;
 import yukihane.mediainfowrapper.MediaInfo;
 import yukihane.mediainfowrapper.Size;
-import yukihane.saccubus.converter.profile.ConvertProfile.HideCondition;
+import saccubus.converter.profile.ConvertProfile.HideCondition;
 import yukihane.swf.Cws2Fws;
 
 /**

diff --git a/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java b/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
index fc2dfe7..bca978d 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
+++ b/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
@@ -7,7 +7,7 @@ import java.io.File;
  *
  * @author yuki
  */
-public class Ffmpeg implements yukihane.saccubus.converter.profile.ConvertProfile {
+public class Ffmpeg implements saccubus.converter.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/converter/classic/profile/FfmpegOption.java
index 91d743f..4f2065a 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
+++ b/frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
@@ -11,7 +11,7 @@ import org.apache.commons.lang.StringUtils;
  *
  * @author yuki
  */
-public class FfmpegOption implements yukihane.saccubus.converter.profile.FfmpegProfile {
+public class FfmpegOption implements saccubus.converter.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/converter/classic/profile/GeneralSetting.java
index f171ded..2bd004c 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/GeneralSetting.java
+++ b/frontend/src/saccubus/converter/classic/profile/GeneralSetting.java
@@ -3,7 +3,7 @@ package saccubus.converter.classic.profile;
 
 import java.io.File;
 
-public class GeneralSetting implements yukihane.saccubus.converter.profile.GeneralProfile {
+public class GeneralSetting implements saccubus.converter.profile.GeneralProfile {
 
     private final File tempDir;
 

diff --git a/frontend/src/saccubus/converter/classic/profile/InputFileSetting.java b/frontend/src/saccubus/converter/classic/profile/InputFileSetting.java
index 630d99b..e1ccd58 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/InputFileSetting.java
+++ b/frontend/src/saccubus/converter/classic/profile/InputFileSetting.java
@@ -2,8 +2,8 @@
 package saccubus.converter.classic.profile;
 
 import java.io.File;
-import yukihane.saccubus.converter.profile.CommentProfile;
-import yukihane.saccubus.converter.profile.VideoProfile;
+import saccubus.converter.profile.CommentProfile;
+import saccubus.converter.profile.VideoProfile;
 
 /**
  *

diff --git a/frontend/src/saccubus/converter/classic/profile/LoginInfo.java b/frontend/src/saccubus/converter/classic/profile/LoginInfo.java
index c28f0a6..e9f5387 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/LoginInfo.java
+++ b/frontend/src/saccubus/converter/classic/profile/LoginInfo.java
@@ -6,7 +6,7 @@ import saccubus.converter.classic.profile.Proxy;
  *
  * @author yuki
  */
-public class LoginInfo implements yukihane.saccubus.converter.profile.LoginProfile {
+public class LoginInfo implements saccubus.converter.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/converter/classic/profile/NgSetting.java
index f821e62..234e802 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/NgSetting.java
+++ b/frontend/src/saccubus/converter/classic/profile/NgSetting.java
@@ -5,7 +5,7 @@ package saccubus.converter.classic.profile;
  * NG設定.
  * @author yuki
  */
-public class NgSetting implements yukihane.saccubus.converter.profile.ConvertProfile.HideCondition {
+public class NgSetting implements saccubus.converter.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/converter/classic/profile/OutputFileSetting.java
index 96dd5c2..1d529f9 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/OutputFileSetting.java
+++ b/frontend/src/saccubus/converter/classic/profile/OutputFileSetting.java
@@ -6,7 +6,7 @@ import java.io.File;
  *
  * @author yuki
  */
-public class OutputFileSetting implements yukihane.saccubus.converter.profile.OutputProfile {
+public class OutputFileSetting implements saccubus.converter.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/converter/classic/profile/Profile.java
index 02d3887..0dfa463 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/Profile.java
+++ b/frontend/src/saccubus/converter/classic/profile/Profile.java
@@ -1,14 +1,14 @@
 /* $Id$ */
 package saccubus.converter.classic.profile;
 
-import yukihane.saccubus.converter.profile.CommentProfile;
-import yukihane.saccubus.converter.profile.VideoProfile;
+import saccubus.converter.profile.CommentProfile;
+import saccubus.converter.profile.VideoProfile;
 
 /**
  * Converterに処理させるための設定.
  * @author yuki
  */
-public class Profile implements yukihane.saccubus.converter.profile.Profile {
+public class Profile implements saccubus.converter.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/converter/classic/profile/Proxy.java
index 8c2f71f..70657e3 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/Proxy.java
+++ b/frontend/src/saccubus/converter/classic/profile/Proxy.java
@@ -7,7 +7,7 @@ import org.apache.commons.lang.StringUtils;
  *
  * @author yuki
  */
-public class Proxy implements yukihane.saccubus.converter.profile.ProxyProfile {
+public class Proxy implements saccubus.converter.profile.ProxyProfile {
 
     private String host;
     private int port;

diff --git a/frontend/src/saccubus/converter/classic/profile/User.java b/frontend/src/saccubus/converter/classic/profile/User.java
index b4a209c..2a667a5 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/User.java
+++ b/frontend/src/saccubus/converter/classic/profile/User.java
@@ -5,7 +5,7 @@ package saccubus.converter.classic.profile;
  * ニコニコ動画ユーザ設定.
  * @author yuki
  */
-public class User implements yukihane.saccubus.converter.profile.LoginProfile {
+public class User implements saccubus.converter.profile.LoginProfile {
 
     private final String mail;
     private final String password;

diff --git a/frontend/src/yukihane/saccubus/converter/profile/CommentProfile.java b/frontend/src/saccubus/converter/profile/CommentProfile.java
similarity index 97%
rename from frontend/src/yukihane/saccubus/converter/profile/CommentProfile.java
rename to frontend/src/saccubus/converter/profile/CommentProfile.java
index 3306b7f..5957f0c 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/CommentProfile.java
+++ b/frontend/src/saccubus/converter/profile/CommentProfile.java
@@ -1,4 +1,4 @@
-package yukihane.saccubus.converter.profile;
+package saccubus.converter.profile;
 
 /**
  * 変換対象となるコメントファイル情報を保持するためのプロファイルです.

diff --git a/frontend/src/yukihane/saccubus/converter/profile/ConvertProfile.java b/frontend/src/saccubus/converter/profile/ConvertProfile.java
similarity index 96%
rename from frontend/src/yukihane/saccubus/converter/profile/ConvertProfile.java
rename to frontend/src/saccubus/converter/profile/ConvertProfile.java
index 6ba251d..0e18268 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/ConvertProfile.java
+++ b/frontend/src/saccubus/converter/profile/ConvertProfile.java
@@ -1,4 +1,4 @@
-package yukihane.saccubus.converter.profile;
+package saccubus.converter.profile;
 
 import java.io.File;
 

diff --git a/frontend/src/yukihane/saccubus/converter/profile/FfmpegProfile.java b/frontend/src/saccubus/converter/profile/FfmpegProfile.java
similarity index 87%
rename from frontend/src/yukihane/saccubus/converter/profile/FfmpegProfile.java
rename to frontend/src/saccubus/converter/profile/FfmpegProfile.java
index 251143d..8978a2b 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/FfmpegProfile.java
+++ b/frontend/src/saccubus/converter/profile/FfmpegProfile.java
@@ -1,4 +1,4 @@
-package yukihane.saccubus.converter.profile;
+package saccubus.converter.profile;
 
 /**
  *

diff --git a/frontend/src/yukihane/saccubus/converter/profile/GeneralProfile.java b/frontend/src/saccubus/converter/profile/GeneralProfile.java
similarity index 90%
rename from frontend/src/yukihane/saccubus/converter/profile/GeneralProfile.java
rename to frontend/src/saccubus/converter/profile/GeneralProfile.java
index 8ecce9e..75f2f9e 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/GeneralProfile.java
+++ b/frontend/src/saccubus/converter/profile/GeneralProfile.java
@@ -1,4 +1,4 @@
-package yukihane.saccubus.converter.profile;
+package saccubus.converter.profile;
 
 import java.io.File;
 

diff --git a/frontend/src/yukihane/saccubus/converter/profile/Inputable.java b/frontend/src/saccubus/converter/profile/Inputable.java
similarity index 95%
rename from frontend/src/yukihane/saccubus/converter/profile/Inputable.java
rename to frontend/src/saccubus/converter/profile/Inputable.java
index e1386ed..c664d80 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/Inputable.java
+++ b/frontend/src/saccubus/converter/profile/Inputable.java
@@ -1,4 +1,4 @@
-package yukihane.saccubus.converter.profile;
+package saccubus.converter.profile;
 
 import java.io.File;
 

diff --git a/frontend/src/yukihane/saccubus/converter/profile/LoginProfile.java b/frontend/src/saccubus/converter/profile/LoginProfile.java
similarity index 88%
rename from frontend/src/yukihane/saccubus/converter/profile/LoginProfile.java
rename to frontend/src/saccubus/converter/profile/LoginProfile.java
index 23ae311..4cfa0c3 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/LoginProfile.java
+++ b/frontend/src/saccubus/converter/profile/LoginProfile.java
@@ -1,4 +1,4 @@
-package yukihane.saccubus.converter.profile;
+package saccubus.converter.profile;
 
 /**
  * ニコニコ動画サービスへのログイン情報を保持するためのプロファイルです.

diff --git a/frontend/src/yukihane/saccubus/converter/profile/OutputProfile.java b/frontend/src/saccubus/converter/profile/OutputProfile.java
similarity index 95%
rename from frontend/src/yukihane/saccubus/converter/profile/OutputProfile.java
rename to frontend/src/saccubus/converter/profile/OutputProfile.java
index c10abb5..f38d326 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/OutputProfile.java
+++ b/frontend/src/saccubus/converter/profile/OutputProfile.java
@@ -1,4 +1,4 @@
-package yukihane.saccubus.converter.profile;
+package saccubus.converter.profile;
 
 import java.io.File;
 

diff --git a/frontend/src/yukihane/saccubus/converter/profile/Profile.java b/frontend/src/saccubus/converter/profile/Profile.java
similarity index 92%
rename from frontend/src/yukihane/saccubus/converter/profile/Profile.java
rename to frontend/src/saccubus/converter/profile/Profile.java
index e9f60f0..2f32657 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/Profile.java
+++ b/frontend/src/saccubus/converter/profile/Profile.java
@@ -1,4 +1,4 @@
-package yukihane.saccubus.converter.profile;
+package saccubus.converter.profile;
 
 /**
  * {@link saccubus.converter.Converter.Converter}が必要とするプロファイルです.

diff --git a/frontend/src/yukihane/saccubus/converter/profile/ProxyProfile.java b/frontend/src/saccubus/converter/profile/ProxyProfile.java
similarity index 92%
rename from frontend/src/yukihane/saccubus/converter/profile/ProxyProfile.java
rename to frontend/src/saccubus/converter/profile/ProxyProfile.java
index 595b06f..848b640 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/ProxyProfile.java
+++ b/frontend/src/saccubus/converter/profile/ProxyProfile.java
@@ -1,4 +1,4 @@
-package yukihane.saccubus.converter.profile;
+package saccubus.converter.profile;
 
 /**
  * プロキシ設定を保持するためのプロファイルです.

diff --git a/frontend/src/yukihane/saccubus/converter/profile/VideoProfile.java b/frontend/src/saccubus/converter/profile/VideoProfile.java
similarity index 79%
rename from frontend/src/yukihane/saccubus/converter/profile/VideoProfile.java
rename to frontend/src/saccubus/converter/profile/VideoProfile.java
index a2f6b55..3f08c41 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/VideoProfile.java
+++ b/frontend/src/saccubus/converter/profile/VideoProfile.java
@@ -1,4 +1,4 @@
-package yukihane.saccubus.converter.profile;
+package saccubus.converter.profile;
 
 /**
  * 変換対象となる動画ファイル情報を保持するためのプロファイルです.

diff --git a/frontend/src/yukihane/inqubus/saccubus_adapter/NicoBrowserAdapter.java b/frontend/src/yukihane/inqubus/saccubus_adapter/NicoBrowserAdapter.java
index 1c4ee13..37fc0e1 100644 (file)
--- a/frontend/src/yukihane/inqubus/saccubus_adapter/NicoBrowserAdapter.java
+++ b/frontend/src/yukihane/inqubus/saccubus_adapter/NicoBrowserAdapter.java
@@ -14,9 +14,9 @@ import saccubus.net.NicoClient;
 import saccubus.net.TextProgressListener;
 import saccubus.net.VideoInfo;
 import saccubus.util.FileUtil;
-import yukihane.saccubus.converter.profile.CommentProfile;
-import yukihane.saccubus.converter.profile.LoginProfile;
-import yukihane.saccubus.converter.profile.ProxyProfile;
+import saccubus.converter.profile.CommentProfile;
+import saccubus.converter.profile.LoginProfile;
+import saccubus.converter.profile.ProxyProfile;
 
 /**
  * NicoBrowserのニコニコ動画サービスアクセス機能をいんきゅばすから使用するためのアダプタ.