Author: pwang
Date: 2011-11-16 10:31:41 -0800 (Wed, 16 Nov 2011)
New Revision: 27493
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesFileTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesURLTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/FileImportTableTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/ImportNetworkFromPublicDataSetTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/LoadMitabFileTask.java
Log:
Bug fixed
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
2011-11-16 18:21:52 UTC (rev 27492)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
2011-11-16 18:31:41 UTC (rev 27493)
@@ -22,7 +22,7 @@
void loadTable(final String name, final URI uri, final TaskMonitor
taskMonitor) throws Exception {
taskMonitor.setStatusMessage("Finding Attribute Data
Reader...");
- taskMonitor.setProgress(-1);
+
CyTableReader reader = mgr.getReader(uri,uri.toString());
if (reader == null)
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesFileTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesFileTask.java
2011-11-16 18:21:52 UTC (rev 27492)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesFileTask.java
2011-11-16 18:31:41 UTC (rev 27493)
@@ -21,7 +21,7 @@
* Executes Task.
*/
public void run(final TaskMonitor taskMonitor) throws Exception {
- taskMonitor.setProgress(-1);
+
loadTable(file.getName(), file.toURI(), taskMonitor);
}
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesURLTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesURLTask.java
2011-11-16 18:21:52 UTC (rev 27492)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/loaddatatable/LoadAttributesURLTask.java
2011-11-16 18:31:41 UTC (rev 27493)
@@ -21,7 +21,7 @@
* Executes Task.
*/
public void run(final TaskMonitor taskMonitor) throws Exception {
- taskMonitor.setProgress(-1);
+
loadTable(url.toString(), url.toURI(), taskMonitor);
}
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/FileImportTableTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/FileImportTableTask.java
2011-11-16 18:21:52 UTC (rev 27492)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/FileImportTableTask.java
2011-11-16 18:31:41 UTC (rev 27493)
@@ -63,7 +63,7 @@
public void run(TaskMonitor taskMonitor) {
taskMonitor.setStatusMessage("Finding Attribute Data
Reader...");
- taskMonitor.setProgress(-1);
+
reader =
util.getTableReaderManager().getReader(file.toURI(),file.getName());
if (reader == null)
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/ImportNetworkFromPublicDataSetTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/ImportNetworkFromPublicDataSetTask.java
2011-11-16 18:21:52 UTC (rev 27492)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/quickstart/ImportNetworkFromPublicDataSetTask.java
2011-11-16 18:31:41 UTC (rev 27493)
@@ -70,7 +70,7 @@
@Override
public void run(TaskMonitor taskMonitor) throws Exception {
- taskMonitor.setProgress(-1);
+
props.setProperty(quickStartPropertyKey, new
Boolean(showQuickStartAtStartup).toString());
taskMonitor.setStatusMessage("Update is done.");
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/LoadMitabFileTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/LoadMitabFileTask.java
2011-11-16 18:21:52 UTC (rev 27492)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/welcome/LoadMitabFileTask.java
2011-11-16 18:31:41 UTC (rev 27493)
@@ -28,7 +28,7 @@
@Override
public void run(TaskMonitor taskMonitor) throws Exception {
- taskMonitor.setProgress(-1);
+
this.taskMonitor = taskMonitor;
reader = mgr.getReader(file.toURI(), file.getName());
--
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.
