OSDN Git Service

ConverterのProfileをインタフェース化
authoryukihane <yukihane.feather@gmail.com>
Sun, 26 Jun 2011 05:55:33 +0000 (14:55 +0900)
committeryukihane <yukihane.feather@gmail.com>
Sun, 26 Jun 2011 05:59:58 +0000 (14:59 +0900)
21 files changed:
frontend/src/saccubus/converter/Converter.java
frontend/src/saccubus/converter/FfmpegCommand.java
frontend/src/saccubus/converter/classic/profile/CommentGetInfo.java
frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
frontend/src/saccubus/converter/classic/profile/FfmpegOption.java
frontend/src/saccubus/converter/classic/profile/GeneralSetting.java
frontend/src/saccubus/converter/classic/profile/InputFileSetting.java
frontend/src/saccubus/converter/classic/profile/NgSetting.java
frontend/src/saccubus/converter/classic/profile/OutputFileSetting.java
frontend/src/saccubus/converter/classic/profile/Profile.java
frontend/src/saccubus/converter/classic/profile/SFile.java
frontend/src/saccubus/converter/filegetter/FileInstanciator.java
frontend/src/yukihane/saccubus/converter/profile/CommentGetInfo.java [moved from frontend/src/saccubus/converter/profile/CommentGetInfo.java with 74% similarity]
frontend/src/yukihane/saccubus/converter/profile/Ffmpeg.java [moved from frontend/src/saccubus/converter/profile/Ffmpeg.java with 90% similarity]
frontend/src/yukihane/saccubus/converter/profile/FfmpegOption.java [moved from frontend/src/saccubus/converter/profile/FfmpegOption.java with 79% similarity]
frontend/src/yukihane/saccubus/converter/profile/GeneralSetting.java [moved from frontend/src/saccubus/converter/profile/GeneralSetting.java with 70% similarity]
frontend/src/yukihane/saccubus/converter/profile/InputFileSetting.java [new file with mode: 0644]
frontend/src/yukihane/saccubus/converter/profile/NgSetting.java [moved from frontend/src/saccubus/converter/profile/NgSetting.java with 69% similarity]
frontend/src/yukihane/saccubus/converter/profile/OutputFileSetting.java [new file with mode: 0644]
frontend/src/yukihane/saccubus/converter/profile/Profile.java [moved from frontend/src/saccubus/converter/profile/Profile.java with 84% similarity]
frontend/src/yukihane/saccubus/converter/profile/SFile.java [new file with mode: 0644]

index 20c7c02..be10f96 100644 (file)
@@ -1,12 +1,12 @@
 package saccubus.converter;
 
-import saccubus.converter.profile.Profile;
+import yukihane.saccubus.converter.profile.Profile;
 import saccubus.converter.filegetter.FileInstanciator;
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.Callable;
 import saccubus.ConvertStopFlag;
-import saccubus.converter.profile.FfmpegOption;
+import yukihane.saccubus.converter.profile.FfmpegOption;
 import saccubus.net.TextProgressListener;
 
 /**
index 9ac0be5..3aa7d7d 100644 (file)
@@ -12,10 +12,10 @@ import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import saccubus.ConvertStopFlag;
 import saccubus.conv.ConvertToVideoHook;
-import saccubus.converter.profile.NgSetting;
-import saccubus.converter.profile.Ffmpeg;
-import saccubus.converter.profile.FfmpegOption;
-import saccubus.converter.profile.GeneralSetting;
+import yukihane.saccubus.converter.profile.NgSetting;
+import yukihane.saccubus.converter.profile.Ffmpeg;
+import yukihane.saccubus.converter.profile.FfmpegOption;
+import yukihane.saccubus.converter.profile.GeneralSetting;
 import saccubus.net.TextProgressListener;
 import yukihane.swf.Cws2Fws;
 
index d169d9f..d2ec23f 100644 (file)
@@ -4,7 +4,7 @@ package saccubus.converter.classic.profile;
  *
  * @author yuki
  */
