Author: kono
Date: 2011-03-08 18:08:04 -0800 (Tue, 08 Mar 2011)
New Revision: 24347
Added:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/MergeDataTask.java
Removed:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/SelectNetworkDataSourceTask.java
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartState.java
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/SelectNetworkIdTypeTask.java
Log:
Some new tasks are added.
Added:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/MergeDataTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/MergeDataTask.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/MergeDataTask.java
2011-03-09 02:08:04 UTC (rev 24347)
@@ -0,0 +1,33 @@
+package org.cytoscape.task.internal.quickstart;
+
+import org.cytoscape.model.CyTable;
+import org.cytoscape.work.AbstractTask;
+import org.cytoscape.work.TaskMonitor;
+
+public class MergeDataTask extends AbstractTask {
+
+ final QuickStartState state;
+
+ MergeDataTask(final QuickStartState state) {
+ this.state = state;
+ }
+
+ @Override
+ public void run(TaskMonitor taskMonitor) throws Exception {
+ // Step 1: Create new column for the network.
+ final IDType type = state.getIDType();
+ if(type == null)
+ throw new IllegalStateException("ID type is unknown.");
+
+ final String columnName = type.getDisplayName();
+
+ final CyTable table = state.getImportedTable();
+
+ // Rename the key column to the selected type
+ table.getColumn(state.getKeyColumnName()).setName(columnName);
+
+ // Use it as virtual column
+
+ }
+
+}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartState.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartState.java
2011-03-09 00:24:38 UTC (rev 24346)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartState.java
2011-03-09 02:08:04 UTC (rev 24347)
@@ -39,6 +39,8 @@
import java.util.EnumSet;
import java.util.Set;
+import org.cytoscape.model.CyTable;
+
class QuickStartState {
enum Job {
@@ -49,6 +51,8 @@
}
private IDType idType;
+ private CyTable table;
+ private String keyColumnName;
private final Set<Job> completedSoFar =
Collections.synchronizedSet(EnumSet.noneOf(Job.class));
@@ -60,11 +64,27 @@
return (completedSoFar.size() == Job.values().length);
}
- public IDType getIDType() {
+ IDType getIDType() {
return this.idType;
}
- public void setIDType(IDType idType) {
+ void setIDType(IDType idType) {
this.idType = idType;
}
+
+ void setImportedTable(final CyTable table) {
+ this.table = table;
+ }
+
+ CyTable getImportedTable() {
+ return this.table;
+ }
+
+ void setKeyColumnName(String columnName) {
+ this.keyColumnName = columnName;
+ }
+
+ String getKeyColumnName() {
+ return keyColumnName;
+ }
}
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-03-09 00:24:38 UTC (rev 24346)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/QuickStartTaskFactory.java
2011-03-09 02:08:04 UTC (rev 24347)
@@ -36,7 +36,7 @@
private final ImportTaskUtil util;
- public QuickStartTaskFactory(ImportTaskUtil util) {
+ public QuickStartTaskFactory(final ImportTaskUtil util) {
this.util = util;
}
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/SelectNetworkDataSourceTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/SelectNetworkDataSourceTask.java
2011-03-09 00:24:38 UTC (rev 24346)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/SelectNetworkDataSourceTask.java
2011-03-09 02:08:04 UTC (rev 24347)
@@ -1,35 +0,0 @@
-package org.cytoscape.task.internal.quickstart;
-
-import
org.cytoscape.task.internal.quickstart.SelectNetworkDataSourceTask.DataSourceType;
-import org.cytoscape.work.AbstractTask;
-import org.cytoscape.work.TaskMonitor;
-import org.cytoscape.work.Tunable;
-import org.cytoscape.work.util.ListSingleSelection;
-
-public class SelectNetworkDataSourceTask extends AbstractTask {
-
- enum DataSourceType {
- FILE_OR_URL, WEB_SERVICE;
- }
-
- @Tunable(description = "Select Data Source Type")
- public ListSingleSelection<DataSourceType> dataSource = new
ListSingleSelection<DataSourceType>(
- DataSourceType.FILE_OR_URL, DataSourceType.WEB_SERVICE);
-
- private final QuickStartState state;
-
- SelectNetworkDataSourceTask(final QuickStartState state) {
- this.state = state;
- }
-
- @Override
- public void run(TaskMonitor taskMonitor) throws Exception {
- final DataSourceType selected = dataSource.getSelectedValue();
- if(selected == DataSourceType.FILE_OR_URL)
- insertTasksAfterCurrentTask(new
SelectNetworkIdTypeTask(state));
- else {
-
- }
- }
-
-}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/SelectNetworkIdTypeTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/SelectNetworkIdTypeTask.java
2011-03-09 00:24:38 UTC (rev 24346)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/SelectNetworkIdTypeTask.java
2011-03-09 02:08:04 UTC (rev 24347)
@@ -14,6 +14,9 @@
@Tunable(description="Select Network ID Type")
public final ListSingleSelection<String> selection;
+ @Tunable(description="Or, enter ID Type")
+ public String otherIDType;
+
private final QuickStartState state;
public SelectNetworkIdTypeTask(final QuickStartState state) {
@@ -26,7 +29,9 @@
@Override
public void run(TaskMonitor monitor) throws Exception {
- System.out.println("ID type selected for network. Selected
type = " + selection.getSelectedValue());
+ final String selected = selection.getSelectedValue();
+
+ System.out.println("ID type selected for network. Selected
type = " + selected);
state.finished(Job.SELECT_NETWORK_ID_TYPE);
if(state.isFinished()) {
--
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.
