Author: Christian Lopes
Date: 2011-06-13 09:25:04 -0700 (Mon, 13 Jun 2011)
New Revision: 25722
Modified:
core3/session-api/trunk/pom.xml
core3/session-api/trunk/src/main/java/org/cytoscape/session/CySession.java
core3/session-api/trunk/src/test/java/org/cytoscape/session/CySessionTest.java
Log:
Removed the Vizmap (JAXB) dependency. Now CySession has a set of "real"
VisualStyle objects, instead.
Modified: core3/session-api/trunk/pom.xml
===================================================================
--- core3/session-api/trunk/pom.xml 2011-06-13 16:07:49 UTC (rev 25721)
+++ core3/session-api/trunk/pom.xml 2011-06-13 16:25:04 UTC (rev 25722)
@@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cytoscape</groupId>
<artifactId>session-api</artifactId>
- <version>3.0.0-alpha5-SNAPSHOT</version>
+ <version>3.0.0-alpha6-SNAPSHOT</version>
<name>${bundle.symbolicName}</name>
@@ -119,7 +119,7 @@
<dependency>
<groupId>org.cytoscape</groupId>
<artifactId>vizmap-api</artifactId>
- <version>3.0.0-alpha5-SNAPSHOT</version>
+ <version>3.0.0-alpha6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.cytoscape</groupId>
Modified:
core3/session-api/trunk/src/main/java/org/cytoscape/session/CySession.java
===================================================================
--- core3/session-api/trunk/src/main/java/org/cytoscape/session/CySession.java
2011-06-13 16:07:49 UTC (rev 25721)
+++ core3/session-api/trunk/src/main/java/org/cytoscape/session/CySession.java
2011-06-13 16:25:04 UTC (rev 25722)
@@ -30,7 +30,7 @@
import org.cytoscape.model.CyTableMetadata;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.vizmap.model.Vizmap;
+import org.cytoscape.view.vizmap.VisualStyle;
import org.cytoscape.property.bookmark.Bookmarks;
import org.cytoscape.property.session.Cysession;
import java.util.Properties;
@@ -69,7 +69,7 @@
private final Set<CyTableMetadata> tables;
private final Map<CyNetworkView,String> vsMap;
private final Properties cyProps;
- private final Vizmap vizmap;
+ private final Set<VisualStyle> visualStyles;
private final Map<String, List<File>> pluginFiles;
private final Bookmarks bookmarks;
private final Cysession cysession;
@@ -99,10 +99,10 @@
else
cyProps = b.cyProps;
- if ( b.vizmap == null )
- vizmap = new Vizmap();
+ if ( b.visualStyles == null )
+ visualStyles = new HashSet<VisualStyle>();
else
- vizmap = b.vizmap;
+ visualStyles = b.visualStyles;
if ( b.pluginFiles == null )
pluginFiles = new HashMap<String, List<File>>();
@@ -130,7 +130,7 @@
private Set<CyTableMetadata> tables;
private Map<CyNetworkView,String> vsMap;
private Properties cyProps;
- private Vizmap vizmap;
+ private Set<VisualStyle> visualStyles;
private Map<String, List<File>> pluginFiles;
private Bookmarks bookmarks;
private Cysession cysession;
@@ -198,13 +198,12 @@
/**
* Returns an instance of Builder that has at least been
configured
* with the specified properties.
- * @param p A Properties object that contains the current
VizMap
- * properties for all VisualStyles in this instance of
Cytoscape.
+ * @param styles All VisualStyles in this instance of Cytoscape.
* @return An instance of Builder that has at least been
configured
* with the specified properties.
*/
- public Builder vizmap(final Vizmap p) {
- vizmap = p;
+ public Builder visualStyles(final Set<VisualStyle> styles) {
+ visualStyles = styles;
return this;
}
@@ -277,12 +276,10 @@
public Properties getCytoscapeProperties() { return cyProps; }
/**
- * Returns a Propeties object containing all VisualStyles defined
- * for this session.
- * @return A Propeties object containing all VisualStyles defined
- * for this session.
+ * Returns a set containing all VisualStyles defined for this session.
+ * @return A Set of {@link org.cytoscape.view.vizmap.VisualStyle}
objects
*/
- public Vizmap getVizmap() { return vizmap; }
+ public Set<VisualStyle> getVisualStyles() { return visualStyles; }
/**
* Returns a {@link Bookmarks} object containing all bookmarks for this
session.
Modified:
core3/session-api/trunk/src/test/java/org/cytoscape/session/CySessionTest.java
===================================================================
---
core3/session-api/trunk/src/test/java/org/cytoscape/session/CySessionTest.java
2011-06-13 16:07:49 UTC (rev 25721)
+++
core3/session-api/trunk/src/test/java/org/cytoscape/session/CySessionTest.java
2011-06-13 16:25:04 UTC (rev 25722)
@@ -19,7 +19,7 @@
import org.cytoscape.property.bookmark.Bookmarks;
import org.cytoscape.property.session.Cysession;
import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.vizmap.model.Vizmap;
+import org.cytoscape.view.vizmap.VisualStyle;
import org.junit.Test;
public class CySessionTest {
@@ -156,23 +156,25 @@
public void testDefaultGetVizmap() {
session = new CySession.Builder().build();
assertNotNull(session);
- assertNotNull(session.getVizmap());
+ assertNotNull(session.getVisualStyles());
}
@Test
- public void testSetNullVizmap() {
- session = new CySession.Builder().vizmap(null).build();
+ public void testSetNullVisualStyles() {
+ session = new CySession.Builder().visualStyles(null).build();
assertNotNull(session);
- assertNotNull(session.getVizmap());
+ assertNotNull(session.getVisualStyles());
}
@Test
- public void testSetVizmap() {
- Vizmap v = mock(Vizmap.class);
- session = new CySession.Builder().vizmap(v).build();
+ public void testSetVisualStyles() {
+ VisualStyle v1 = mock(VisualStyle.class);
+ Set<VisualStyle> set = new HashSet<VisualStyle>();
+ set.add(v1);
+ session = new CySession.Builder().visualStyles(set).build();
assertNotNull(session);
- assertNotNull(session.getVizmap());
- assertEquals(v, session.getVizmap());
+ assertNotNull(session.getVisualStyles());
+ assertEquals(set, session.getVisualStyles());
}
@Test
--
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.
