Author: jm
Date: 2012-03-23 12:10:33 -0700 (Fri, 23 Mar 2012)
New Revision: 28630
Modified:
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/TaskManager.java
core3/api/trunk/work-api/src/test/java/org/cytoscape/work/AbstractTaskManagerTest.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTaskManagerImpl.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/sync/SyncTaskManager.java
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/JPanelTaskManager.java
Log:
Removed TaskManager.execute(iterator, tunableContext)
Modified:
core3/api/trunk/work-api/src/main/java/org/cytoscape/work/TaskManager.java
===================================================================
--- core3/api/trunk/work-api/src/main/java/org/cytoscape/work/TaskManager.java
2012-03-23 19:03:11 UTC (rev 28629)
+++ core3/api/trunk/work-api/src/main/java/org/cytoscape/work/TaskManager.java
2012-03-23 19:10:33 UTC (rev 28630)
@@ -34,7 +34,5 @@
* @param factory The <code>TaskFactory</code> whose tasks returned by
its createTaskIterator()
* method's iterator will be executed
*/
- void execute(TaskIterator iterator, Object tunableContext);
-
void execute(TaskIterator iterator);
}
Modified:
core3/api/trunk/work-api/src/test/java/org/cytoscape/work/AbstractTaskManagerTest.java
===================================================================
---
core3/api/trunk/work-api/src/test/java/org/cytoscape/work/AbstractTaskManagerTest.java
2012-03-23 19:03:11 UTC (rev 28629)
+++
core3/api/trunk/work-api/src/test/java/org/cytoscape/work/AbstractTaskManagerTest.java
2012-03-23 19:10:33 UTC (rev 28630)
@@ -63,9 +63,6 @@
public void execute(TaskIterator iterator) { }
@Override
- public void execute(TaskIterator iterator, Object
tunableContext) { }
-
- @Override
public T getConfiguration(TaskFactory factory, Object
tunableContext) { return null; }
}
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTaskManagerImpl.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTaskManagerImpl.java
2012-03-23 19:03:11 UTC (rev 28629)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTaskManagerImpl.java
2012-03-23 19:10:33 UTC (rev 28630)
@@ -24,10 +24,6 @@
return listener;
}
- public void execute(TaskIterator iterator, Object tunableContext) {
- dialogTaskManager.execute(iterator, tunableContext);
- }
-
@Override
public void execute(TaskIterator iterator) {
dialogTaskManager.execute(iterator);
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/sync/SyncTaskManager.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/sync/SyncTaskManager.java
2012-03-23 19:03:11 UTC (rev 28629)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/sync/SyncTaskManager.java
2012-03-23 19:10:33 UTC (rev 28630)
@@ -48,14 +48,10 @@
@Override
- public void execute(final TaskIterator taskIterator, Object
tunableContext) {
+ public void execute(final TaskIterator taskIterator) {
final LoggingTaskMonitor taskMonitor = new LoggingTaskMonitor();
try {
- if ( !displayTunables(tunableContext) )
- return;
-
- // now execute all subsequent tasks
while (taskIterator.hasNext()) {
final Task task = taskIterator.next();
taskMonitor.setTask(task);
@@ -71,11 +67,6 @@
}
}
- @Override
- public void execute(TaskIterator iterator) {
- execute(iterator, null);
- }
-
private boolean displayTunables(final Object task) throws Exception {
if (task == null) {
return true;
Modified:
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/JPanelTaskManager.java
===================================================================
---
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/JPanelTaskManager.java
2012-03-23 19:03:11 UTC (rev 28629)
+++
core3/impl/trunk/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/JPanelTaskManager.java
2012-03-23 19:10:33 UTC (rev 28630)
@@ -48,13 +48,6 @@
}
@Override
- public void execute(final TaskIterator iterator, Object tunableContext)
{
- if (panelTunableMutator.validateAndWriteBack(tunableContext)) {
- dtm.execute(iterator, null);
- }
- }
-
- @Override
public void execute(final TaskIterator iterator) {
dtm.execute(iterator, null);
}
--
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.