-public class CommentGetInfo implements saccubus.converter.profile.CommentGetInfo {
+public class CommentGetInfo implements yukihane.saccubus.converter.profile.CommentGetInfo {
 
     private final boolean selfAdjustCommentNum;
     private final int backComment;
index c16077e..8d6d7c6 100644 (file)
@@ -7,7 +7,7 @@ import java.io.File;
  *
  * @author yuki
  */
-public class Ffmpeg implements saccubus.converter.profile.Ffmpeg {
+public class Ffmpeg implements yukihane.saccubus.converter.profile.Ffmpeg {
 
     private final File ffmpeg;
     private final File vhook;
index 608714c..d5d80d8 100644 (file)
@@ -10,7 +10,7 @@ import java.util.Properties;
  *
  * @author yuki
  */
-public class FfmpegOption implements saccubus.converter.profile.FfmpegOption {
+public class FfmpegOption implements yukihane.saccubus.converter.profile.FfmpegOption {
 
     private final String extOption;
     private final String inOption;
index 79dcd55..9189249 100644 (file)
@@ -3,7 +3,7 @@ package saccubus.converter.classic.profile;
 
 import java.io.File;
 
-public class GeneralSetting implements saccubus.converter.profile.GeneralSetting {
+public class GeneralSetting implements yukihane.saccubus.converter.profile.GeneralSetting {
 
     private final File tempDir;
 
index ab3ad85..d98df20 100644 (file)
@@ -5,7 +5,7 @@ package saccubus.converter.classic.profile;
  *
  * @author yuki
  */
-public class InputFileSetting {
+public class InputFileSetting implements yukihane.saccubus.converter.profile.InputFileSetting {
 
     private final SFile file;
     private final boolean download;
index 3265b18..c427644 100644 (file)
@@ -5,7 +5,7 @@ package saccubus.converter.classic.profile;
  * NG設定.
  * @author yuki
  */
-public class NgSetting implements saccubus.converter.profile.NgSetting {
+public class NgSetting implements yukihane.saccubus.converter.profile.NgSetting {
 
     private final String word;
     private final String id;
index 0ae17e6..df133ce 100644 (file)
@@ -1,14 +1,10 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package saccubus.converter.classic.profile;
 
 /**
  *
  * @author yuki
  */
-public class OutputFileSetting {
+public class OutputFileSetting implements yukihane.saccubus.converter.profile.OutputFileSetting {
 
     private final SFile file;
     private final boolean convert;
index e663703..f905c9b 100644 (file)
@@ -7,7 +7,7 @@ import saccubus.converter.filegetter.LoginInfo;
  * Converterに処理させるための設定.
  * @author yuki
  */
-public class Profile implements saccubus.converter.profile.Profile {
+public class Profile implements yukihane.saccubus.converter.profile.Profile {
 
     private final GeneralSetting generalSetting;
     private final LoginInfo loginInfo;
index 25b4c77..1efb754 100644 (file)
@@ -8,7 +8,7 @@ import java.io.File;
  * このクラスはこれらをまとめて扱うためのもの。
  * @author yuki
  */
-public class SFile {
+public class SFile implements yukihane.saccubus.converter.profile.SFile {
 
     private final boolean isFile;
     private final File file;
index 3c92cb6..cdd938d 100644 (file)
@@ -6,7 +6,7 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import org.apache.commons.io.FilenameUtils;
 import saccubus.ConvertStopFlag;
-import saccubus.converter.classic.profile.InputFileSetting;
+import yukihane.saccubus.converter.profile.InputFileSetting;
 import saccubus.net.TextProgressListener;
 
 /**
diff --git a/frontend/src/yukihane/saccubus/converter/profile/InputFileSetting.java b/frontend/src/yukihane/saccubus/converter/profile/InputFileSetting.java
new file mode 100644 (file)
index 0000000..23219b3
--- /dev/null
@@ -0,0 +1,14 @@
+package yukihane.saccubus.converter.profile;
+
+/**
+ *
+ * @author yuki
+ */
+public interface InputFileSetting {
+
+    SFile getFile();
+
+    boolean isDownload();
+
+    boolean isDelete();
+}
diff --git a/frontend/src/yukihane/saccubus/converter/profile/OutputFileSetting.java b/frontend/src/yukihane/saccubus/converter/profile/OutputFileSetting.java
new file mode 100644 (file)
index 0000000..835a710
--- /dev/null
@@ -0,0 +1,14 @@
+package yukihane.saccubus.converter.profile;
+
+public interface OutputFileSetting {
+
+    boolean isConvert();
+
+    boolean isAppendPrefixVideoId();
+
+    boolean isAddComment();
+
+    boolean isAddTcomment();
+
+    SFile getFile();
+}
@@ -1,6 +1,5 @@
-package saccubus.converter.profile;
+package yukihane.saccubus.converter.profile;
 
-import saccubus.converter.classic.profile.InputFileSetting;
 import saccubus.converter.classic.profile.OutputFileSetting;
 import saccubus.converter.filegetter.LoginInfo;
 
diff --git a/frontend/src/yukihane/saccubus/converter/profile/SFile.java b/frontend/src/yukihane/saccubus/converter/profile/SFile.java
new file mode 100644 (file)
index 0000000..952ad8c
--- /dev/null
@@ -0,0 +1,14 @@
+package yukihane.saccubus.converter.profile;
+
+import java.io.File;
+
+/**
+ *
+ * @author yuki
+ */
+public interface SFile {
+
+    boolean isFile();
+
+    File getFile();
+}