Author: kono
Date: 2011-07-14 15:58:42 -0700 (Thu, 14 Jul 2011)
New Revision: 26185
Added:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/TunableAbstractCyWriter.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/ViewWriter.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/graphics/
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/graphics/ExportNetworkImageTaskFactory.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/network/
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriter.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/network/ExportNetworkViewTaskFactory.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/CyTableWriter.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/ExportCurrentTableTaskFactory.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/ExportEdgeTableTaskFactory.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/ExportNodeTableTaskFactory.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/vizmap/
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/vizmap/ExportVizmapTaskFactory.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/vizmap/VizmapWriter.java
Removed:
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/exportnetwork/ExportNetworkViewTaskFactory.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportCurrentTableTaskFactory.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportEdgeTableTaskFactory.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportNodeTableTaskFactory.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportvizmap/ExportVizmapTaskFactory.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/CyNetworkViewWriter.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/CyTableWriter.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/TunableAbstractCyWriter.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/ViewWriter.java
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/VizmapWriter.java
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactoryTest.java
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/io/ViewWriterTest.java
Log:
fixes #24 internal package structure had been refactored and related classes
had been placed in more appropreate packages.
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/TunableAbstractCyWriter.java
(from rev 26184,
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/TunableAbstractCyWriter.java)
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/TunableAbstractCyWriter.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/TunableAbstractCyWriter.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -0,0 +1,120 @@
+package org.cytoscape.task.internal.export;
+
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import org.cytoscape.io.CyFileFilter;
+import org.cytoscape.io.write.AbstractCyWriter;
+import org.cytoscape.io.write.CyWriterManager;
+import org.cytoscape.work.Tunable;
+import org.cytoscape.work.TunableValidator;
+import org.cytoscape.work.util.ListSingleSelection;
+
+
+/**
+ * An abstract utility implementation of a Task that writes a user defined
+ * file to a file type determined by a provided writer manager. This class
+ * is meant to be extended for specific file types such that the appropriate
+ * {@link org.cytoscape.io.write.CyWriter} can be identified.
+ */
+public abstract class TunableAbstractCyWriter<T extends CyWriterManager>
extends AbstractCyWriter<T> implements
+ TunableValidator {
+ /**
+ * This method gets the file to be written. This method should not
+ * be called directly, but rather handled by the {@link
org.cytoscape.work.Tunable}
+ * processing. This method is the "getter" portion of a
+ * getter/setter tunable method pair.
+ * @return The file to be written.
+ */
+ @Tunable(description="Select the output file name")
+ public File getOutputFile() {
+ return outputFile;
+ }
+
+ /**
+ * The list of file type options generated by the file types
+ * available from the CyWriterManager. This field should not
+ * be set directly, but rather handled by the {@link
org.cytoscape.work.Tunable}
+ * processing.
+ */
+ @Tunable(description = "Select the export file format")
+ public final ListSingleSelection<String> options;
+
+ protected final String getExportFileFormat() {
+ return options.getSelectedValue();
+ }
+
+ /**
+ * @param writerManager The CyWriterManager to be used to determine
which
+ * {@link org.cytoscape.io.write.CyWriter} to be used to write the file
chosen by the user.
+ */
+ public TunableAbstractCyWriter(T writerManager) {
+ super(writerManager);
+ options = new ListSingleSelection<String>(new
ArrayList<String>(descriptionFilterMap.keySet()));
+ }
+
+ @Override
+ public final ValidationState getValidationState(final Appendable msg) {
+ // Make sure we have the right extension, if not, then force it:
+ if (!fileExtensionIsOk(outputFile))
+ outputFile = addOrReplaceExtension(outputFile);
+
+ if (outputFile.exists()) {
+ try {
+ msg.append("File already exists, are you sure
you want to overwrite it?");
+ } catch (final Exception e) {
+ /* Intentionally empty! */
+ }
+ return ValidationState.REQUEST_CONFIRMATION;
+ } else
+ return ValidationState.OK;
+ }
+
+ protected final boolean fileExtensionIsOk(final File file) {
+ final String exportFileFormat = getExportFileFormat();
+ if (exportFileFormat == null)
+ return true;
+
+ final CyFileFilter filter =
descriptionFilterMap.get(exportFileFormat);
+ if (filter == null)
+ return true;
+
+ final String extension = getExtension(file.getPath());
+ if (extension == null)
+ return false;
+
+ return filter.getExtensions().contains(extension);
+ }
+
+ private static final String getExtension(final String fileName) {
+ final int lastDotPos = fileName.lastIndexOf('.');
+ if (lastDotPos == -1 || lastDotPos == fileName.length() - 1)
+ return null;
+ return fileName.substring(lastDotPos + 1).toLowerCase();
+ }
+
+ protected final File addOrReplaceExtension(final File file) {
+ final CyFileFilter filter =
descriptionFilterMap.get(getExportFileFormat());
+ if (filter == null)
+ return file;
+
+ final Iterator<String> extensions =
filter.getExtensions().iterator();
+ if (!extensions.hasNext())
+ return file;
+
+ final String extension = extensions.next();
+ final String pathWithoutExtension =
stripExtension(file.getPath());
+
+ return new File(pathWithoutExtension + "." + extension);
+ }
+
+ private static String stripExtension(final String fileName) {
+ final String extension = getExtension(fileName);
+ if (extension == null)
+ return fileName;
+
+ return fileName.substring(0, fileName.length() - 1 -
extension.length());
+ }
+}
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/ViewWriter.java
(from rev 26184,
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/ViewWriter.java)
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/ViewWriter.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/ViewWriter.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -0,0 +1,53 @@
+package org.cytoscape.task.internal.export;
+
+
+import org.cytoscape.view.model.View;
+import org.cytoscape.view.presentation.RenderingEngine;
+import org.cytoscape.work.Tunable;
+import org.cytoscape.io.CyFileFilter;
+import org.cytoscape.io.write.CyWriter;
+import org.cytoscape.io.write.PresentationWriterManager;
+
+import java.io.File;
+
+
+/**
+ * A utility Task implementation that will write the specified View to the
+ * the specified image file using the specified RenderingEngine.
+ */
+public final class ViewWriter extends
TunableAbstractCyWriter<PresentationWriterManager> {
+ private final View<?> view;
+ private final RenderingEngine<?> re;
+
+ /**
+ * @param writerManager The {@link
org.cytoscape.io.write.PresentationWriterManager} used to determine which type
of
+ * file should be written.
+ * @param view The View object to be written to the specified file.
+ * @param re The RenderingEngine used to generate the image to be
written to the file.
+ */
+ public ViewWriter(final PresentationWriterManager writerManager, final
View<?> view, final RenderingEngine<?> re ) {
+ super(writerManager);
+
+ if ( view == null )
+ throw new NullPointerException("view is null");
+ this.view = view;
+
+ if ( re == null )
+ throw new NullPointerException("rendering engine is
null");
+ this.re = re;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected CyWriter getWriter(CyFileFilter filter, File file) throws
Exception {
+ if (!fileExtensionIsOk(file))
+ file = addOrReplaceExtension(outputFile);
+ return writerManager.getWriter(view,re,filter,file);
+ }
+
+ @Tunable(description="Save Image As:",
params="fileCategory=image;input=false")
+ public File getOutputFile() {
+ return outputFile;
+ }
+}
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/graphics/ExportNetworkImageTaskFactory.java
(from rev 26184,
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/export/graphics/ExportNetworkImageTaskFactory.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/graphics/ExportNetworkImageTaskFactory.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -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.export.graphics;
+
+
+import org.cytoscape.task.AbstractNetworkViewTaskFactory;
+import org.cytoscape.task.internal.export.ViewWriter;
+import org.cytoscape.io.write.PresentationWriterManager;
+import org.cytoscape.session.CyApplicationManager;
+import org.cytoscape.work.TaskIterator;
+
+
+public class ExportNetworkImageTaskFactory extends
AbstractNetworkViewTaskFactory {
+
+ private final PresentationWriterManager presentationWriterMgr;
+ private final CyApplicationManager applicationManager;
+
+ public ExportNetworkImageTaskFactory(final PresentationWriterManager
presentationWriterMgr, final CyApplicationManager applicationManager) {
+ this.presentationWriterMgr = presentationWriterMgr;
+ this.applicationManager = applicationManager;
+ }
+
+ public TaskIterator getTaskIterator() {
+ return new TaskIterator( new ViewWriter( presentationWriterMgr,
view, applicationManager.getCurrentRenderingEngine() ) );
+ }
+}
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriter.java
(from rev 26184,
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/CyNetworkViewWriter.java)
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriter.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/network/CyNetworkViewWriter.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -0,0 +1,49 @@
+package org.cytoscape.task.internal.export.network;
+
+
+import java.io.File;
+
+import org.cytoscape.io.CyFileFilter;
+import org.cytoscape.io.write.CyNetworkViewWriterManager;
+import org.cytoscape.io.write.CyWriter;
+import org.cytoscape.task.internal.export.TunableAbstractCyWriter;
+import org.cytoscape.view.model.CyNetworkView;
+import org.cytoscape.work.Tunable;
+
+
+/**
+ * A utility Task implementation specifically for writing a {@link
org.cytoscape.view.model.CyNetworkView}.
+ */
+public final class CyNetworkViewWriter extends
TunableAbstractCyWriter<CyNetworkViewWriterManager> {
+ // the view to be written
+ private final CyNetworkView view;
+
+ /**
+ * @param writerManager The {@link
org.cytoscape.io.write.CyNetworkViewWriterManager} used to determine which
+ * {@link org.cytoscape.io.write.CyNetworkViewWriterFactory} to use to
write the file.
+ * @param view The {@link org.cytoscape.view.model.CyNetworkView} to be
written out.
+ */
+ public CyNetworkViewWriter(final CyNetworkViewWriterManager
writerManager, final CyNetworkView view ) {
+ super(writerManager);
+
+ if (view == null)
+ throw new NullPointerException("View is null!");
+ this.view = view;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ protected CyWriter getWriter(CyFileFilter filter, File file) throws
Exception{
+ if (!fileExtensionIsOk(file))
+ file = addOrReplaceExtension(outputFile);
+
+ return writerManager.getWriter(view,filter,file);
+ }
+
+ @Tunable(description="Save Network As:",
params="fileCategory=network;input=false")
+ @Override public File getOutputFile() {
+ return outputFile;
+ }
+}
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/network/ExportNetworkViewTaskFactory.java
(from rev 26184,
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportnetwork/ExportNetworkViewTaskFactory.java)
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/network/ExportNetworkViewTaskFactory.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/network/ExportNetworkViewTaskFactory.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -0,0 +1,20 @@
+package org.cytoscape.task.internal.export.network;
+
+import org.cytoscape.io.write.CyNetworkViewWriterManager;
+import org.cytoscape.task.AbstractNetworkViewTaskFactory;
+import org.cytoscape.work.TaskIterator;
+
+public class ExportNetworkViewTaskFactory extends
AbstractNetworkViewTaskFactory {
+
+ private CyNetworkViewWriterManager writerManager;
+
+ public ExportNetworkViewTaskFactory(CyNetworkViewWriterManager
writerManager) {
+ this.writerManager = writerManager;
+ }
+
+ @Override
+ public TaskIterator getTaskIterator() {
+ return new TaskIterator(new CyNetworkViewWriter(writerManager,
view));
+ }
+
+}
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/CyTableWriter.java
(from rev 26184,
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/CyTableWriter.java)
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/CyTableWriter.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/CyTableWriter.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -0,0 +1,40 @@
+
+package org.cytoscape.task.internal.export.table;
+
+import java.io.File;
+
+import org.cytoscape.io.CyFileFilter;
+import org.cytoscape.io.write.CyTableWriterManager;
+import org.cytoscape.io.write.CyWriter;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.task.internal.export.TunableAbstractCyWriter;
+
+/**
+ * A utility Task implementation specifically for writing {@link
org.cytoscape.model.CyTable} objects.
+ */
+public final class CyTableWriter extends
TunableAbstractCyWriter<CyTableWriterManager> {
+
+ private final CyTable table;
+
+ /**
+ * @param writerManager The {@link
org.cytoscape.io.write.CyTableWriterManager} used to determine which
+ * {@link org.cytoscape.io.write.CyTableWriterFactory} to use to write
the file.
+ * @param table The {@link org.cytoscape.model.CyTable} to be written
out.
+ */
+ public CyTableWriter(CyTableWriterManager writerManager, CyTable table
) {
+ super(writerManager);
+ if ( table == null )
+ throw new NullPointerException("Table is null");
+ this.table = table;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected CyWriter getWriter(CyFileFilter filter, File file) throws
Exception{
+ if (!fileExtensionIsOk(file))
+ file = addOrReplaceExtension(outputFile);
+
+ return writerManager.getWriter(table,filter,file);
+ }
+}
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/ExportCurrentTableTaskFactory.java
(from rev 26184,
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportCurrentTableTaskFactory.java)
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/ExportCurrentTableTaskFactory.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/ExportCurrentTableTaskFactory.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -0,0 +1,19 @@
+package org.cytoscape.task.internal.export.table;
+
+import org.cytoscape.io.write.CyTableWriterManager;
+import org.cytoscape.task.AbstractTableTaskFactory;
+import org.cytoscape.work.TaskIterator;
+
+public class ExportCurrentTableTaskFactory extends AbstractTableTaskFactory {
+
+ private final CyTableWriterManager writerManager;
+
+ public ExportCurrentTableTaskFactory(CyTableWriterManager
writerManager) {
+ this.writerManager = writerManager;
+ }
+
+ @Override
+ public TaskIterator getTaskIterator() {
+ return new TaskIterator(new CyTableWriter(writerManager,
table));
+ }
+}
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/ExportEdgeTableTaskFactory.java
(from rev 26184,
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportEdgeTableTaskFactory.java)
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/ExportEdgeTableTaskFactory.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/ExportEdgeTableTaskFactory.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -0,0 +1,22 @@
+package org.cytoscape.task.internal.export.table;
+
+import org.cytoscape.io.write.CyTableWriterManager;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.task.AbstractNetworkViewTaskFactory;
+import org.cytoscape.work.TaskIterator;
+
+public class ExportEdgeTableTaskFactory extends AbstractNetworkViewTaskFactory
{
+
+ private final CyTableWriterManager writerManager;
+
+ public ExportEdgeTableTaskFactory(CyTableWriterManager writerManager) {
+ this.writerManager = writerManager;
+ }
+
+ @Override
+ public TaskIterator getTaskIterator() {
+ CyTable table = view.getModel().getDefaultEdgeTable();
+ return new TaskIterator(new CyTableWriter(writerManager,
table));
+ }
+
+}
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/ExportNodeTableTaskFactory.java
(from rev 26184,
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportNodeTableTaskFactory.java)
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/ExportNodeTableTaskFactory.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/table/ExportNodeTableTaskFactory.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -0,0 +1,22 @@
+package org.cytoscape.task.internal.export.table;
+
+import org.cytoscape.io.write.CyTableWriterManager;
+import org.cytoscape.model.CyTable;
+import org.cytoscape.task.AbstractNetworkViewTaskFactory;
+import org.cytoscape.work.TaskIterator;
+
+public class ExportNodeTableTaskFactory extends AbstractNetworkViewTaskFactory
{
+
+ private final CyTableWriterManager writerManager;
+
+ public ExportNodeTableTaskFactory(CyTableWriterManager writerManager) {
+ this.writerManager = writerManager;
+ }
+
+ @Override
+ public TaskIterator getTaskIterator() {
+ CyTable table = view.getModel().getDefaultNodeTable();
+ return new TaskIterator(new CyTableWriter(writerManager,
table));
+ }
+
+}
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/vizmap/ExportVizmapTaskFactory.java
(from rev 26184,
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportvizmap/ExportVizmapTaskFactory.java)
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/vizmap/ExportVizmapTaskFactory.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/vizmap/ExportVizmapTaskFactory.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -0,0 +1,22 @@
+package org.cytoscape.task.internal.export.vizmap;
+
+import org.cytoscape.io.write.VizmapWriterManager;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.work.TaskFactory;
+import org.cytoscape.work.TaskIterator;
+
+public class ExportVizmapTaskFactory implements TaskFactory {
+
+ private final VizmapWriterManager writerManager;
+ private final VisualMappingManager vmMgr;
+
+ public ExportVizmapTaskFactory(VizmapWriterManager writerManager,
VisualMappingManager vmMgr) {
+ this.writerManager = writerManager;
+ this.vmMgr = vmMgr;
+ }
+
+ @Override
+ public TaskIterator getTaskIterator() {
+ return new TaskIterator(new VizmapWriter(writerManager, vmMgr));
+ }
+}
\ No newline at end of file
Copied:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/vizmap/VizmapWriter.java
(from rev 26184,
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/VizmapWriter.java)
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/vizmap/VizmapWriter.java
(rev 0)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/export/vizmap/VizmapWriter.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -0,0 +1,32 @@
+package org.cytoscape.task.internal.export.vizmap;
+
+import java.io.File;
+import java.util.Set;
+
+import org.cytoscape.io.CyFileFilter;
+import org.cytoscape.io.write.CyWriter;
+import org.cytoscape.io.write.VizmapWriterManager;
+import org.cytoscape.task.internal.export.TunableAbstractCyWriter;
+import org.cytoscape.view.vizmap.VisualMappingManager;
+import org.cytoscape.view.vizmap.VisualStyle;
+
+public class VizmapWriter extends TunableAbstractCyWriter<VizmapWriterManager>
{
+
+ private final VisualMappingManager vmMgr;
+
+ public VizmapWriter(VizmapWriterManager writerManager,
VisualMappingManager vmMgr) {
+ super(writerManager);
+ if (vmMgr == null) throw new
NullPointerException("VisualMappingManager is null");
+ this.vmMgr = vmMgr;
+ }
+
+ @Override
+ protected CyWriter getWriter(CyFileFilter filter, File file) throws
Exception {
+ if (!fileExtensionIsOk(file))
+ file = addOrReplaceExtension(outputFile);
+
+ Set<VisualStyle> styles = vmMgr.getAllVisualStyles();
+
+ return writerManager.getWriter(styles, filter, file);
+ }
+}
Deleted:
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
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactory.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -1,52 +0,0 @@
-/*
- 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.exportgraphics;
-
-
-import org.cytoscape.task.AbstractNetworkViewTaskFactory;
-import org.cytoscape.task.internal.io.ViewWriter;
-import org.cytoscape.io.write.PresentationWriterManager;
-import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.work.TaskIterator;
-
-
-public class ExportNetworkImageTaskFactory extends
AbstractNetworkViewTaskFactory {
-
- private final PresentationWriterManager presentationWriterMgr;
- private final CyApplicationManager applicationManager;
-
- public ExportNetworkImageTaskFactory(final PresentationWriterManager
presentationWriterMgr, final CyApplicationManager applicationManager) {
- this.presentationWriterMgr = presentationWriterMgr;
- this.applicationManager = applicationManager;
- }
-
- public TaskIterator getTaskIterator() {
- return new TaskIterator( new ViewWriter( presentationWriterMgr,
view, applicationManager.getCurrentRenderingEngine() ) );
- }
-}
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportnetwork/ExportNetworkViewTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportnetwork/ExportNetworkViewTaskFactory.java
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportnetwork/ExportNetworkViewTaskFactory.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -1,21 +0,0 @@
-package org.cytoscape.task.internal.exportnetwork;
-
-import org.cytoscape.io.write.CyNetworkViewWriterManager;
-import org.cytoscape.task.AbstractNetworkViewTaskFactory;
-import org.cytoscape.task.internal.io.CyNetworkViewWriter;
-import org.cytoscape.work.TaskIterator;
-
-public class ExportNetworkViewTaskFactory extends
AbstractNetworkViewTaskFactory {
-
- private CyNetworkViewWriterManager writerManager;
-
- public ExportNetworkViewTaskFactory(CyNetworkViewWriterManager
writerManager) {
- this.writerManager = writerManager;
- }
-
- @Override
- public TaskIterator getTaskIterator() {
- return new TaskIterator(new CyNetworkViewWriter(writerManager,
view));
- }
-
-}
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportCurrentTableTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportCurrentTableTaskFactory.java
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportCurrentTableTaskFactory.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -1,20 +0,0 @@
-package org.cytoscape.task.internal.exporttable;
-
-import org.cytoscape.io.write.CyTableWriterManager;
-import org.cytoscape.task.AbstractTableTaskFactory;
-import org.cytoscape.task.internal.io.CyTableWriter;
-import org.cytoscape.work.TaskIterator;
-
-public class ExportCurrentTableTaskFactory extends AbstractTableTaskFactory {
-
- private final CyTableWriterManager writerManager;
-
- public ExportCurrentTableTaskFactory(CyTableWriterManager
writerManager) {
- this.writerManager = writerManager;
- }
-
- @Override
- public TaskIterator getTaskIterator() {
- return new TaskIterator(new CyTableWriter(writerManager,
table));
- }
-}
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportEdgeTableTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportEdgeTableTaskFactory.java
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportEdgeTableTaskFactory.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -1,23 +0,0 @@
-package org.cytoscape.task.internal.exporttable;
-
-import org.cytoscape.io.write.CyTableWriterManager;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.task.AbstractNetworkViewTaskFactory;
-import org.cytoscape.task.internal.io.CyTableWriter;
-import org.cytoscape.work.TaskIterator;
-
-public class ExportEdgeTableTaskFactory extends AbstractNetworkViewTaskFactory
{
-
- private final CyTableWriterManager writerManager;
-
- public ExportEdgeTableTaskFactory(CyTableWriterManager writerManager) {
- this.writerManager = writerManager;
- }
-
- @Override
- public TaskIterator getTaskIterator() {
- CyTable table = view.getModel().getDefaultEdgeTable();
- return new TaskIterator(new CyTableWriter(writerManager,
table));
- }
-
-}
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportNodeTableTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportNodeTableTaskFactory.java
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exporttable/ExportNodeTableTaskFactory.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -1,23 +0,0 @@
-package org.cytoscape.task.internal.exporttable;
-
-import org.cytoscape.io.write.CyTableWriterManager;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.task.AbstractNetworkViewTaskFactory;
-import org.cytoscape.task.internal.io.CyTableWriter;
-import org.cytoscape.work.TaskIterator;
-
-public class ExportNodeTableTaskFactory extends AbstractNetworkViewTaskFactory
{
-
- private final CyTableWriterManager writerManager;
-
- public ExportNodeTableTaskFactory(CyTableWriterManager writerManager) {
- this.writerManager = writerManager;
- }
-
- @Override
- public TaskIterator getTaskIterator() {
- CyTable table = view.getModel().getDefaultNodeTable();
- return new TaskIterator(new CyTableWriter(writerManager,
table));
- }
-
-}
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportvizmap/ExportVizmapTaskFactory.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportvizmap/ExportVizmapTaskFactory.java
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/exportvizmap/ExportVizmapTaskFactory.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -1,23 +0,0 @@
-package org.cytoscape.task.internal.exportvizmap;
-
-import org.cytoscape.io.write.VizmapWriterManager;
-import org.cytoscape.task.internal.io.VizmapWriter;
-import org.cytoscape.view.vizmap.VisualMappingManager;
-import org.cytoscape.work.TaskFactory;
-import org.cytoscape.work.TaskIterator;
-
-public class ExportVizmapTaskFactory implements TaskFactory {
-
- private final VizmapWriterManager writerManager;
- private final VisualMappingManager vmMgr;
-
- public ExportVizmapTaskFactory(VizmapWriterManager writerManager,
VisualMappingManager vmMgr) {
- this.writerManager = writerManager;
- this.vmMgr = vmMgr;
- }
-
- @Override
- public TaskIterator getTaskIterator() {
- return new TaskIterator(new VizmapWriter(writerManager, vmMgr));
- }
-}
\ No newline at end of file
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/CyNetworkViewWriter.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/CyNetworkViewWriter.java
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/CyNetworkViewWriter.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -1,47 +0,0 @@
-package org.cytoscape.task.internal.io;
-
-
-import java.io.File;
-
-import org.cytoscape.io.CyFileFilter;
-import org.cytoscape.io.write.CyNetworkViewWriterFactory;
-import org.cytoscape.io.write.CyNetworkViewWriterManager;
-import org.cytoscape.io.write.CyWriter;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.work.Tunable;
-
-
-/**
- * A utility Task implementation specifically for writing a {@link
org.cytoscape.view.model.CyNetworkView}.
- */
-public final class CyNetworkViewWriter extends
TunableAbstractCyWriter<CyNetworkViewWriterManager> {
- // the view to be written
- private final CyNetworkView view;
-
- /**
- * @param writerManager The {@link
org.cytoscape.io.write.CyNetworkViewWriterManager} used to determine which
- * {@link org.cytoscape.io.write.CyNetworkViewWriterFactory} to use to
write the file.
- * @param view The {@link org.cytoscape.view.model.CyNetworkView} to be
written out.
- */
- public CyNetworkViewWriter(CyNetworkViewWriterManager writerManager,
CyNetworkView view ) {
- super(writerManager);
- if (view == null)
- throw new NullPointerException("View is null!");
- this.view = view;
- }
-
- /**
- * {@inheritDoc}
- */
- protected CyWriter getWriter(CyFileFilter filter, File file) throws
Exception{
- if (!fileExtensionIsOk(file))
- file = addOrReplaceExtension(outputFile);
-
- return writerManager.getWriter(view,filter,file);
- }
-
- @Tunable(description="Save Network As:",
params="fileCategory=network;input=false")
- public File getOutputFile() {
- return outputFile;
- }
-}
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/CyTableWriter.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/CyTableWriter.java
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/CyTableWriter.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -1,40 +0,0 @@
-
-package org.cytoscape.task.internal.io;
-
-import org.cytoscape.model.CyTable;
-import org.cytoscape.io.CyFileFilter;
-import org.cytoscape.io.write.CyTableWriterFactory;
-import org.cytoscape.io.write.CyTableWriterManager;
-import org.cytoscape.io.write.CyWriter;
-
-import java.io.File;
-
-/**
- * A utility Task implementation specifically for writing {@link
org.cytoscape.model.CyTable} objects.
- */
-public final class CyTableWriter extends
TunableAbstractCyWriter<CyTableWriterManager> {
-
- private final CyTable table;
-
- /**
- * @param writerManager The {@link
org.cytoscape.io.write.CyTableWriterManager} used to determine which
- * {@link org.cytoscape.io.write.CyTableWriterFactory} to use to write
the file.
- * @param table The {@link org.cytoscape.model.CyTable} to be written
out.
- */
- public CyTableWriter(CyTableWriterManager writerManager, CyTable table
) {
- super(writerManager);
- if ( table == null )
- throw new NullPointerException("Table is null");
- this.table = table;
- }
-
- /**
- * {@inheritDoc}
- */
- protected CyWriter getWriter(CyFileFilter filter, File file) throws
Exception{
- if (!fileExtensionIsOk(file))
- file = addOrReplaceExtension(outputFile);
-
- return writerManager.getWriter(table,filter,file);
- }
-}
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/TunableAbstractCyWriter.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/TunableAbstractCyWriter.java
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/TunableAbstractCyWriter.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -1,125 +0,0 @@
-package org.cytoscape.task.internal.io;
-
-
-import org.cytoscape.work.Tunable;
-import org.cytoscape.work.TunableValidator;
-import org.cytoscape.work.TunableValidator.ValidationState;
-import org.cytoscape.work.util.ListSingleSelection;
-import org.cytoscape.io.CyFileFilter;
-import org.cytoscape.io.write.AbstractCyWriter;
-import org.cytoscape.io.write.CyWriterManager;
-
-import java.io.File;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.ArrayList;
-
-
-/**
- * An abstract utility implementation of a Task that writes a user defined
- * file to a file type determined by a provided writer manager. This class
- * is meant to be extended for specific file types such that the appropriate
- * {@link org.cytoscape.io.write.CyWriter} can be identified.
- */
-public abstract class TunableAbstractCyWriter<T extends CyWriterManager>
- extends AbstractCyWriter<T> implements TunableValidator
-{
- /**
- * This method gets the file to be written. This method should not
- * be called directly, but rather handled by the {@link
org.cytoscape.work.Tunable}
- * processing. This method is the "getter" portion of a
- * getter/setter tunable method pair.
- * @return The file to be written.
- */
- @Tunable(description="Select the output file name")
- public File getOutputFile() {
- return outputFile;
- }
-
- /**
- * The list of file type options generated by the file types
- * available from the CyWriterManager. This field should not
- * be set directly, but rather handled by the {@link
org.cytoscape.work.Tunable}
- * processing.
- */
- @Tunable(description = "Select the export file format")
- public final ListSingleSelection<String> options;
-
- protected final String getExportFileFormat() {
- return options.getSelectedValue();
- }
-
- /**
- * @param writerManager The CyWriterManager to be used to determine
which
- * {@link org.cytoscape.io.write.CyWriter} to be used to write the file
chosen by the user.
- */
- public TunableAbstractCyWriter(T writerManager) {
- super(writerManager);
- options = new ListSingleSelection<String>(new
ArrayList<String>(descriptionFilterMap.keySet()));
- }
-
- @Override
- public final ValidationState getValidationState(final Appendable msg) {
- // Make sure we have the right extension, if not, then force it:
- if (!fileExtensionIsOk(outputFile))
- outputFile = addOrReplaceExtension(outputFile);
-
- if (outputFile.exists()) {
- try {
- msg.append("File already exists, are you sure
you want to overwrite it?");
- } catch (final Exception e) {
- /* Intentionally empty! */
- }
- return ValidationState.REQUEST_CONFIRMATION;
- } else
- return ValidationState.OK;
- }
-
- protected final boolean fileExtensionIsOk(final File file) {
- final String exportFileFormat = getExportFileFormat();
- if (exportFileFormat == null)
- return true;
-
- final CyFileFilter filter =
descriptionFilterMap.get(exportFileFormat);
- if (filter == null)
- return true;
-
- final String extension = getExtension(file.getPath());
- if (extension == null)
- return false;
-
- return filter.getExtensions().contains(extension);
- }
-
- private static final String getExtension(final String fileName) {
- final int lastDotPos = fileName.lastIndexOf('.');
- if (lastDotPos == -1 || lastDotPos == fileName.length() - 1)
- return null;
- return fileName.substring(lastDotPos + 1).toLowerCase();
- }
-
- protected final File addOrReplaceExtension(final File file) {
- final CyFileFilter filter =
descriptionFilterMap.get(getExportFileFormat());
- if (filter == null)
- return file;
-
- final Iterator<String> extensions =
filter.getExtensions().iterator();
- if (!extensions.hasNext())
- return file;
-
- final String extension = extensions.next();
- final String pathWithoutExtension =
stripExtension(file.getPath());
-
- return new File(pathWithoutExtension + "." + extension);
- }
-
- private static String stripExtension(final String fileName) {
- final String extension = getExtension(fileName);
- if (extension == null)
- return fileName;
-
- return fileName.substring(0, fileName.length() - 1 -
extension.length());
- }
-}
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/ViewWriter.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/ViewWriter.java
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/ViewWriter.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -1,53 +0,0 @@
-package org.cytoscape.task.internal.io;
-
-
-import org.cytoscape.view.model.View;
-import org.cytoscape.view.presentation.RenderingEngine;
-import org.cytoscape.work.Tunable;
-import org.cytoscape.io.CyFileFilter;
-import org.cytoscape.io.write.CyWriter;
-import org.cytoscape.io.write.PresentationWriterManager;
-
-import java.io.File;
-
-
-/**
- * A utility Task implementation that will write the specified View to the
- * the specified image file using the specified RenderingEngine.
- */
-public final class ViewWriter extends
TunableAbstractCyWriter<PresentationWriterManager> {
- private final View<?> view;
- private final RenderingEngine<?> re;
-
- /**
- * @param writerManager The {@link
org.cytoscape.io.write.PresentationWriterManager} used to determine which type
of
- * file should be written.
- * @param view The View object to be written to the specified file.
- * @param re The RenderingEngine used to generate the image to be
written to the file.
- */
- public ViewWriter(final PresentationWriterManager writerManager, final
View<?> view, final RenderingEngine<?> re ) {
- super(writerManager);
-
- if ( view == null )
- throw new NullPointerException("view is null");
- this.view = view;
-
- if ( re == null )
- throw new NullPointerException("rendering engine is
null");
- this.re = re;
- }
-
- /**
- * {@inheritDoc}
- */
- protected CyWriter getWriter(CyFileFilter filter, File file) throws
Exception {
- if (!fileExtensionIsOk(file))
- file = addOrReplaceExtension(outputFile);
- return writerManager.getWriter(view,re,filter,file);
- }
-
- @Tunable(description="Save Image As:",
params="fileCategory=image;input=false")
- public File getOutputFile() {
- return outputFile;
- }
-}
Deleted:
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/VizmapWriter.java
===================================================================
---
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/VizmapWriter.java
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/main/java/org/cytoscape/task/internal/io/VizmapWriter.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -1,31 +0,0 @@
-package org.cytoscape.task.internal.io;
-
-import java.io.File;
-import java.util.Set;
-
-import org.cytoscape.io.CyFileFilter;
-import org.cytoscape.io.write.CyWriter;
-import org.cytoscape.io.write.VizmapWriterManager;
-import org.cytoscape.view.vizmap.VisualMappingManager;
-import org.cytoscape.view.vizmap.VisualStyle;
-
-public class VizmapWriter extends TunableAbstractCyWriter<VizmapWriterManager>
{
-
- private final VisualMappingManager vmMgr;
-
- public VizmapWriter(VizmapWriterManager writerManager,
VisualMappingManager vmMgr) {
- super(writerManager);
- if (vmMgr == null) throw new
NullPointerException("VisualMappingManager is null");
- this.vmMgr = vmMgr;
- }
-
- @Override
- protected CyWriter getWriter(CyFileFilter filter, File file) throws
Exception {
- if (!fileExtensionIsOk(file))
- file = addOrReplaceExtension(outputFile);
-
- Set<VisualStyle> styles = vmMgr.getAllVisualStyles();
-
- return writerManager.getWriter(styles, filter, file);
- }
-}
Modified:
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-07-14 22:58:42 UTC (rev 26185)
@@ -304,28 +304,28 @@
</bean>
<bean id="exportNetworkImageTaskFactory"
-
class="org.cytoscape.task.internal.exportgraphics.ExportNetworkImageTaskFactory">
+
class="org.cytoscape.task.internal.export.graphics.ExportNetworkImageTaskFactory">
<constructor-arg ref="viewWriterManagerServiceRef" />
<constructor-arg ref="cyApplicationManagerServiceRef" />
</bean>
<bean id="exportNetworkViewTaskFactory"
-
class="org.cytoscape.task.internal.exportnetwork.ExportNetworkViewTaskFactory">
+
class="org.cytoscape.task.internal.export.network.ExportNetworkViewTaskFactory">
<constructor-arg ref="networkViewWriterManagerServiceRef" />
</bean>
<bean id="exportNodeTableTaskFactory"
-
class="org.cytoscape.task.internal.exporttable.ExportNodeTableTaskFactory">
+
class="org.cytoscape.task.internal.export.table.ExportNodeTableTaskFactory">
<constructor-arg ref="cyTableWriterManagerRef" />
</bean>
<bean id="exportEdgeTableTaskFactory"
-
class="org.cytoscape.task.internal.exporttable.ExportEdgeTableTaskFactory">
+
class="org.cytoscape.task.internal.export.table.ExportEdgeTableTaskFactory">
<constructor-arg ref="cyTableWriterManagerRef" />
</bean>
<bean id="exportCurrentTableTaskFactory"
-
class="org.cytoscape.task.internal.exporttable.ExportCurrentTableTaskFactory">
+
class="org.cytoscape.task.internal.export.table.ExportCurrentTableTaskFactory">
<constructor-arg ref="cyTableWriterManagerRef" />
</bean>
@@ -353,7 +353,7 @@
</bean>
<bean id="exportVizmapTaskFactory"
-
class="org.cytoscape.task.internal.exportvizmap.ExportVizmapTaskFactory">
+
class="org.cytoscape.task.internal.export.vizmap.ExportVizmapTaskFactory">
<constructor-arg ref="vizmapWriterManagerServiceRef" />
<constructor-arg ref="visualMappingManagerServiceRef" />
</bean>
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactoryTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactoryTest.java
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/exportgraphics/ExportNetworkImageTaskFactoryTest.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -12,7 +12,8 @@
import org.cytoscape.io.CyFileFilter;
import org.cytoscape.io.write.PresentationWriterManager;
import org.cytoscape.session.CyApplicationManager;
-import org.cytoscape.task.internal.io.ViewWriter;
+import org.cytoscape.task.internal.export.ViewWriter;
+import
org.cytoscape.task.internal.export.graphics.ExportNetworkImageTaskFactory;
import org.cytoscape.view.model.CyNetworkView;
import org.cytoscape.view.presentation.RenderingEngine;
import org.cytoscape.work.Task;
Modified:
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/io/ViewWriterTest.java
===================================================================
---
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/io/ViewWriterTest.java
2011-07-14 21:20:57 UTC (rev 26184)
+++
core3/core-task-impl/trunk/src/test/java/org/cytoscape/task/internal/io/ViewWriterTest.java
2011-07-14 22:58:42 UTC (rev 26185)
@@ -14,6 +14,7 @@
import org.cytoscape.io.write.AbstractCyWriterTest;
import org.cytoscape.io.write.CyWriter;
import org.cytoscape.io.write.PresentationWriterManager;
+import org.cytoscape.task.internal.export.ViewWriter;
import org.cytoscape.view.model.View;
import org.cytoscape.view.presentation.RenderingEngine;
import org.junit.Before;
--
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.
