Author: mes
Date: 2010-09-30 13:40:26 -0700 (Thu, 30 Sep 2010)
New Revision: 22109
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/NewSessionTask.java
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/SaveSessionTask.java
Log:
updated session related tasks
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/NewSessionTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/NewSessionTask.java
2010-09-30 20:40:02 UTC (rev 22108)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/NewSessionTask.java
2010-09-30 20:40:26 UTC (rev 22109)
@@ -44,7 +44,7 @@
}
public void run(TaskMonitor taskMonitor) {
- mgr.setCurrentSession(null);
+ mgr.setCurrentSession(null,null);
}
@Override
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-09-30 20:40:02 UTC (rev 22108)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/OpenSessionTask.java
2010-09-30 20:40:26 UTC (rev 22109)
@@ -76,6 +76,7 @@
throw new NullPointerException("No file specified!");
CySessionReader reader = readerMgr.getReader((file.toURI()));
+ reader.run(taskMonitor);
if (cancelled)
return;
@@ -99,10 +100,9 @@
throw new NullPointerException("Session could
not be read for file: " + file);
}
- sessionMgr.setCurrentSession(newSession);
+ sessionMgr.setCurrentSession(newSession,
file.getAbsolutePath());
taskMonitor.setProgress(1.0);
taskMonitor.setStatusMessage("Session file " + file + "
successfully loaded.");
}
}
-
}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionTask.java
2010-09-30 20:40:02 UTC (rev 22108)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionTask.java
2010-09-30 20:40:26 UTC (rev 22109)
@@ -56,7 +56,7 @@
public void run(TaskMonitor taskMonitor) throws Exception {
CySession session = sessionMgr.getCurrentSession();
- File file = new File(session.getFileName());
+ File file = new File(sessionMgr.getCurrentSessionFileName());
insertTasksAfterCurrentTask(new SessionWriter(writerMgr,
session, file ));
}
}
--
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.
