Author: pwang
Date: 2011-05-03 14:26:36 -0700 (Tue, 03 May 2011)
New Revision: 24909
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTaskFactory.java
Log:
Combined with "Create subnetwork from interactome"
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTask.java
2011-05-03 21:07:13 UTC (rev 24908)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTask.java
2011-05-03 21:26:36 UTC (rev 24909)
@@ -39,24 +39,35 @@
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
import org.cytoscape.work.util.ListSingleSelection;
+import org.cytoscape.model.CyNetworkManager;
+import
org.cytoscape.task.internal.quickstart.subnetworkbuilder.SubnetworkBuilderUtil;
+import
org.cytoscape.task.internal.quickstart.subnetworkbuilder.SubnetworkBuilderTask;
public class QuickStartTask extends AbstractTask {
private static final String LOAD_NETWORK = "Load a Network";
private static final String LOAD_TABLE = "Load an Attribute Table";
-
+ private static final String LOAD_SUBNETWORK = "Create subnetwork from
interactome";
+
// @Tunable(description="What would you like to do today?\nCytoscape
requires at the minimum a network to do anything. A network and attributes
makes life much better. If you don't have a network, that's OK, we'll help you
find one.")
@Tunable(description = "What would you like to do today?")
public ListSingleSelection<String> selection = new
ListSingleSelection<String>(
- LOAD_NETWORK, LOAD_TABLE);
+ LOAD_NETWORK, LOAD_TABLE, LOAD_SUBNETWORK);
private final QuickStartState state;
private final ImportTaskUtil importTaskUtil;
-
- public QuickStartTask(final QuickStartState state, final ImportTaskUtil
importTaskUtil) {
+
+ private final CyNetworkManager networkManager;
+ private final SubnetworkBuilderUtil subnetworkUtil;
+
+
+ public QuickStartTask(final QuickStartState state, final ImportTaskUtil
importTaskUtil,
+ final CyNetworkManager networkManager, final
SubnetworkBuilderUtil subnetworkUtil) {
super();
this.state = state;
this.importTaskUtil = importTaskUtil;
+ this.networkManager = networkManager;
+ this.subnetworkUtil = subnetworkUtil;
}
public void run(TaskMonitor e) {
@@ -65,5 +76,8 @@
insertTasksAfterCurrentTask(new LoadNetworkTask(state,
importTaskUtil));
} else if (selected == LOAD_TABLE)
insertTasksAfterCurrentTask(new LoadTableTask(state,
importTaskUtil));
+ else if (selected == LOAD_SUBNETWORK) {
+ insertTasksAfterCurrentTask(new
SubnetworkBuilderTask(networkManager, subnetworkUtil));
+ }
}
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTaskFactory.java
2011-05-03 21:07:13 UTC (rev 24908)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTaskFactory.java
2011-05-03 21:26:36 UTC (rev 24909)
@@ -28,6 +28,8 @@
package org.cytoscape.task.internal.quickstart;
+import org.cytoscape.model.CyNetworkManager;
+import
org.cytoscape.task.internal.quickstart.subnetworkbuilder.SubnetworkBuilderUtil;
import org.cytoscape.work.TaskIterator;
import org.cytoscape.work.TaskFactory;
@@ -35,12 +37,17 @@
public class QuickStartTaskFactory implements TaskFactory {
private final ImportTaskUtil util;
+ private final CyNetworkManager networkManager;
+ private final SubnetworkBuilderUtil subnetworkUtil;
- public QuickStartTaskFactory(final ImportTaskUtil util) {
+ public QuickStartTaskFactory(final ImportTaskUtil util,
+ final CyNetworkManager networkManager, final
SubnetworkBuilderUtil subnetworkUtil) {
this.util = util;
+ this.networkManager = networkManager;
+ this.subnetworkUtil = subnetworkUtil;
}
public TaskIterator getTaskIterator() {
- return new TaskIterator(new QuickStartTask(new
QuickStartState(), util));
+ return new TaskIterator(new QuickStartTask(new
QuickStartState(), util, networkManager, subnetworkUtil));
}
}
--
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.
