Author: mmichaud
Date: 2009-03-26 03:31:08 -0700 (Thu, 26 Mar 2009)
New Revision: 16334
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/LoadInputStreamTask.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/loadnetwork/internal/LoadNetworkURLTask.java
Log:
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/LoadInputStreamTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/LoadInputStreamTask.java
2009-03-26 10:30:34 UTC (rev 16333)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/LoadInputStreamTask.java
2009-03-26 10:31:08 UTC (rev 16334)
@@ -55,7 +55,6 @@
@Tunable(description = "InputStream to load")
public InputStream is;
- //public File file;
public LoadInputStreamTask(CyReaderManager mgr, GraphViewFactory gvf,
@@ -68,21 +67,15 @@
*/
public void run(TaskMonitor taskMonitor) throws Exception {
this.taskMonitor = taskMonitor;
- // for ( File file : files ) {
reader = mgr.getReader(is, NETWORK);
-// uri = file.toURI();
-// name = file.getName();
-// reader.setInputStream(is);
- //uri = is.toURI();
-// name = is.toString();
-
+ name = is.toString();
+
if (reader == null) {
uri = null;
System.out.println("The reader is null");
}
else loadNetwork(reader);
- // }
}
}
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-26 10:30:34 UTC (rev 16333)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/LoadNetworkFileTask.java
2009-03-26 10:31:08 UTC (rev 16334)
@@ -47,6 +47,7 @@
import org.cytoscape.view.GraphViewFactory;
import org.cytoscape.work.TaskMonitor;
import org.cytoscape.work.Tunable;
+import org.cytoscape.work.Tunable.Param;
import cytoscape.CyNetworkManager;
import cytoscape.util.CyNetworkNaming;
@@ -56,8 +57,7 @@
*/
public class LoadNetworkFileTask extends AbstractLoadNetworkTask {
- // public File[] files;
- @Tunable(description = "Network file to load")
+ @Tunable(description = "Network file to load",flag = {Param.network})
public File file;
public LoadNetworkFileTask(CyReaderManager mgr, GraphViewFactory gvf,
@@ -70,7 +70,6 @@
*/
public void run(TaskMonitor taskMonitor) throws Exception {
this.taskMonitor = taskMonitor;
- // for ( File file : files ) {
reader = mgr.getReader(file.toURI(), NETWORK);
@@ -82,6 +81,5 @@
}
loadNetwork(reader);
- // }
}
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/LoadNetworkURLTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/LoadNetworkURLTask.java
2009-03-26 10:30:34 UTC (rev 16333)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/loadnetwork/internal/LoadNetworkURLTask.java
2009-03-26 10:31:08 UTC (rev 16334)
@@ -40,7 +40,6 @@
// $Author: pwang $
package org.cytoscape.task.loadnetwork.internal;
-import java.net.URI;
import java.net.URL;
import java.util.Properties;
@@ -82,7 +81,7 @@
try {
taskMonitor.setStatusMessage("Opening url " + url);
- reader = mgr.getReader(url.toURI(),
DataCategory.NETWORK);
+ reader =
mgr.getReader(url.toURI(),DataCategory.NETWORK);
if (interrupted)
return;
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
