Author: ruschein
Date: 2010-10-01 14:09:45 -0700 (Fri, 01 Oct 2010)
New Revision: 22126
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/StaticLayoutMenu.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/CytoPanelTaskFactoryTunableAction.java
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/TaskFactoryTunableAction.java
Log:
Now we pass TaskFactorys to the TaskManager's execute method.
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
2010-10-01 21:09:32 UTC (rev 22125)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/DynamicLayoutMenu.java
2010-10-01 21:09:45 UTC (rev 22126)
@@ -31,8 +31,6 @@
import org.cytoscape.session.CyNetworkManager;
-import org.cytoscape.work.Task;
-import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskManager;
import org.cytoscape.model.CyNetwork;
import org.cytoscape.model.CyNode;
@@ -127,11 +125,11 @@
} else {
// No special menus, so make sure we layout all selected
List<CyNetworkView> views =
netmgr.getSelectedNetworkViews();
- for ( CyNetworkView view: views ) {
+ for (final CyNetworkView view: views) {
layout.setSelectedOnly(false);
layout.setLayoutAttribute(null);
- final Task layoutTask = new LayoutTask(layout,
view);
- tm.execute(new TaskIterator(layoutTask));
+ layout.setNetworkView(view);
+ tm.execute(layout);
}
}
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
2010-10-01 21:09:32 UTC (rev 22125)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/LayoutSettingsDialog.java
2010-10-01 21:09:45 UTC (rev 22126)
@@ -35,8 +35,6 @@
import org.cytoscape.view.layout.CyLayoutAlgorithm;
import org.cytoscape.view.layout.CyLayouts;
-import org.cytoscape.work.Task;
-import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.Tunable;
import org.cytoscape.work.swing.GUITaskManager;
@@ -104,9 +102,9 @@
if (command.equals("done"))
setVisible(false);
else if (command.equals("execute")) {
- final Task layoutTask = new LayoutTask(currentLayout,
netmgr.getCurrentNetworkView());
taskManager.setParent(algorithmPanel);
- taskManager.execute(new TaskIterator(layoutTask));
+
currentLayout.setNetworkView(netmgr.getCurrentNetworkView());
+ taskManager.execute(currentLayout);
} else {
// OK, initialize and display
initialize();
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/StaticLayoutMenu.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/StaticLayoutMenu.java
2010-10-01 21:09:32 UTC (rev 22125)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/layout/ui/StaticLayoutMenu.java
2010-10-01 21:09:45 UTC (rev 22126)
@@ -31,8 +31,6 @@
import org.cytoscape.session.CyNetworkManager;
-import org.cytoscape.work.Task;
-import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskManager;
import org.cytoscape.view.layout.CyLayoutAlgorithm;
@@ -73,7 +71,6 @@
public void actionPerformed(ActionEvent e) {
layout.setSelectedOnly(false);
layout.setNetworkView(netmgr.getCurrentNetworkView());
-
- tm.execute(layout.getTaskIterator());
+ tm.execute(layout);
}
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/CytoPanelTaskFactoryTunableAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/CytoPanelTaskFactoryTunableAction.java
2010-10-01 21:09:32 UTC (rev 22125)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/CytoPanelTaskFactoryTunableAction.java
2010-10-01 21:09:45 UTC (rev 22126)
@@ -48,8 +48,6 @@
import org.cytoscape.session.CyNetworkManager;
import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.Task;
-import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TunableValidator;
import org.cytoscape.work.swing.GUITaskManager;
@@ -92,9 +90,7 @@
}
}
- final TaskIterator taskIterator =
factory.getTaskIterator();
- // execute the task in a separate thread
- manager.execute(taskIterator);
+ manager.execute(factory);
}
}
Modified:
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/TaskFactoryTunableAction.java
===================================================================
---
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/TaskFactoryTunableAction.java
2010-10-01 21:09:32 UTC (rev 22125)
+++
cytoscape3/trunk/application/src/main/java/cytoscape/internal/task/TaskFactoryTunableAction.java
2010-10-01 21:09:45 UTC (rev 22126)
@@ -35,8 +35,6 @@
import java.util.Map;
import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.Task;
-import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskManager;
import cytoscape.view.CytoscapeAction;
@@ -61,8 +59,7 @@
public void actionPerformed(ActionEvent a) {
logger.debug("About to execute task from factory: " +
factory.toString());
- final TaskIterator taskIterator = factory.getTaskIterator();
// execute the task(s) in a separate thread
- manager.execute(taskIterator);
+ manager.execute(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.
