ConvertStopFlag, TextProgressListenerクラス削除

diff --git a/frontend/src/saccubus/ConvertStopFlag.java b/frontend/src/saccubus/ConvertStopFlag.java
deleted file mode 100644 (file)
index 27cea8e..0000000
--- a/frontend/src/saccubus/ConvertStopFlag.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package saccubus;
-
-/**
- * <p>
- * タイトル: さきゅばす
- * </p>
- *
- * <p>
- * 説明: ニコニコ動画の動画をコメントつきで保存
- * </p>
- *
- * <p>
- * 著作権: Copyright (c) 2007 PSI
- * </p>
- *
- * <p>
- * 会社名:
- * </p>
- *
- * @author 未入力
- * @version 1.0
- */
-// TODO 不要になる予定
-public class ConvertStopFlag {
-
-    public interface StateChangeListener {
-
-        void changeState(State s);
-        /**
-         * StateChangeListenerの何もしないバージョンの実装.
-         */
-        static final ConvertStopFlag.StateChangeListener EMPTY_LISTENER = new ConvertStopFlag.StateChangeListener() {
-
-            public void changeState(State s) {
-            }
-        };
-    }
-
-    public enum State {
-
-        STOPPING, FINISHED;
-    }
-    private volatile boolean needStop = false;
-    private volatile boolean finished = false;
-    private final StateChangeListener listener;
-
-    public ConvertStopFlag(StateChangeListener listener) {
-        this.listener = listener;
-    }
-
-    public void requestStop() {
-        needStop = true;
-        listener.changeState(State.STOPPING);
-    }
-
-    public boolean needStop() {
-        return needStop;
-    }
-
-    public boolean isFinished() {
-        return finished;
-    }
-
-    public void finished() {
-        finished = true;
-        listener.changeState(State.FINISHED);
-    }
-}

diff --git a/frontend/src/saccubus/converter/Converter.java b/frontend/src/saccubus/converter/Converter.java
index 04fbbfe..a208b8b 100644 (file)
--- a/frontend/src/saccubus/converter/Converter.java
+++ b/frontend/src/saccubus/converter/Converter.java
@@ -13,8 +13,6 @@ import nicobrowser.ProgressListener;
 import nicobrowser.WayBackInfo;
 import nicobrowser.entity.NicoContent.Status;
 import org.apache.http.HttpException;
 import nicobrowser.WayBackInfo;
 import nicobrowser.entity.NicoContent.Status;
 import org.apache.http.HttpException;

-import saccubus.ConvertStopFlag;
-import saccubus.net.TextProgressListener;

 import saccubus.converter.profile.CommentProfile;
 import saccubus.converter.profile.FfmpegProfile;
 import saccubus.converter.profile.GeneralProfile;
 import saccubus.converter.profile.CommentProfile;
 import saccubus.converter.profile.FfmpegProfile;
 import saccubus.converter.profile.GeneralProfile;


@@ -34,7 +32,7 @@ import saccubus.converter.profile.ProxyProfile;
  * @author 未入力
  * @version 1.0
  */
  * @author 未入力
  * @version 1.0
  */

