From ace76b508e2f6c1bc420112306ebee52f478de13 Mon Sep 17 00:00:00 2001
From: Paul Buetow <paul@buetow.org>
Date: Sun, 18 May 2008 20:20:53 +0000
Subject: Process Crash and Process Recover Events work with the new Task
 maanger.

---
 sources/core/VSTask.java        |  7 +++++++
 sources/core/VSTaskManager.java | 16 +++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'sources/core')

diff --git a/sources/core/VSTask.java b/sources/core/VSTask.java
index eef2642..503d57e 100644
--- a/sources/core/VSTask.java
+++ b/sources/core/VSTask.java
@@ -47,6 +47,13 @@ public class VSTask implements Comparable {
         return false;
     }
 
+    public boolean equals(VSTask task) {
+        return event.equals(task.getEvent())
+               && taskTime == task.getTaskTime()
+               && isGlobalTimed == task.isGlobalTimed()
+               && isProgrammed == task.isProgrammed;
+    }
+
     public boolean isProcess(VSProcess process) {
         return this.process.equals(process);
     }
diff --git a/sources/core/VSTaskManager.java b/sources/core/VSTaskManager.java
index 04cff9d..6683e71 100644
--- a/sources/core/VSTaskManager.java
+++ b/sources/core/VSTaskManager.java
@@ -197,11 +197,17 @@ public class VSTaskManager {
         insert(task);
     }
 
-    public synchronized void removeTask(VSTask task) {
-        if (task.isGlobalTimed())
-            globalTasks.remove(task);
-        else
-            tasks.remove(task);
+    public synchronized boolean removeTask(VSTask task) {
+        if (fullfilledProgrammedTasks.remove(task))
+            return true;
+
+        else if (task.isGlobalTimed() && globalTasks.remove(task))
+            return true;
+
+        else if (!task.isGlobalTimed() && tasks.remove(task))
+            return true;
+
+        return false;
     }
 
     public synchronized LinkedList<VSTask> getProtocolTasks(VSProtocol protocol) {
-- 
cgit v1.2.3