Author: mes
Date: 2010-09-09 17:44:24 -0700 (Thu, 09 Sep 2010)
New Revision: 21784
Added:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportgraphics/
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactory.java
Removed:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/AbstractSaveSessionTask.java
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionAsTask.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionAsTaskFactory.java
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/SaveSessionTaskFactory.java
Log:
changes reflecting the new writer api
Added:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactory.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactory.java
2010-09-10 00:44:24 UTC (rev 21784)
@@ -0,0 +1,52 @@
+/*
+ Copyright (c) 2010, The Cytoscape Consortium (www.cytoscape.org)
+
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation; either version 2.1 of the License, or
+ any later version.
+
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
+ MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
+ documentation provided hereunder is on an "as is" basis, and the
+ Institute for Systems Biology and the Whitehead Institute
+ have no obligations to provide maintenance, support,
+ updates, enhancements or modifications. In no event shall the
+ Institute for Systems Biology and the Whitehead Institute
+ be liable to any party for direct, indirect, special,
+ incidental or consequential damages, including lost profits, arising
+ out of the use of this software and its documentation, even if the
+ Institute for Systems Biology and the Whitehead Institute
+ have been advised of the possibility of such damage. See
+ the GNU Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public License
+ along with this library; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.cytoscape.task.internal.loadnetwork;
+
+import org.cytoscape.task.AbstractNetworkViewTaskFactory;
+import org.cytoscape.io.write.ViewWriterManager;
+import org.cytoscape.io.write.ViewWriter;
+import org.cytoscape.session.CyNetworkManager;
+import org.cytoscape.work.TaskIterator;
+
+/**
+ *
+ */
+public class ExportNetworkImageTaskFactory extends
AbstractNetworkViewTaskFactory {
+
+ private final ViewWriterManager viewWriterMgr;
+ private final CyNetworkManager netMgr;
+ public ExportNetworkImageTaskFactory(ViewWriterManager viewWriterMgr,
CyNetworkManager netMgr) {
+ this.viewWriterMgr = viewWriterMgr;
+ this.netMgr = netMgr;
+ }
+
+ public TaskIterator getTaskIterator() {
+ return new TaskIterator( new ViewWriter( viewWriterMgr, view,
netMgr.getCurrentRenderingEngine() ) );
+ }
+}
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/AbstractSaveSessionTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/AbstractSaveSessionTask.java
2010-09-10 00:43:33 UTC (rev 21783)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/AbstractSaveSessionTask.java
2010-09-10 00:44:24 UTC (rev 21784)
@@ -1,92 +0,0 @@
-/*
- File: AbstractSaveSessionTask.java
-
- Copyright (c) 2006, 2010, The Cytoscape Consortium (www.cytoscape.org)
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published
- by the Free Software Foundation; either version 2.1 of the License, or
- any later version.
-
- This library is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, WITHOUT EVEN THE IMPLIED WARRANTY OF
- MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. The software and
- documentation provided hereunder is on an "as is" basis, and the
- Institute for Systems Biology and the Whitehead Institute
- have no obligations to provide maintenance, support,
- updates, enhancements or modifications. In no event shall the
- Institute for Systems Biology and the Whitehead Institute
- be liable to any party for direct, indirect, special,
- incidental or consequential damages, including lost profits, arising
- out of the use of this software and its documentation, even if the
- Institute for Systems Biology and the Whitehead Institute
- have been advised of the possibility of such damage. See
- the GNU Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public License
- along with this library; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-package org.cytoscape.task.internal.session;
-
-
-import org.cytoscape.io.write.CyWriterManager;
-import org.cytoscape.io.write.CyWriter;
-import org.cytoscape.io.DataCategory;
-
-import org.cytoscape.work.AbstractTask;
-import org.cytoscape.work.TaskMonitor;
-import org.cytoscape.work.Tunable;
-
-import org.cytoscape.session.CySessionManager;
-
-import java.io.File;
-
-
-abstract class AbstractSaveSessionTask extends AbstractTask {
-
- private String SESSION_EXT = ".cys";
-
- private CySessionManager mgr;
- private CyWriterManager factory;
-
- @Tunable(description="Save session as")
- public File file;
-
- /**
- * setAcceleratorCombo(KeyEvent.VK_S, ActionEvent.CTRL_MASK);
- */
- public AbstractSaveSessionTask(CySessionManager mgr, CyWriterManager
factory) {
- this.mgr = mgr;
- this.factory = factory;
- }
-
- public abstract void run(TaskMonitor taskMonitor) throws Exception;
-
- /**
- * If no current session file exists, open dialog box to ask user a new
- * session file name, otherwise, overwrite the file.
- */
- protected void saveSession(TaskMonitor taskMonitor) throws Exception {
-
- String name = file.getAbsolutePath();
-
- CyWriter sw = factory.getWriter(DataCategory.SESSION);
-
- taskMonitor.setStatusMessage("Saving Cytoscape Session.\n\nIt
may take a while. Please wait...");
- taskMonitor.setProgress(-1.0);
-
- try {
- sw.write(file);
- } catch (Exception e) {
- throw new Exception("Could not write session to the
file: " + name, e);
- }
-
- taskMonitor.setProgress(1.0);
- taskMonitor.setStatusMessage("Session successfully saved to: "
+ name);
-
- // TODO This should fire an event that updates appropriate
windows and such-like.
- mgr.setCurrentSessionFileName(file.getName());
- }
-
-}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionAsTask.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionAsTask.java
2010-09-10 00:43:33 UTC (rev 21783)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionAsTask.java
2010-09-10 00:44:24 UTC (rev 21784)
@@ -37,40 +37,38 @@
package org.cytoscape.task.internal.session;
-import org.cytoscape.io.write.CyWriterManager;
-import org.cytoscape.io.write.CyWriter;
-
-import org.cytoscape.work.Task;
+import org.cytoscape.io.write.SessionWriterManager;
+import org.cytoscape.io.write.SessionWriter;
+import org.cytoscape.session.CySessionManager;
+import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
+import org.cytoscape.work.Tunable;
-import org.cytoscape.session.CySessionManager;
-
import java.io.File;
-public class SaveSessionAsTask extends AbstractSaveSessionTask {
+public class SaveSessionAsTask extends AbstractTask {
+ @Tunable(description="Save Session as:")
+ public File file;
+
+ private final SessionWriterManager writerMgr;
+ private final CySessionManager sessionMgr;
+
/**
* setAcceleratorCombo(KeyEvent.VK_S, ActionEvent.CTRL_MASK);
*/
- public SaveSessionAsTask(CySessionManager mgr, CyWriterManager factory)
{
- super(mgr,factory);
-
- // How we set file initially determines how whether this is
"save"
- // or "save as".
- file = null;
+ public SaveSessionAsTask(SessionWriterManager writerMgr,
CySessionManager sessionMgr) {
+ super();
+ this.writerMgr = writerMgr;
+ this.sessionMgr = sessionMgr;
}
-
- /**
- * If no current session file exists, open dialog box to ask user a new
- * session file name, otherwise, overwrite the file.
- */
public void run(TaskMonitor taskMonitor) throws Exception {
- saveSession(taskMonitor);
+ insertTaskAfterCurrentTask( new SessionWriter(writerMgr,
sessionMgr, file ) );
}
@Override
public void cancel() {
}
-}
+}
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionAsTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionAsTaskFactory.java
2010-09-10 00:43:33 UTC (rev 21783)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionAsTaskFactory.java
2010-09-10 00:44:24 UTC (rev 21784)
@@ -31,7 +31,7 @@
import org.cytoscape.session.CySessionManager;
-import org.cytoscape.io.write.CyWriterManager;
+import org.cytoscape.io.write.SessionWriterManager;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TaskIterator;
@@ -39,15 +39,15 @@
public class SaveSessionAsTaskFactory implements TaskFactory {
- private CySessionManager mgr;
- private CyWriterManager rmgr;
+ private CySessionManager sessionMgr;
+ private SessionWriterManager writerMgr;
- public SaveSessionAsTaskFactory(CySessionManager mgr, CyWriterManager
rmgr) {
- this.mgr = mgr;
- this.rmgr = rmgr;
+ public SaveSessionAsTaskFactory(SessionWriterManager writerMgr,
CySessionManager sessionMgr) {
+ this.sessionMgr = sessionMgr;
+ this.writerMgr = writerMgr;
}
public TaskIterator getTaskIterator() {
- return new TaskIterator(new SaveSessionAsTask(mgr, rmgr));
+ return new TaskIterator(new SaveSessionAsTask(writerMgr,
sessionMgr));
}
}
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-10 00:43:33 UTC (rev 21783)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionTask.java
2010-09-10 00:44:24 UTC (rev 21784)
@@ -37,29 +37,33 @@
package org.cytoscape.task.internal.session;
-import org.cytoscape.io.write.CyWriterManager;
-import org.cytoscape.io.write.CyWriter;
-
-import org.cytoscape.work.Task;
+import org.cytoscape.io.write.SessionWriterManager;
+import org.cytoscape.io.write.SessionWriter;
+import org.cytoscape.session.CySessionManager;
+import org.cytoscape.work.AbstractTask;
import org.cytoscape.work.TaskMonitor;
-import org.cytoscape.session.CySessionManager;
-
import java.io.File;
-public class SaveSessionTask extends AbstractSaveSessionTask {
+public class SaveSessionTask extends AbstractTask {
+ private final File file;
+ private final SessionWriterManager writerMgr;
+ private final CySessionManager sessionMgr;
+
/**
* setAcceleratorCombo(KeyEvent.VK_S, ActionEvent.CTRL_MASK);
*/
- public SaveSessionTask(CySessionManager mgr, CyWriterManager factory) {
- super(mgr,factory);
- file = new File(mgr.getCurrentSessionFileName());
+ public SaveSessionTask(SessionWriterManager writerMgr, CySessionManager
sessionMgr) {
+ super();
+ this.writerMgr = writerMgr;
+ this.sessionMgr = sessionMgr;
+ file = new File(sessionMgr.getCurrentSessionFileName());
}
public void run(TaskMonitor taskMonitor) throws Exception {
- saveSession(taskMonitor);
+ insertTaskAfterCurrentTask( new SessionWriter(writerMgr,
sessionMgr, file ) );
}
@Override
Modified:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionTaskFactory.java
2010-09-10 00:43:33 UTC (rev 21783)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/session/SaveSessionTaskFactory.java
2010-09-10 00:44:24 UTC (rev 21784)
@@ -31,7 +31,7 @@
import org.cytoscape.session.CySessionManager;
-import org.cytoscape.io.write.CyWriterManager;
+import org.cytoscape.io.write.SessionWriterManager;
import org.cytoscape.work.TaskFactory;
import org.cytoscape.work.TaskIterator;
@@ -39,15 +39,15 @@
public class SaveSessionTaskFactory implements TaskFactory {
- private CySessionManager mgr;
- private CyWriterManager rmgr;
+ private CySessionManager sessionMgr;
+ private SessionWriterManager writerMgr;
- public SaveSessionTaskFactory(CySessionManager mgr, CyWriterManager
rmgr) {
- this.mgr = mgr;
- this.rmgr = rmgr;
+ public SaveSessionTaskFactory(SessionWriterManager writerMgr,
CySessionManager sessionMgr) {
+ this.sessionMgr = sessionMgr;
+ this.writerMgr = writerMgr;
}
public TaskIterator getTaskIterator() {
- return new TaskIterator(new SaveSessionTask(mgr, rmgr));
+ return new TaskIterator(new SaveSessionTask(writerMgr,
sessionMgr));
}
}
--
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.
