Author: mes
Date: 2011-03-30 15:54:59 -0700 (Wed, 30 Mar 2011)
New Revision: 24629
Modified:
core3/core-task-impl/trunk/pom.xml
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/FileImportTableTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/ImportNetworkFromPublicDataSetTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTask.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTaskTester.java
Log:
added input name argument to all readers
Modified: core3/core-task-impl/trunk/pom.xml
===================================================================
--- core3/core-task-impl/trunk/pom.xml 2011-03-30 22:54:41 UTC (rev 24628)
+++ core3/core-task-impl/trunk/pom.xml 2011-03-30 22:54:59 UTC (rev 24629)
@@ -112,7 +112,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>io-api</artifactId>
- <version>3.0.0-alpha2</version>
+ <version>3.0.0-alpha3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
2011-03-30 22:54:41 UTC (rev 24628)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loaddatatable/AbstractLoadAttributesTask.java
2011-03-30 22:54:59 UTC (rev 24629)
@@ -26,7 +26,7 @@
void loadTable(final String name, final URI uri, final TaskMonitor
taskMonitor) throws Exception {
taskMonitor.setStatusMessage("Finding Attribute Data
Reader...");
taskMonitor.setProgress(-1.0);
- CyTableReader reader = mgr.getReader(uri);
+ CyTableReader reader = mgr.getReader(uri,uri.toString());
if (reader == null)
throw new NullPointerException("Failed to find reader
for specified file!");
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTask.java
2011-03-30 22:54:41 UTC (rev 24628)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkFileTask.java
2011-03-30 22:54:59 UTC (rev 24629)
@@ -64,7 +64,7 @@
if ( file == null )
throw new NullPointerException("No file specified!");
- reader = mgr.getReader((file.toURI()));
+ reader = mgr.getReader(file.toURI(),file.getName());
if (cancelled)
return;
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTask.java
2011-03-30 22:54:41 UTC (rev 24628)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/loadnetwork/LoadNetworkURLTask.java
2011-03-30 22:54:59 UTC (rev 24629)
@@ -86,7 +86,7 @@
return;
taskMonitor.setStatusMessage("Finding network reader...");
- reader = mgr.getReader(url.toURI());
+ reader = mgr.getReader(url.toURI(),url.toString());
if (cancelled)
return;
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/FileImportTableTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/FileImportTableTask.java
2011-03-30 22:54:41 UTC (rev 24628)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/FileImportTableTask.java
2011-03-30 22:54:59 UTC (rev 24629)
@@ -60,7 +60,7 @@
taskMonitor.setStatusMessage("Finding Attribute Data
Reader...");
taskMonitor.setProgress(-1.0);
- reader = util.getTableReaderManager().getReader(file.toURI());
+ reader =
util.getTableReaderManager().getReader(file.toURI(),file.getName());
if (reader == null)
throw new NullPointerException("Failed to find reader
for specified file!");
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/ImportNetworkFromPublicDataSetTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/ImportNetworkFromPublicDataSetTask.java
2011-03-30 22:54:41 UTC (rev 24628)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/quickstart/ImportNetworkFromPublicDataSetTask.java
2011-03-30 22:54:59 UTC (rev 24629)
@@ -91,7 +91,7 @@
return;
taskMonitor.setStatusMessage("Finding network reader...");
- reader = mgr.getReader(url.toURI());
+ reader = mgr.getReader(url.toURI(),url.toString());
if (cancelled)
return;
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTask.java
2011-03-30 22:54:41 UTC (rev 24628)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTask.java
2011-03-30 22:54:59 UTC (rev 24629)
@@ -75,7 +75,7 @@
if ( file == null )
throw new NullPointerException("No file specified!");
- CySessionReader reader = readerMgr.getReader((file.toURI()));
+ CySessionReader reader =
readerMgr.getReader(file.toURI(),file.getName());
reader.run(taskMonitor);
if (cancelled)
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTaskTester.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTaskTester.java
2011-03-30 22:54:41 UTC (rev 24628)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/loadnetwork/AbstractLoadNetworkTaskTester.java
2011-03-30 22:54:59 UTC (rev 24629)
@@ -89,7 +89,7 @@
when(reader.getNetworkViews()).thenReturn(views);
mgr = mock(CyNetworkViewReaderManager.class);
- when(mgr.getReader(uri)).thenReturn(reader);
+ when(mgr.getReader(eq(uri),anyString())).thenReturn(reader);
netmgr = mock(CyNetworkManager.class);
networkViewManager = mock(CyNetworkViewManager.class);
--
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.
