インタフェース名変更: GeneralSetting -> GeneralProfile

diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java
index 4dc18de..08b3384 100644 (file)
--- a/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@ -17,7 +17,7 @@ import saccubus.conv.ConvertToVideoHook;
 import yukihane.saccubus.converter.profile.NgSetting;
 import yukihane.saccubus.converter.profile.FfmpegProfile;
 import yukihane.saccubus.converter.profile.FfmpegOption;
-import yukihane.saccubus.converter.profile.GeneralSetting;
+import yukihane.saccubus.converter.profile.GeneralProfile;
 import saccubus.net.TextProgressListener;
 import yukihane.mediainfowrapper.Info;
 import yukihane.mediainfowrapper.MediaInfo;
@@ -40,7 +40,7 @@ public class FfmpegCommand extends AbstractCommand {
     private final FfmpegProfile ffmpeg;
 
     FfmpegCommand(TextProgressListener listener, ConvertStopFlag flag, File commentFile, File tcommFile,
-            File videoFile, File convertedVideoFile, FfmpegProfile ffmpeg, GeneralSetting general) throws IOException {
+            File videoFile, File convertedVideoFile, FfmpegProfile ffmpeg, GeneralProfile general) throws IOException {
         super(listener, flag);
         this.commentFile = commentFile;
         this.tcommFile = tcommFile;

diff --git a/frontend/src/saccubus/converter/classic/profile/GeneralSetting.java b/frontend/src/saccubus/converter/classic/profile/GeneralSetting.java
index 9189249..5a9a34a 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.GeneralSetting {
+public class GeneralSetting implements yukihane.saccubus.converter.profile.GeneralProfile {
 
     private final File tempDir;
 

diff --git a/frontend/src/yukihane/saccubus/converter/profile/GeneralSetting.java b/frontend/src/yukihane/saccubus/converter/profile/GeneralProfile.java
similarity index 78%
rename from frontend/src/yukihane/saccubus/converter/profile/GeneralSetting.java
rename to frontend/src/yukihane/saccubus/converter/profile/GeneralProfile.java
index c421bd8..bdff7e6 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/GeneralSetting.java
+++ b/frontend/src/yukihane/saccubus/converter/profile/GeneralProfile.java
@@ -6,7 +6,7 @@ import java.io.File;
  *
  * @author yuki
  */
-public interface GeneralSetting {
+public interface GeneralProfile {
 
     File getTempDir();
 }

diff --git a/frontend/src/yukihane/saccubus/converter/profile/Profile.java b/frontend/src/yukihane/saccubus/converter/profile/Profile.java
index d528776..3d34842 100644 (file)
--- a/frontend/src/yukihane/saccubus/converter/profile/Profile.java
+++ b/frontend/src/yukihane/saccubus/converter/profile/Profile.java
@@ -20,5 +20,5 @@ public interface Profile {
 
     FfmpegProfile getFfmpeg();
 
-    GeneralSetting getGeneralSetting();
+    GeneralProfile getGeneralSetting();
 }