Author: jm
Date: 2012-01-27 13:01:29 -0800 (Fri, 27 Jan 2012)
New Revision: 28133
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTaskManagerImpl.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/sync/SyncTaskManager.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/JDialogTaskManager.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/JPanelTaskManager.java
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/test/java/org/cytoscape/work/internal/sync/SyncTaskManagerTest.java
Log:
Refactored work-swing-impl to use new TaskFactory API
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTaskManagerImpl.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTaskManagerImpl.java
2012-01-27 20:58:02 UTC (rev 28132)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/submenu/SubmenuTaskManagerImpl.java
2012-01-27 21:01:29 UTC (rev 28133)
@@ -1,16 +1,12 @@
package org.cytoscape.work.internal.submenu;
-import org.cytoscape.work.TunableMutator;
import org.cytoscape.work.AbstractTaskManager;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.swing.DialogTaskManager;
-import org.cytoscape.work.swing.SubmenuTaskManager;
import org.cytoscape.work.swing.DynamicSubmenuListener;
+import org.cytoscape.work.swing.SubmenuTaskManager;
-import javax.swing.event.MenuListener;
-import java.util.List;
-
public class SubmenuTaskManagerImpl extends
AbstractTaskManager<DynamicSubmenuListener,Object> implements
SubmenuTaskManager {
private DialogTaskManager dialogTaskManager;
@@ -27,7 +23,7 @@
return listener;
}
- public void execute(TaskFactory tf) {
- dialogTaskManager.execute(tf,false);
+ public <TC> void execute(TaskFactory<TC> factory, TC taskContext) {
+ dialogTaskManager.execute(factory, taskContext, false);
}
}
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/sync/SyncTaskManager.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/sync/SyncTaskManager.java
2012-01-27 20:58:02 UTC (rev 28132)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/sync/SyncTaskManager.java
2012-01-27 21:01:29 UTC (rev 28133)
@@ -48,14 +48,14 @@
@Override
- public void execute(final TaskFactory factory) {
+ public <TC> void execute(TaskFactory<TC> factory, TC taskContext) {
final LoggingTaskMonitor taskMonitor = new LoggingTaskMonitor();
try {
- if ( !displayTunables(factory) )
+ if ( !displayTunables(taskContext) )
return;
- TaskIterator taskIterator =
factory.createTaskIterator();
+ TaskIterator taskIterator =
factory.createTaskIterator(taskContext);
// now execute all subsequent tasks
while (taskIterator.hasNext()) {
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/JDialogTaskManager.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/JDialogTaskManager.java
2012-01-27 20:58:02 UTC (rev 28132)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/JDialogTaskManager.java
2012-01-27 21:01:29 UTC (rev 28133)
@@ -130,14 +130,14 @@
@Override
- public void execute(final TaskFactory factory) {
- execute(factory, true);
+ public <TC> void execute(TaskFactory<TC> factory, TC taskContext) {
+ execute(factory, taskContext, true);
}
/**
* For users of this class.
*/
- public void execute(final TaskFactory factory, boolean
displayFactoryTunables) {
+ public <TC> void execute(TaskFactory<TC> factory, TC taskContext,
boolean displayContextTunables) {
final SwingTaskMonitor taskMonitor = new
SwingTaskMonitor(cancelExecutorService, parent);
TaskIterator taskIterator;
@@ -146,10 +146,10 @@
try {
dialogTunableMutator.setConfigurationContext(parent);
- if ( displayFactoryTunables &&
!displayTunables(factory) )
+ if ( displayContextTunables &&
!displayTunables(taskContext) )
return;
- taskIterator = factory.createTaskIterator();
+ taskIterator = factory.createTaskIterator(taskContext);
taskMonitor.setExpectedNumTasks(
taskIterator.getNumTasks() );
// Get the first task and display its tunables. This
is a bit of a hack.
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/JPanelTaskManager.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/JPanelTaskManager.java
2012-01-27 20:58:02 UTC (rev 28132)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/main/java/org/cytoscape/work/internal/task/JPanelTaskManager.java
2012-01-27 21:01:29 UTC (rev 28133)
@@ -47,8 +47,8 @@
}
@Override
- public void execute(final TaskFactory factory) {
- dtm.execute(factory,false);
+ public <TC> void execute(TaskFactory<TC> factory, TC taskContext) {
+ dtm.execute(factory, taskContext, false);
}
}
Modified:
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/test/java/org/cytoscape/work/internal/sync/SyncTaskManagerTest.java
===================================================================
---
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/test/java/org/cytoscape/work/internal/sync/SyncTaskManagerTest.java
2012-01-27 20:58:02 UTC (rev 28132)
+++
csplugins/trunk/toronto/jm/cy3-stateless-taskfactory/impl/work-swing-impl/impl/src/test/java/org/cytoscape/work/internal/sync/SyncTaskManagerTest.java
2012-01-27 21:01:29 UTC (rev 28133)
@@ -25,11 +25,15 @@
TestTaskFactory tf = new TestTaskFactory();
- taskManager.execute(tf);
+ taskManager.execute(tf, tf.createTaskContext());
}
- public class TestTaskFactory implements TaskFactory {
- public TaskIterator createTaskIterator() { return new
TaskIterator( new TestTask() ); }
+ public class TestTaskFactory implements TaskFactory<Object> {
+ public TaskIterator createTaskIterator(Object context) { return
new TaskIterator( new TestTask() ); }
+ @Override
+ public Object createTaskContext() {
+ return new Object();
+ }
}
public class TestTask extends AbstractTask {
--
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.
