Author: rozagh
Date: 2012-06-07 17:45:19 -0700 (Thu, 07 Jun 2012)
New Revision: 29504
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/CySessionWriter.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/SaveSessionAsTask.java
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/SaveSessionTask.java
Log:
Adding the session file extension when saving into prop file (for recent
session files).
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/CySessionWriter.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/CySessionWriter.java
2012-06-08 00:20:18 UTC (rev 29503)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/CySessionWriter.java
2012-06-08 00:45:19 UTC (rev 29504)
@@ -64,7 +64,7 @@
insertTasksAfterCurrentTask( writer );
}
- private static boolean HasFileExtension(final String pathName) {
+ static boolean HasFileExtension(final String pathName) {
final int lastDotPos = pathName.lastIndexOf('.');
final int lastSlashPos =
pathName.lastIndexOf(File.separatorChar);
return lastSlashPos < lastDotPos; // Yes, this also works if
one or both of lastSlashPos and lastDotPos are -1!
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/SaveSessionAsTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/SaveSessionAsTask.java
2012-06-08 00:20:18 UTC (rev 29503)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/SaveSessionAsTask.java
2012-06-08 00:45:19 UTC (rev 29504)
@@ -77,8 +77,11 @@
// Fire event to tell others session had been saved to a file.
cyEventHelper.fireEvent(new SessionSavedEvent(this, session,
file.getAbsolutePath()));
-
+
// Add this session file URL as the most recent file.
+ if ( !CySessionWriter.HasFileExtension(file.getName()))
+ file = new File(file.getPath() + ".cys");
+
tracker.add(file.toURI().toURL());
}
}
Modified:
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/SaveSessionTask.java
===================================================================
---
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/SaveSessionTask.java
2012-06-08 00:20:18 UTC (rev 29503)
+++
core3/impl/trunk/core-task-impl/src/main/java/org/cytoscape/task/internal/session/SaveSessionTask.java
2012-06-08 00:45:19 UTC (rev 29504)
@@ -69,10 +69,12 @@
public void run(TaskMonitor taskMonitor) throws Exception {
taskMonitor.setProgress(0.0);
- final File file = new File(fileName);
+ File file = new File(fileName);
insertTasksAfterCurrentTask(new CySessionWriter(writerMgr,
session, file));
// Add this session file URL as the most recent file.
+ if ( !CySessionWriter.HasFileExtension(file.getName()))
+ file = new File(file.getPath() + ".cys");
tracker.add(file.toURI().toURL());
taskMonitor.setProgress(1.0);
--
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.
