Author: kono
Date: 2011-12-13 10:02:24 -0800 (Tue, 13 Dec 2011)
New Revision: 27779
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/actions/welcomescreen/CreateNewNetworkPanel.java
Log:
Number of expected tasks had been fixed for loading network.
Modified:
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/actions/welcomescreen/CreateNewNetworkPanel.java
===================================================================
---
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/actions/welcomescreen/CreateNewNetworkPanel.java
2011-12-13 17:28:39 UTC (rev 27778)
+++
core3/impl/trunk/swing-application-impl/src/main/java/org/cytoscape/internal/actions/welcomescreen/CreateNewNetworkPanel.java
2011-12-13 18:02:24 UTC (rev 27779)
@@ -178,7 +178,7 @@
@Override
public TaskIterator createTaskIterator() {
- return new TaskIterator(new
CreateNetworkViewTask(url, loadNetworkFileTF, createViewTaskFactory));
+ return new TaskIterator(2, new
CreateNetworkViewTask(url, loadNetworkFileTF, createViewTaskFactory));
}
});
@@ -214,10 +214,12 @@
public void run(TaskMonitor taskMonitor) throws Exception {
taskMonitor.setTitle("Loading network...");
taskMonitor.setStatusMessage("Loading network. Please
wait...");
- taskMonitor.setProgress(0.01);
- Set<CyNetwork> networks =
this.loadNetworkFileTF.loadCyNetworks(url);
- taskMonitor.setProgress(0.4);
+ taskMonitor.setProgress(0.01d);
+
+ final Set<CyNetwork> networks =
this.loadNetworkFileTF.loadCyNetworks(url);
+ taskMonitor.setProgress(0.4d);
if (networks.size() != 0) {
+ taskMonitor.setTitle("Creating View for the new
network");
CyNetwork network = networks.iterator().next();
final int numGraphObjects =
network.getNodeCount() + network.getEdgeCount();
if (numGraphObjects >= viewThreshold) {
@@ -227,7 +229,6 @@
insertTasksAfterCurrentTask(createViewTaskFactory.createTaskIterator());
}
}
- taskMonitor.setProgress(1.0);
}
}
--
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.
