不要プロファイル削除, プロファイル名を適切なものに修正

diff --git a/frontend/src/saccubus/converter/Converter.java b/frontend/src/saccubus/converter/Converter.java
index 809f59b..13dc2da 100644 (file)
--- a/frontend/src/saccubus/converter/Converter.java
+++ b/frontend/src/saccubus/converter/Converter.java
@@ -231,7 +231,7 @@ public class Converter extends AbstractCommand implements Callable<Boolean> {
         final NicoHttpClient client = createClient(profile.getProxySetting());
         final boolean hasLogin;
         try {
-            hasLogin = client.login(profile.getLoginInfo().getMail(), profile.getLoginInfo().getPass());
+            hasLogin = client.login(profile.getLoginInfo().getMail(), profile.getLoginInfo().getPassword());
             if (!hasLogin) {
                 throw new IOException("login fail");
             }

diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java
index a136c57..e95578a 100644 (file)
--- a/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@ -15,7 +15,7 @@ import org.apache.commons.lang.StringUtils;
 import saccubus.ConvertStopFlag;
 import saccubus.conv.ConvertToVideoHook;
 import yukihane.saccubus.converter.profile.NgSetting;
-import yukihane.saccubus.converter.profile.FfmpegProfile;
+import yukihane.saccubus.converter.profile.ConvertProfile;
 import yukihane.saccubus.converter.profile.FfmpegOption;
 import yukihane.saccubus.converter.profile.GeneralProfile;
 import saccubus.net.TextProgressListener;
@@ -36,10 +36,10 @@ public class FfmpegCommand extends AbstractCommand {
     private final File commentFile;
     private final File videoFile;
     private final File convertedVideoFile;
-    private final FfmpegProfile ffmpeg;
+    private final ConvertProfile ffmpeg;
 
     FfmpegCommand(TextProgressListener listener, ConvertStopFlag flag, File commentFile,
-            File videoFile, File convertedVideoFile, FfmpegProfile ffmpeg, GeneralProfile general) throws IOException {
+            File videoFile, File convertedVideoFile, ConvertProfile ffmpeg, GeneralProfile general) throws IOException {
         super(listener, flag);
         this.commentFile = commentFile;
         this.videoFile = videoFile;
@@ -254,7 +254,7 @@ public class FfmpegCommand extends AbstractCommand {
         return sb.toString();
     }
 
-    private FfmpegProfile getFfmpeg() {
+    private ConvertProfile getFfmpeg() {
         return ffmpeg;
     }
 }

diff --git a/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java b/frontend/src/saccubus/converter/classic/profile/Ffmpeg.java
index 94498ff..620da76 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.FfmpegProfile {
+public class Ffmpeg implements yukihane.saccubus.converter.profile.ConvertProfile {
 
     private final File ffmpeg;
     private final File vhook;

diff --git a/frontend/src/saccubus/converter/classic/profile/LoginInfo.java b/frontend/src/saccubus/converter/classic/profile/LoginInfo.java
index f640e09..c28f0a6 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.LoinProfile {
+public class LoginInfo implements yukihane.saccubus.converter.profile.LoginProfile {
 
     private final String mail;
     private final String pass;
@@ -22,7 +22,7 @@ public class LoginInfo implements yukihane.saccubus.converter.profile.LoinProfil
         return mail;
     }
 
-    public String getPass() {
+    public String getPassword() {
         return pass;
     }
 

diff --git a/frontend/src/saccubus/converter/classic/profile/User.java b/frontend/src/saccubus/converter/classic/profile/User.java
index a52b7ab..b4a209c 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.User {
+public class User implements yukihane.saccubus.converter.profile.LoginProfile {
 
     private final String mail;
     private final String password;

diff --git a/frontend/src/yukihane/inqubus/saccubus_adapter/NicoBrowserAdapter.java b/frontend/src/yukihane/inqubus/saccubus_adapter/NicoBrowserAdapter.java
index 1263a97..1c4ee13 100644 (file)
--- a/frontend/src/yukihane/inqubus/saccubus_adapter/NicoBrowserAdapter.java
+++ b/frontend/src/yukihane/inqubus/saccubus_adapter/NicoBrowserAdapter.java
@@ -15,7 +15,7 @@ import saccubus.net.TextProgressListener;
 import saccubus.net.VideoInfo;
 import saccubus.util.FileUtil;
 import yukihane.saccubus.converter.profile.CommentProfile;
-import yukihane.saccubus.converter.profile.LoinProfile;
+import yukihane.saccubus.converter.profile.LoginProfile;
 import yukihane.saccubus.converter.profile.ProxyProfile;
 
 /**
@@ -52,7 +52,7 @@ public class NicoBrowserAdapter implements NicoClient {
 
     }
 
-    public NicoBrowserAdapter(LoinProfile loginInfo, ProxyProfile proxy, ConvertStopFlag flag) {
+    public NicoBrowserAdapter(LoginProfile loginInfo, ProxyProfile proxy, ConvertStopFlag flag) {
         if (proxy.use()) {
             this.client = new NicoHttpClient(proxy.getHost(), proxy.getPort());
         } else {
@@ -62,7 +62,7 @@ public class NicoBrowserAdapter implements NicoClient {
         // ログイン
         boolean loginned = false;
         try {
-            loginned = client.login(loginInfo.getMail(), loginInfo.getPass());
+            loginned = client.login(loginInfo.getMail(), loginInfo.getPassword());
         } catch (Exception ex) {
             logger.log(Level.SEVERE, "ログイン処理時に例外発生", ex);
         }

diff --git a/frontend/src/yukihane/saccubus/converter/profile/FfmpegProfile.java b/frontend/src/yukihane/saccubus/converter/profile/ConvertProfile.java
similarity index 97%
rename from frontend/src/yukihane/saccubus/converter/profile/FfmpegProfile.java
rename to frontend/src/yukihane/saccubus/converter/profile/ConvertProfile.java
index 7729114..befd0d3 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/FfmpegProfile.java
+++ b/frontend/src/yukihane/saccubus/converter/profile/ConvertProfile.java
@@ -6,7 +6,7 @@ import java.io.File;
  *
  * @author yuki
  */
-public interface FfmpegProfile {
+public interface ConvertProfile {
 
     FfmpegOption getFfmpegOption();
 

diff --git a/frontend/src/yukihane/saccubus/converter/profile/LoinProfile.java b/frontend/src/yukihane/saccubus/converter/profile/LoginProfile.java
similarity index 82%
rename from frontend/src/yukihane/saccubus/converter/profile/LoinProfile.java
rename to frontend/src/yukihane/saccubus/converter/profile/LoginProfile.java
index 13a0a4f..23ae311 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/LoinProfile.java
+++ b/frontend/src/yukihane/saccubus/converter/profile/LoginProfile.java
@@ -4,11 +4,11 @@ package yukihane.saccubus.converter.profile;
  * ニコニコ動画サービスへのログイン情報を保持するためのプロファイルです.
  * @author yuki
  */
-public interface LoinProfile {
+public interface LoginProfile {
 
     /** @return ログインID(メールアドレス). */
     public String getMail();
 
     /** @return ログインパスワード. */
-    public String getPass();
+    public String getPassword();
 }

diff --git a/frontend/src/yukihane/saccubus/converter/profile/Profile.java b/frontend/src/yukihane/saccubus/converter/profile/Profile.java
index fbd2d28..e9f60f0 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/Profile.java
+++ b/frontend/src/yukihane/saccubus/converter/profile/Profile.java
@@ -8,7 +8,7 @@ package yukihane.saccubus.converter.profile;
  */
 public interface Profile {
 
-    LoinProfile getLoginInfo();
+    LoginProfile getLoginInfo();
 
     ProxyProfile getProxySetting();
 
@@ -18,7 +18,7 @@ public interface Profile {
 
     OutputProfile getOutputFileSetting();
 
-    FfmpegProfile getFfmpeg();
+    ConvertProfile getFfmpeg();
 
     GeneralProfile getGeneralSetting();
 }

diff --git a/frontend/src/yukihane/saccubus/converter/profile/User.java b/frontend/src/yukihane/saccubus/converter/profile/User.java
deleted file mode 100644 (file)
index 7883908..0000000
--- a/frontend/src/yukihane/saccubus/converter/profile/User.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package yukihane.saccubus.converter.profile;
-
-public interface User {
-
-    String getMail();
-
-    String getPassword();
-}