Author: Christian Lopes
Date: 2011-06-13 10:14:04 -0700 (Mon, 13 Jun 2011)
New Revision: 25725
Modified:
core3/io-api/trunk/pom.xml
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/VizmapReader.java
core3/io-api/trunk/src/main/java/org/cytoscape/io/write/VizmapWriterFactory.java
core3/io-api/trunk/src/main/java/org/cytoscape/io/write/VizmapWriterManager.java
Log:
Updated the vizmap IO services so that instead of exposing the JAXB Vizmap
object, they simply use a set of VisualStyles.
Modified: core3/io-api/trunk/pom.xml
===================================================================
--- core3/io-api/trunk/pom.xml 2011-06-13 17:11:20 UTC (rev 25724)
+++ core3/io-api/trunk/pom.xml 2011-06-13 17:14:04 UTC (rev 25725)
@@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cytoscape</groupId>
<artifactId>io-api</artifactId>
- <version>3.0.0-alpha4-SNAPSHOT</version>
+ <version>3.0.0-alpha5-SNAPSHOT</version>
<name>${bundle.symbolicName} [${bundle.namespace}]</name>
@@ -125,7 +125,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>session-api</artifactId>
- <version>3.0.0-alpha5-SNAPSHOT</version>
+ <version>3.0.0-alpha6-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
core3/io-api/trunk/src/main/java/org/cytoscape/io/read/VizmapReader.java
===================================================================
--- core3/io-api/trunk/src/main/java/org/cytoscape/io/read/VizmapReader.java
2011-06-13 17:11:20 UTC (rev 25724)
+++ core3/io-api/trunk/src/main/java/org/cytoscape/io/read/VizmapReader.java
2011-06-13 17:14:04 UTC (rev 25725)
@@ -1,6 +1,8 @@
package org.cytoscape.io.read;
-import org.cytoscape.view.vizmap.model.Vizmap;
+import java.util.Set;
+
+import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.work.Task;
/**
@@ -15,7 +17,7 @@
public interface VizmapReader extends Task {
/**
- * @return A {@link org.cytoscape.view.vizmap.model.Vizmap} object
+ * @return A list of {@link org.cytoscape.view.vizmap.VisualStyle}
objects
*/
- Vizmap getVizmap();
+ Set<VisualStyle> getVisualStyles();
}
Modified:
core3/io-api/trunk/src/main/java/org/cytoscape/io/write/VizmapWriterFactory.java
===================================================================
---
core3/io-api/trunk/src/main/java/org/cytoscape/io/write/VizmapWriterFactory.java
2011-06-13 17:11:20 UTC (rev 25724)
+++
core3/io-api/trunk/src/main/java/org/cytoscape/io/write/VizmapWriterFactory.java
2011-06-13 17:14:04 UTC (rev 25725)
@@ -34,9 +34,11 @@
*/
package org.cytoscape.io.write;
-import org.cytoscape.view.vizmap.model.Vizmap;
+import java.util.Set;
+import org.cytoscape.view.vizmap.VisualStyle;
+
/**
* A specialization of {@link CyWriterFactory} that allows a {@link
org.cytoscape.view.vizmap.model.Vizmap} to
* be specified and written.
@@ -44,9 +46,9 @@
public interface VizmapWriterFactory extends CyWriterFactory {
/**
- * Specifies the {@link org.cytoscape.view.vizmap.model.Vizmap} to be
written by the {@link CyWriter} Task
+ * Specifies the visual styles to be written by the {@link CyWriter}
Task
* generated by this factory. This method must be called prior to
calling the getWriter() method.
- * @param vizmap The {@link org.cytoscape.view.vizmap.model.Vizmap} to
be written.
+ * @param styles A list of {@link
org.cytoscape.view.vizmap.VisualStyle} objects to be written.
*/
- void setVizmap(Vizmap vizmap);
+ void setVisualStyles(Set<VisualStyle> styles);
}
Modified:
core3/io-api/trunk/src/main/java/org/cytoscape/io/write/VizmapWriterManager.java
===================================================================
---
core3/io-api/trunk/src/main/java/org/cytoscape/io/write/VizmapWriterManager.java
2011-06-13 17:11:20 UTC (rev 25724)
+++
core3/io-api/trunk/src/main/java/org/cytoscape/io/write/VizmapWriterManager.java
2011-06-13 17:14:04 UTC (rev 25725)
@@ -2,9 +2,10 @@
import java.io.File;
import java.io.OutputStream;
+import java.util.Set;
import org.cytoscape.io.CyFileFilter;
-import org.cytoscape.view.vizmap.model.Vizmap;
+import org.cytoscape.view.vizmap.VisualStyle;
/**
* A {@link CyWriterManager} specific to writing {@link
org.cytoscape.view.vizmap.model.Vizmap} objects.
@@ -12,20 +13,20 @@
public interface VizmapWriterManager extends CyWriterManager {
/**
- * @param vizmap The {@link org.cytoscape.view.vizmap.model.Vizmap} to
be written.
+ * @param styles The list of {@link
org.cytoscape.view.vizmap.VisualStyle} objects to be written.
* @param filter The {@link org.cytoscape.io.CyFileFilter} that defines
the type of file to be written.
* @param file The file to be written.
* @return The {@link CyWriter} Task that will attempt to write the
specified vizmap to the
* specified file of the specified file type.
*/
- CyWriter getWriter(Vizmap vizmap, CyFileFilter filter, File file)
throws Exception;
+ CyWriter getWriter(Set<VisualStyle> styles, CyFileFilter filter, File
file) throws Exception;
/**
- * @param vizmap The {@link org.cytoscape.view.vizmap.model.Vizmap} to
be written.
+ * @param styles The list of {@link
org.cytoscape.view.vizmap.VisualStyle} objects to be written.
* @param filter The {@link org.cytoscape.io.CyFileFilter} that defines
the type of file to be written.
* @param os The output stream to be written.
* @return The {@link CyWriter} Task that will attempt to write the
specified vizmap to the
* specified output stream of the specified file type.
*/
- CyWriter getWriter(Vizmap vizmap, CyFileFilter filter, OutputStream os)
throws Exception;
+ CyWriter getWriter(Set<VisualStyle> styles, CyFileFilter filter,
OutputStream os) throws Exception;
}
--
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.
