LoginInfoのinterface化

diff --git a/frontend/src/saccubus/converter/filegetter/LoginInfo.java b/frontend/src/saccubus/converter/classic/profile/LoginInfo.java
similarity index 75%
rename from frontend/src/saccubus/converter/filegetter/LoginInfo.java
rename to frontend/src/saccubus/converter/classic/profile/LoginInfo.java
index ca65565..3ddfd6c 100644 (file)
--- a/frontend/src/saccubus/converter/filegetter/LoginInfo.java
+++ b/frontend/src/saccubus/converter/classic/profile/LoginInfo.java
@@ -1,8 +1,4 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package saccubus.converter.filegetter;
+package saccubus.converter.classic.profile;
 
 import saccubus.converter.classic.profile.Proxy;
 
@@ -10,7 +6,7 @@ import saccubus.converter.classic.profile.Proxy;
  *
  * @author yuki
  */
-public class LoginInfo {
+public class LoginInfo implements yukihane.saccubus.converter.profile.LoginInfo {
 
     private final String mail;
     private final String pass;

diff --git a/frontend/src/saccubus/converter/classic/profile/Profile.java b/frontend/src/saccubus/converter/classic/profile/Profile.java
index f905c9b..357ec66 100644 (file)
--- a/frontend/src/saccubus/converter/classic/profile/Profile.java
+++ b/frontend/src/saccubus/converter/classic/profile/Profile.java
@@ -1,8 +1,6 @@
 /* $Id$ */
 package saccubus.converter.classic.profile;
 
-import saccubus.converter.filegetter.LoginInfo;
-
 /**
  * Converterに処理させるための設定.
  * @author yuki

diff --git a/frontend/src/saccubus/converter/classic/profile/Proxy.java b/frontend/src/saccubus/converter/classic/profile/Proxy.java
index 9472ce9..f2a339d 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 {
+public class Proxy implements yukihane.saccubus.converter.profile.Proxy {
 
     private String host;
     private int port;

diff --git a/frontend/src/saccubus/converter/filegetter/FileInstanciator.java b/frontend/src/saccubus/converter/filegetter/FileInstanciator.java
index cdd938d..93b175d 100644 (file)
--- a/frontend/src/saccubus/converter/filegetter/FileInstanciator.java
+++ b/frontend/src/saccubus/converter/filegetter/FileInstanciator.java
@@ -8,6 +8,7 @@ import org.apache.commons.io.FilenameUtils;
 import saccubus.ConvertStopFlag;
 import yukihane.saccubus.converter.profile.InputFileSetting;
 import saccubus.net.TextProgressListener;
+import yukihane.saccubus.converter.profile.LoginInfo;
 
 /**
  * ダウンロード処理を全く必要としない場合のファイルインスタンス化クラス.

diff --git a/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java b/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
index 4cd4dfe..e0aa278 100644 (file)
--- a/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
+++ b/frontend/src/saccubus/converter/filegetter/WebFileInstanciator.java
@@ -7,6 +7,7 @@ import saccubus.ConvertStopFlag;
 import saccubus.converter.classic.profile.Proxy;
 import saccubus.net.NicoClient;
 import saccubus.net.VideoInfo;
+import yukihane.saccubus.converter.profile.LoginInfo;
 
 /**
  * 動画ファイル, コメントファイルなど必要なファイルのうち, 1つでもダウンロード処理を必要とする場合のインスタンス化クラス.

diff --git a/frontend/src/saccubus/prompt/Prompt.java b/frontend/src/saccubus/prompt/Prompt.java
index 254ab1d..2aec63a 100644 (file)
--- a/frontend/src/saccubus/prompt/Prompt.java
+++ b/frontend/src/saccubus/prompt/Prompt.java
@@ -16,7 +16,7 @@ import org.apache.commons.cli.Options;
 import saccubus.ConvertStopFlag;
 import saccubus.ConvertStopFlag.State;
 import saccubus.converter.Converter;
-import saccubus.converter.filegetter.LoginInfo;
+import saccubus.converter.classic.profile.LoginInfo;
 import saccubus.converter.classic.profile.CommentGetInfo;
 import saccubus.converter.classic.profile.Ffmpeg;
 import saccubus.converter.classic.profile.FfmpegOption;

diff --git a/frontend/src/saccubus/properties/SProperties.java b/frontend/src/saccubus/properties/SProperties.java
index 57da7eb..71a99d3 100644 (file)
--- a/frontend/src/saccubus/properties/SProperties.java
+++ b/frontend/src/saccubus/properties/SProperties.java
@@ -6,7 +6,7 @@ import java.io.IOException;
 import java.io.FileOutputStream;
 import java.io.FileInputStream;
 import saccubus.VideoSaveKind;
-import saccubus.converter.filegetter.LoginInfo;
+import saccubus.converter.classic.profile.LoginInfo;
 import saccubus.converter.classic.profile.CommentGetInfo;
 import saccubus.converter.classic.profile.Ffmpeg;
 import saccubus.converter.classic.profile.FfmpegOption;

diff --git a/frontend/src/yukihane/saccubus/converter/profile/LoginInfo.java b/frontend/src/yukihane/saccubus/converter/profile/LoginInfo.java
new file mode 100644 (file)
index 0000000..1889481
--- /dev/null
+++ b/frontend/src/yukihane/saccubus/converter/profile/LoginInfo.java
@@ -0,0 +1,14 @@
+package yukihane.saccubus.converter.profile;
+
+/**
+ *
+ * @author yuki
+ */
+public interface LoginInfo {
+
+    public String getMail();
+
+    public String getPass();
+
+    public Proxy getProxy();
+}

diff --git a/frontend/src/yukihane/saccubus/converter/profile/Profile.java b/frontend/src/yukihane/saccubus/converter/profile/Profile.java
index c4e25b3..531e965 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/Profile.java
+++ b/frontend/src/yukihane/saccubus/converter/profile/Profile.java
@@ -1,8 +1,5 @@
 package yukihane.saccubus.converter.profile;
 
-import saccubus.converter.classic.profile.OutputFileSetting;
-import saccubus.converter.filegetter.LoginInfo;
-
 /**
  *
  * @author yuki

diff --git a/frontend/src/yukihane/saccubus/converter/profile/Proxy.java b/frontend/src/yukihane/saccubus/converter/profile/Proxy.java
new file mode 100644 (file)
index 0000000..8ea8019
--- /dev/null
+++ b/frontend/src/yukihane/saccubus/converter/profile/Proxy.java
@@ -0,0 +1,12 @@
+package yukihane.saccubus.converter.profile;
+
+/**
+ *
+ * @author yuki
+ */
+public interface Proxy {
+
+    public String getHost();
+
+    public int getPort();
+}