不要メソッド整理

diff --git a/frontend/src/yukihane/inqubus/model/Target.java b/frontend/src/yukihane/inqubus/model/Target.java
index c6cc692..fccd90d 100644 (file)
--- a/frontend/src/yukihane/inqubus/model/Target.java
+++ b/frontend/src/yukihane/inqubus/model/Target.java
@@ -1,8 +1,5 @@
 package yukihane.inqubus.model;
 
-import java.util.ArrayList;
-import java.util.List;
-import yukihane.inqubus.manager.Request;
 import yukihane.inqubus.manager.RequestProcess;
 import yukihane.inqubus.manager.TaskKind;
 import yukihane.inqubus.manager.TaskStatus;
@@ -10,20 +7,14 @@ import yukihane.inqubus.manager.TaskStatus;
 public class Target {
 
     private final RequestProcess requestProcess;
-    private final List<Request> requests = new ArrayList<>(1);
     private Progress progress;
 
     public Target(RequestProcess rp) {
         this.requestProcess = rp;
-        this.requests.add(rp);
     }
 
-    public void add(Request request) {
-        requests.add(request);
-    }
-
-    public RequestProcess getRequestProcess() {
-        return requestProcess;
+    public int getRowId() {
+        return requestProcess.getRowId();
     }
 
     String getVideoId() {
@@ -58,6 +49,9 @@ public class Target {
             text = message;
         }
         progress = new Progress(p, text);
+    }
 
+    private RequestProcess getRequestProcess() {
+        return requestProcess;
     }
 }

diff --git a/frontend/src/yukihane/inqubus/model/TargetsTableModel.java b/frontend/src/yukihane/inqubus/model/TargetsTableModel.java
index a2cb6f2..380a099 100644 (file)
--- a/frontend/src/yukihane/inqubus/model/TargetsTableModel.java
+++ b/frontend/src/yukihane/inqubus/model/TargetsTableModel.java
@@ -18,6 +18,7 @@ public class TargetsTableModel extends AbstractTableModel {
     private static final long serialVersionUID = 1L;
     private static final Logger logger = Logger.getLogger(TargetsTableModel.class.getName());
     private final List<Target> targets = new ArrayList<Target>();
+    private static final int STATUS_CLOMN = 4;
     private final String[] columnNames = new String[]{"ID", "動画", "コメ", "変換", "状態"};
     private final Class<?>[] columnClasses = new Class<?>[]{String.class, Boolean.class, Boolean.class, Boolean.class,
         Progress.class};
@@ -61,17 +62,13 @@ public class TargetsTableModel extends AbstractTableModel {
                 break;
             case 4:
                 res = t.getProgress();
+                break;
             default:
                 throw new IllegalArgumentException();
         }
         return res;
     }
 
-    @Override
-    public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
-        throw new UnsupportedOperationException("Not supported yet.");
-    }
-
     public void addTarget(Collection<Target> t) {
         int before = targets.size();
         targets.addAll(t);
@@ -91,7 +88,7 @@ public class TargetsTableModel extends AbstractTableModel {
         int pos = -1;
         for (int i = 0; i < targets.size(); i++) {
             final Target t = targets.get(i);
-            final int ri = t.getRequestProcess().getRowId();
+            final int ri = t.getRowId();
             if (id == ri) {
                 pos = i;
                 break;
@@ -104,6 +101,6 @@ public class TargetsTableModel extends AbstractTableModel {
 
         final Target t = targets.get(pos);
         t.setProgress(taskKind, taskStatus, percent, status);
-
+        fireTableCellUpdated(pos, STATUS_CLOMN);
     }
 }