Author: kono
Date: 2011-03-08 10:56:58 -0800 (Tue, 08 Mar 2011)
New Revision: 24332
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/LoadNetworkTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/MajorIDSets.java
Log:
Add data source select tasks.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/LoadNetworkTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/LoadNetworkTask.java
2011-03-08 18:08:23 UTC (rev 24331)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/LoadNetworkTask.java
2011-03-08 18:56:58 UTC (rev 24332)
@@ -36,10 +36,22 @@
package org.cytoscape.task.internal.quickstart;
import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.Tunable;
+import org.cytoscape.work.util.ListSingleSelection;
public class LoadNetworkTask extends AbstractTask {
+ private static final String FROM_FILE = "File";
+ private static final String FROM_URL = "URL";
+ private static final String FROM_SERVICE = "Public Database";
+
+
+ @Tunable(description = "Select Data Source Type")
+ public ListSingleSelection<String> dataSource = new
ListSingleSelection<String>(
+ FROM_FILE, FROM_URL, FROM_SERVICE);
+
private QuickStartState state;
public LoadNetworkTask(QuickStartState state) {
@@ -47,9 +59,16 @@
}
public void run(TaskMonitor e) {
- System.out.println("loading network");
- // TODO: load actual network here
+ final String selected = dataSource.getSelectedValue();
+ if(selected == FROM_FILE) {
+ // Load file task
+ } else if(selected == FROM_URL) {
+ // Load URL task
+ } else if(selected == FROM_SERVICE) {
+ // TODO create new task
+ }
+ // Next, specify ID type
insertTasksAfterCurrentTask(new SelectNetworkIdTypeTask(state));
}
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/MajorIDSets.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/MajorIDSets.java
2011-03-08 18:08:23 UTC (rev 24331)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/MajorIDSets.java
2011-03-08 18:56:58 UTC (rev 24332)
@@ -4,7 +4,7 @@
* List of major ID types.
*/
public enum MajorIDSets {
- ENSEMBL("Ensembl Gene ID"), ENTREZ_GENE("NCBI Entrez Gene ID"),
UNIPROT("UniProt ID");
+ ENSEMBL("Ensembl Gene ID"), ENTREZ_GENE("Entrez Gene ID"),
UNIPROT("UniProt ID");
private final String displayName;
--
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.
