Author: mes
Date: 2011-01-21 10:31:28 -0800 (Fri, 21 Jan 2011)
New Revision: 23539
Modified:
core3/work-api/trunk/src/main/java/org/cytoscape/work/AbstractTask.java
core3/work-api/trunk/src/main/java/org/cytoscape/work/AbstractTaskManager.java
core3/work-api/trunk/src/main/java/org/cytoscape/work/TaskManager.java
core3/work-api/trunk/src/test/java/org/cytoscape/work/AbstractTaskManagerTest.java
Log:
removed concept of executeAndWait
Modified:
core3/work-api/trunk/src/main/java/org/cytoscape/work/AbstractTask.java
===================================================================
--- core3/work-api/trunk/src/main/java/org/cytoscape/work/AbstractTask.java
2011-01-21 18:03:21 UTC (rev 23538)
+++ core3/work-api/trunk/src/main/java/org/cytoscape/work/AbstractTask.java
2011-01-21 18:31:28 UTC (rev 23539)
@@ -38,6 +38,8 @@
* a <code>Task</code>'s checking whether "cancelled" is true or not
and then taking appropriate action.
*/
public void cancel() {
+ System.out.println("entering AbstractTask cancel");
cancelled = true;
+ System.out.println("exiting AbstractTask cancel");
}
}
Modified:
core3/work-api/trunk/src/main/java/org/cytoscape/work/AbstractTaskManager.java
===================================================================
---
core3/work-api/trunk/src/main/java/org/cytoscape/work/AbstractTaskManager.java
2011-01-21 18:03:21 UTC (rev 23538)
+++
core3/work-api/trunk/src/main/java/org/cytoscape/work/AbstractTaskManager.java
2011-01-21 18:31:28 UTC (rev 23539)
@@ -20,13 +20,5 @@
return tunableInterceptor.hasTunables(o);
}
- final public void execute(TaskFactory factory) {
- execute(factory,false);
- }
-
- final public void executeAndWait(TaskFactory factory) {
- execute(factory,true);
- }
-
- abstract protected void execute(TaskFactory factory, boolean wait);
+ abstract public void execute(TaskFactory factory);
}
Modified: core3/work-api/trunk/src/main/java/org/cytoscape/work/TaskManager.java
===================================================================
--- core3/work-api/trunk/src/main/java/org/cytoscape/work/TaskManager.java
2011-01-21 18:03:21 UTC (rev 23538)
+++ core3/work-api/trunk/src/main/java/org/cytoscape/work/TaskManager.java
2011-01-21 18:31:28 UTC (rev 23539)
@@ -5,6 +5,7 @@
* Executes the Tasks found in the TaskIterator provided by a TaskFactory.
*/
public interface TaskManager {
+
/**
* Tests an object for having tunable annotations.
* @return true if "o" has tunable annotations and else false.
@@ -22,16 +23,4 @@
* method's iterator will be executed
*/
void execute(TaskFactory factory);
-
- /**
- * This method is called to execute the Tasks in a TaskIterator provided
- * by a <code>TaskFactory</code>.
- * This method returns once the <code>Task</code>s derived from the
<code>TaskIterator</code>
- * returned by the <code>TaskFactory</code>'s
<code>getTaskIterator()</code> method have
- * started <b>and completed</b> execution. It <i>waits (potentially
forever)</i> for
- * the <code>Task</code>s to finish.
- * @param factory The <code>TaskFactory</code> whose tasks returned by
its getTaskIterator()
- * method's iterator will be executed
- */
- void executeAndWait(TaskFactory factory);
}
Modified:
core3/work-api/trunk/src/test/java/org/cytoscape/work/AbstractTaskManagerTest.java
===================================================================
---
core3/work-api/trunk/src/test/java/org/cytoscape/work/AbstractTaskManagerTest.java
2011-01-21 18:03:21 UTC (rev 23538)
+++
core3/work-api/trunk/src/test/java/org/cytoscape/work/AbstractTaskManagerTest.java
2011-01-21 18:31:28 UTC (rev 23539)
@@ -45,7 +45,7 @@
return this.tunableInterceptor;
}
- protected void execute(TaskFactory factory, boolean wait) {
+ public void execute(TaskFactory factory) {
}
}
--
You received this message because you are subscribed to the Google Groups
"cytoscape-cvs" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/cytoscape-cvs?hl=en.