-public abstract class Converter extends SwingWorker<ConvertResult, ConvertProgress> implements Callable<Boolean> {
+public class Converter extends SwingWorker<ConvertResult, ConvertProgress> implements Callable<Boolean> {

 
     private static final Logger logger = Logger.getLogger(Converter.class.getName());
     private final Profile profile;
 
     private static final Logger logger = Logger.getLogger(Converter.class.getName());
     private final Profile profile;


@@ -48,8 +46,7 @@ public abstract class Converter extends SwingWorker<ConvertResult, ConvertProgre
      * @param listener
      * @param flag
      */
      * @param listener
      * @param flag
      */

-    public Converter(String id, Profile profile,
-            TextProgressListener listener, ConvertStopFlag flag) {
+    public Converter(String id, Profile profile) {

         this.movieId = id;
         this.profile = profile;
     }
         this.movieId = id;
         this.profile = profile;
     }

diff --git a/frontend/src/saccubus/converter/FfmpegCommand.java b/frontend/src/saccubus/converter/FfmpegCommand.java
index 200d206..57e16f6 100644 (file)
--- a/frontend/src/saccubus/converter/FfmpegCommand.java
+++ b/frontend/src/saccubus/converter/FfmpegCommand.java
@@ -13,12 +13,10 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.SwingWorker;
 import org.apache.commons.lang.StringUtils;
 import java.util.logging.Logger;
 import javax.swing.SwingWorker;
 import org.apache.commons.lang.StringUtils;

-import saccubus.ConvertStopFlag;

 import saccubus.conv.ConvertToVideoHook;
 import saccubus.converter.profile.ConvertProfile;
 import saccubus.converter.profile.FfmpegProfile;
 import saccubus.converter.profile.GeneralProfile;
 import saccubus.conv.ConvertToVideoHook;
 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.mediainfowrapper.Info;
 import yukihane.mediainfowrapper.MediaInfo;
 import yukihane.mediainfowrapper.Size;


@@ -40,8 +38,8 @@ public class FfmpegCommand extends SwingWorker<FfmpegCommandResult, FfmpegComman
     private final File convertedVideoFile;
     private final ConvertProfile ffmpeg;
 
     private final File convertedVideoFile;
     private final ConvertProfile ffmpeg;
 

-    FfmpegCommand(TextProgressListener listener, ConvertStopFlag flag, File commentFile,
-            File videoFile, File convertedVideoFile, ConvertProfile ffmpeg, GeneralProfile general) throws IOException {
+    FfmpegCommand(File commentFile, File videoFile, File convertedVideoFile, ConvertProfile ffmpeg,
+            GeneralProfile general) throws IOException {

         this.commentFile = commentFile;
         this.videoFile = videoFile;
         this.convertedVideoFile = convertedVideoFile;
         this.commentFile = commentFile;
         this.videoFile = videoFile;
         this.convertedVideoFile = convertedVideoFile;

diff --git a/frontend/src/saccubus/net/TextProgressListener.java b/frontend/src/saccubus/net/TextProgressListener.java
deleted file mode 100644 (file)
index 950540d..0000000
--- a/frontend/src/saccubus/net/TextProgressListener.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package saccubus.net;
-
-/**
- *
- * @author yuki
- */
-public interface TextProgressListener {
-
-    void setText(String text);
-    /**
-     * TextProgressListenerの何もしないバージョンの実装.
-     */
-    static final TextProgressListener EMPTY_LISTENER = new TextProgressListener() {
-
-        public void setText(String text) {
-        }
-    };
-}

diff --git a/frontend/src/saccubus/prompt/Prompt.java b/frontend/src/saccubus/prompt/Prompt.java
index 043863b..498716b 100644 (file)
--- a/frontend/src/saccubus/prompt/Prompt.java
+++ b/frontend/src/saccubus/prompt/Prompt.java
@@ -1,6 +1,5 @@
 package saccubus.prompt;
 
 package saccubus.prompt;
 

-import java.io.File;

 import java.io.IOException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.io.IOException;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;


@@ -13,18 +12,8 @@ import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.OptionBuilder;
 import org.apache.commons.cli.Options;

-import saccubus.ConvertStopFlag;
-import saccubus.ConvertStopFlag.State;

 import saccubus.converter.Converter;
 import saccubus.converter.Converter;

-import saccubus.converter.classic.profile.LoginInfo;
-import saccubus.converter.classic.profile.CommentGetInfo;
-import saccubus.converter.classic.profile.Ffmpeg;
-import saccubus.converter.classic.profile.FfmpegOption;
-import saccubus.converter.classic.profile.GeneralSetting;
-import saccubus.converter.classic.profile.InputFileSetting;
-import saccubus.converter.classic.profile.OutputFileSetting;

 import saccubus.converter.classic.profile.Profile;
 import saccubus.converter.classic.profile.Profile;

-import saccubus.net.TextProgressListener;

 
 /**
  * <p>
 
 /**
  * <p>


@@ -59,11 +48,6 @@ public class Prompt {
     }
 
     public void execute(String[] args) throws IOException {
     }
 
     public void execute(String[] args) throws IOException {

-        execute(args, TextProgressListener.EMPTY_LISTENER, ConvertStopFlag.StateChangeListener.EMPTY_LISTENER);
-    }
-
-    public void execute(String[] args, TextProgressListener tpl, ConvertStopFlag.StateChangeListener scl) throws
-            IOException {

         Options options = createOptions(args);
         Profile profile;
         try {
         Options options = createOptions(args);
         Profile profile;
         try {


@@ -77,7 +61,7 @@ public class Prompt {
             throw new IOException(e);
         }
 
             throw new IOException(e);
         }
 

-        Converter conv = new Converter("dummy0", profile, tpl, new ConvertStopFlag(scl));
+        Converter conv = new Converter("dummy0", profile);

         ExecutorService es = Executors.newSingleThreadExecutor();
         Future<Boolean> future = es.submit((Callable<Boolean>) conv);
         try {
         ExecutorService es = Executors.newSingleThreadExecutor();
         Future<Boolean> future = es.submit((Callable<Boolean>) conv);
         try {


@@ -167,8 +151,7 @@ public class Prompt {
 //        SProperties setting = SProperties.loadSetting(mail, pass);
 //        Converter conv = new Converter(tag, setting.toProfile(), TextProgressListener.EMPTY_LISTENER, new ConvertStopFlag(
 //                ConvertStopFlag.StateChangeListener.EMPTY_LISTENER));
 //        SProperties setting = SProperties.loadSetting(mail, pass);
 //        Converter conv = new Converter(tag, setting.toProfile(), TextProgressListener.EMPTY_LISTENER, new ConvertStopFlag(
 //                ConvertStopFlag.StateChangeListener.EMPTY_LISTENER));

-        Converter conv = new Converter(tag, null/*この部分*/, TextProgressListener.EMPTY_LISTENER, new ConvertStopFlag(
-                ConvertStopFlag.StateChangeListener.EMPTY_LISTENER));
+        Converter conv = new Converter(tag, null/*この部分*/);

         System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
         System.out.println("Saccubus on CUI");
         System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
         System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");
         System.out.println("Saccubus on CUI");
         System.out.println("-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-");

diff --git a/frontend/test/saccubus/converter/ConverterTest.java b/frontend/test/saccubus/converter/ConverterTest.java
index 6b2459c..67fb228 100644 (file)
--- a/frontend/test/saccubus/converter/ConverterTest.java
+++ b/frontend/test/saccubus/converter/ConverterTest.java
@@ -9,8 +9,6 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;

-import saccubus.ConvertStopFlag;
-import saccubus.net.TextProgressListener;

 
 /**
  *
 
 /**
  *


@@ -36,16 +34,7 @@ public class ConverterTest {
 
     @Test
     public void testConverter() throws Exception {
 
     @Test
     public void testConverter() throws Exception {

-        TextProgressListener listener = new TextProgressListener() {
-
-            @Override
-            public void setText(String text) {
-                System.out.println(text);
-            }
-        };
-        ConvertStopFlag flag = new ConvertStopFlag(ConvertStopFlag.StateChangeListener.EMPTY_LISTENER);
-
-        Converter conv = new Converter("sm7139747", null, listener, flag);
+        Converter conv = new Converter("sm7139747", null);

         conv.call();
     }
 //    /**
         conv.call();
     }
 //    /**