Author: pwang
Date: 2010-08-17 17:22:11 -0700 (Tue, 17 Aug 2010)
New Revision: 21439
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/OpenSessionTaskFactory.java
Log:
Refactored
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
2010-08-18 00:21:49 UTC (rev 21438)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTask.java
2010-08-18 00:22:11 UTC (rev 21439)
@@ -42,8 +42,8 @@
import org.cytoscape.work.Tunable;
import org.cytoscape.task.AbstractTask;
import org.cytoscape.session.CySessionManager;
-import org.cytoscape.io.read.CyReaderManager;
-import org.cytoscape.io.read.CyReader;
+import org.cytoscape.io.read.CyNetworkViewProducerManager;
+import org.cytoscape.io.read.CyDataTableProducer;
import org.cytoscape.io.DataCategory;
import java.io.File;
@@ -57,7 +57,7 @@
private CySessionManager mgr;
- private CyReaderManager factory;
+ private CyNetworkViewProducerManager factory;
@Tunable(description="Session file to load")
public File file;
@@ -66,7 +66,7 @@
* Constructor.<br>
* Add a menu item under "File" and set shortcut.
*/
- public OpenSessionTask(CySessionManager mgr, CyReaderManager factory) {
+ public OpenSessionTask(CySessionManager mgr,
CyNetworkViewProducerManager factory) {
this.mgr = mgr;
this.factory = factory;
}
@@ -86,11 +86,11 @@
taskMonitor.setStatusMessage("Opening Session File.\n\nIt may
take a while.\nPlease wait...");
taskMonitor.setProgress(0.0);
- CyReader sr;
+ CyDataTableProducer sr;
try {
- sr = factory.getReader(file.toURI(),
DataCategory.SESSION);
- sr.read();
+ //sr = factory.getReader(file.toURI(),
DataCategory.SESSION);
+ //sr.read();
} catch (Exception e) {
throw new Exception("Cannot open the session file: " +
name, e);
} finally {
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTaskFactory.java
2010-08-18 00:21:49 UTC (rev 21438)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTaskFactory.java
2010-08-18 00:22:11 UTC (rev 21439)
@@ -37,7 +37,7 @@
package org.cytoscape.task.internal.session;
import org.cytoscape.session.CySessionManager;
-import org.cytoscape.io.read.CyReaderManager;
+import org.cytoscape.io.read.CyNetworkViewProducerManager;
import org.cytoscape.work.Task;
import org.cytoscape.work.TaskFactory;
@@ -48,9 +48,9 @@
public class OpenSessionTaskFactory implements TaskFactory {
private CySessionManager mgr;
- private CyReaderManager rmgr;
+ private CyNetworkViewProducerManager rmgr;
- public OpenSessionTaskFactory(CySessionManager mgr, CyReaderManager
rmgr) {
+ public OpenSessionTaskFactory(CySessionManager mgr,
CyNetworkViewProducerManager rmgr) {
this.mgr = mgr;
this.rmgr = rmgr;
}
--
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.
