Author: kono
Date: 2009-03-09 17:01:07 -0700 (Mon, 09 Mar 2009)
New Revision: 16190
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/AbstractLoadNetworkTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/LoadNetworkFileTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/session/internal/OpenSessionTask.java
Log:
Now read() method returns actual read object.
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/AbstractLoadNetworkTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/AbstractLoadNetworkTask.java
2009-03-09 23:59:49 UTC (rev 16189)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/AbstractLoadNetworkTask.java
2009-03-10 00:01:07 UTC (rev 16190)
@@ -40,6 +40,7 @@
import java.net.URI;
import java.text.DecimalFormat;
import java.text.NumberFormat;
+import java.util.Map;
import java.util.Properties;
import java.io.IOException;
@@ -98,12 +99,12 @@
taskMonitor.setStatusMessage("Creating Cytoscape
Network...");
- reader.read();
+ final Map<Class<?>, Object> readData = reader.read();
- CyNetwork cyNetwork =
reader.getReadData(CyNetwork.class);
+ CyNetwork cyNetwork = (CyNetwork)
readData.get(CyNetwork.class);
cyNetwork.attrs().set("name",
namingUtil.getSuggestedNetworkTitle(name, netmgr));
- GraphView view = reader.getReadData(GraphView.class);
+ GraphView view = (GraphView)
readData.get(GraphView.class);
if (view == null)
view = gvf.createGraphView(cyNetwork);
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/LoadNetworkFileTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/LoadNetworkFileTask.java
2009-03-09 23:59:49 UTC (rev 16189)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/LoadNetworkFileTask.java
2009-03-10 00:01:07 UTC (rev 16190)
@@ -72,7 +72,7 @@
this.taskMonitor = taskMonitor;
// for ( File file : files ) {
- reader = mgr.getReader(file.getAbsolutePath(), NETWORK);
+ reader = mgr.getReader(file.toURI(), NETWORK);
uri = file.toURI();
name = file.getName();
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/session/internal/OpenSessionTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/session/internal/OpenSessionTask.java
2009-03-09 23:59:49 UTC (rev 16189)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/session/internal/OpenSessionTask.java
2009-03-10 00:01:07 UTC (rev 16190)
@@ -88,7 +88,7 @@
CyReader sr;
try {
- sr = factory.getReader(name, DataCategory.SESSION);
+ sr = factory.getReader(file.toURI(),
DataCategory.SESSION);
sr.read();
} catch (Exception e) {
throw new Exception("Cannot open the session file: " +
name, e);
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
