index on dev20110528_setting_reduce: 9817594 フィールド名修正

diff --git a/frontend/docs/nextspec.xlsx b/frontend/docs/nextspec.xlsx
new file mode 100644 (file)
index 0000000..bc9be45
Binary files /dev/null and b/frontend/docs/nextspec.xlsx differ

diff --git a/frontend/docs/ユースケース.docx b/frontend/docs/ユースケース.docx
new file mode 100644 (file)
index 0000000..2ef39f4
Binary files /dev/null and b/frontend/docs/ユースケース.docx differ

diff --git a/frontend/src/saccubus/converter/Converter.java b/frontend/src/saccubus/converter/Converter.java
index d2a3868..b3ff1da 100644 (file)
--- a/frontend/src/saccubus/converter/Converter.java
+++ b/frontend/src/saccubus/converter/Converter.java
@@ -32,11 +32,11 @@ public class Converter extends AbstractCommand implements Runnable, Callable<Boo
      * コンバータを構築します.
      * @param url 対象となる動画のURL.
      * @param time
-     * @param setting
+     * @param profile
      * @param listener
      * @param flag 
      */
-    public Converter(String url, String time, Profile setting,
+    public Converter(String url, String time, Profile profile,
             TextProgressListener listener, ConvertStopFlag flag) {
         super(listener, flag);
         url = url.trim();
@@ -51,7 +51,7 @@ public class Converter extends AbstractCommand implements Runnable, Callable<Boo
             movieId = url;
         }
         this.time = time;
-        this.profile = setting;
+        this.profile = profile;
     }
 
     public Boolean call() throws Exception {

diff --git a/frontend/src/yukihane/inqubuss/gui/MainFrame.java b/frontend/src/yukihane/inqubuss/gui/MainFrame.java
index f09598a..ef8440a 100644 (file)
--- a/frontend/src/yukihane/inqubuss/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubuss/gui/MainFrame.java
@@ -296,20 +296,16 @@ public class MainFrame extends javax.swing.JFrame {
 
     private class DownloadListTransferHandler extends TransferHandler {
 
-        private final Pattern pattern = Pattern.compile("(\\w\\w\\d+)");
+        private final Pattern movieIdPattern = Pattern.compile("(\\w\\w\\d+)");
 
         @Override
         public boolean canImport(TransferHandler.TransferSupport support) {
-            
-            // TODO ファイル, URLはインポート可能とする.
-            DataFlavor[] flavors = support.getDataFlavors();
-            System.out.println("fl start");
-            for (DataFlavor f : flavors) {
-                System.out.println(f.getPrimaryType() + ", " + f.getMimeType() + ", " + f.getSubType() + ", " + f.
-                        getHumanPresentableName());
+            Transferable transferable = support.getTransferable();
+            if (transferable.isDataFlavorSupported(DataFlavor.javaFileListFlavor)
+                    || transferable.isDataFlavorSupported(DataFlavor.stringFlavor)) {
+                return true;
             }
-            System.out.println("fl end");
-            return true;
+            return false;
         }
 
         @Override
@@ -320,17 +316,19 @@ public class MainFrame extends javax.swing.JFrame {
                     List<File> data = (List<File>) transferable.getTransferData(DataFlavor.javaFileListFlavor);
                     Collection<Target> targets = Target.from(data);
                     targetModel.addTarget(targets);
-                } else {
+                } else if (transferable.isDataFlavorSupported(DataFlavor.stringFlavor)) {
                     String data = (String) transferable.getTransferData(DataFlavor.stringFlavor);
-                    Matcher matcher = pattern.matcher(data);
+                    Matcher matcher = movieIdPattern.matcher(data);
                     if (matcher.find()) {
-                        System.out.println("matched" + matcher.group(1));
+                        String movieId = matcher.group(1);
+                        Target target = Target.fromId(movieId);
+                        targetModel.addTarget(target);
                     } else {
                         return false;
                     }
 
                 }
-                return true;
+                return false;
             } catch (Exception e) {
                 e.printStackTrace();
                 return false;

diff --git a/frontend/src/yukihane/inqubuss/model/Target.java b/frontend/src/yukihane/inqubuss/model/Target.java
index 2b12187..82bbd45 100644 (file)
--- a/frontend/src/yukihane/inqubuss/model/Target.java
+++ b/frontend/src/yukihane/inqubuss/model/Target.java
@@ -14,6 +14,10 @@ public class Target {
         return list;
     }
 
+    public static Target fromId(String movieId) {
+        return new Target(movieId);
+    }
+
     private Location movie;
     private Location comment;
     private Location ownerComment;
@@ -23,6 +27,10 @@ public class Target {
         movie = new Location(f);
     }
 
+    private Target(String movieId) {
+        movie = new Location(movieId);
+    }
+
     public Location getComment() {
         return comment;
     }

diff --git a/frontend/src/yukihane/inqubuss/model/TargetsTableModel.java b/frontend/src/yukihane/inqubuss/model/TargetsTableModel.java
index f8a1e62..7685798 100644 (file)
--- a/frontend/src/yukihane/inqubuss/model/TargetsTableModel.java
+++ b/frontend/src/yukihane/inqubuss/model/TargetsTableModel.java
@@ -70,6 +70,11 @@ public class TargetsTableModel extends AbstractTableModel {
         if (before < after) {
             fireTableRowsInserted(before, after - 1);
         }
+    }
 
+    public void addTarget(Target t) {
+        List<Target> list = new ArrayList<Target>(1);
+        list.add(t);
+        addTarget(list);
     }
 }

diff --git a/frontend/src/yukihane/inqubuss/worker/TargetPumper.java b/frontend/src/yukihane/inqubuss/worker/TargetPumper.java
new file mode 100644 (file)
index 0000000..84b4087
--- /dev/null
+++ b/frontend/src/yukihane/inqubuss/worker/TargetPumper.java
@@ -0,0 +1,25 @@
+package yukihane.inqubuss.worker;
+
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import saccubus.ConvertStopFlag;
+import saccubus.converter.Converter;
+import saccubus.net.TextProgressListener;
+
+/**
+ *
+ * @author yuki
+ */
+public class TargetPumper implements TableModelListener{
+
+    @Override
+    public void tableChanged(TableModelEvent e) {
+        System.out.println(e.getType());
+    }
+    
+    public void exec(){
+//        Converter conv = new Converter(tag, time, setting.toProfile(), TextProgressListener.EMPTY_LISTENER, new ConvertStopFlag(
+//                ConvertStopFlag.StateChangeListener.EMPTY_LISTENER));
+    }
+    
+}

diff --git a/frontend/test/saccubus/converter/ConverterTest.java b/frontend/test/saccubus/converter/ConverterTest.java
index b889b01..487255d 100644 (file)
--- a/frontend/test/saccubus/converter/ConverterTest.java
+++ b/frontend/test/saccubus/converter/ConverterTest.java
@@ -9,15 +9,15 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
 import saccubus.ConvertStopFlag;
+import saccubus.net.TextProgressListener;
 
 /**
  *
  * @author yuki
  */
 public class ConverterTest {
-    
+
     @BeforeClass
     public static void setUpClass() throws Exception {
     }
@@ -25,19 +25,28 @@ public class ConverterTest {
     @AfterClass
     public static void tearDownClass() throws Exception {
     }
-    
+
     @Before
     public void setUp() {
     }
-    
+
     @After
     public void tearDown() {
     }
 
     @Test
-    public void testConverter() throws Exception{
-                Converter conv = new Converter("sm7139747",null,null,null,null);
-                conv.call();
+    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, null, listener, flag);
+        conv.call();
     }
 //    /**
 //     * Test of call method, of class Converter.