From 298a3a720e02728806333350c85cf4dc9e0e13b1 Mon Sep 17 00:00:00 2001
From: yukihane <yukihane.feather@gmail.com>
Date: Tue, 30 Aug 2011 17:21:18 +0900
Subject: [PATCH] =?utf8?q?=E3=82=AD=E3=83=A3=E3=83=B3=E3=82=BB=E3=83=AB?=
 =?utf8?q?=E8=A6=81=E6=B1=82=E3=81=8C=E6=88=90=E5=8A=9F=E3=81=97=E3=81=9F?=
 =?utf8?q?=E5=A0=B4=E5=90=88=E3=81=AF=E4=B8=80=E6=97=A6=E3=82=AD=E3=83=A3?=
 =?utf8?q?=E3=83=B3=E3=82=BB=E3=83=AB=E8=A1=A8=E7=A4=BA=E3=82=92=E8=A1=8C?=
 =?utf8?q?=E3=81=86(cancelled=E3=82=A4=E3=83=99=E3=83=B3=E3=83=88=E3=81=8C?=
 =?utf8?q?=E9=A3=9B=E3=81=B0=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=8C?=
 =?utf8?q?=E3=81=82=E3=82=8B=E3=81=AE=E3=81=A7)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 frontend/src/yukihane/inqubus/gui/MainFrame.java      | 3 +++
 frontend/src/yukihane/inqubus/manager/TaskManage.java | 1 +
 2 files changed, 4 insertions(+)

diff --git a/frontend/src/yukihane/inqubus/gui/MainFrame.java b/frontend/src/yukihane/inqubus/gui/MainFrame.java
index c642a7d..d620b14 100644
--- a/frontend/src/yukihane/inqubus/gui/MainFrame.java
+++ b/frontend/src/yukihane/inqubus/gui/MainFrame.java
@@ -396,6 +396,9 @@ public class MainFrame extends JFrame {
             final Target t = targetModel.getTarget(row);
             final boolean res = taskManager.cancel(t.getRowId());
             logger.log(Level.FINE, "停止: {0} {1}", new Object[]{t.getVideoId(), res});
+            if (res) {
+                targetModel.setStatus(t.getRowId(), null, TaskStatus.CANCELLED, -1.0, "キャンセル");
+            }
         }
     }
 
diff --git a/frontend/src/yukihane/inqubus/manager/TaskManage.java b/frontend/src/yukihane/inqubus/manager/TaskManage.java
index 47b037e..67c219b 100644
--- a/frontend/src/yukihane/inqubus/manager/TaskManage.java
+++ b/frontend/src/yukihane/inqubus/manager/TaskManage.java
@@ -71,6 +71,7 @@ public class TaskManage {
     }
 
     public synchronized boolean cancel(int rowId) {
+        // FIXME 実行前にキャンセルした場合にはcancelledイベントが飛ばないのでMapからリクエストを削除できない
         final ManageTarget<DownloadResult> down = downloadTargets.get(rowId);
         if (down != null) {
             return down.getFuture().cancel(true);
-- 
2.11.0