Author: Christian Lopes
Date: 2011-06-13 10:01:57 -0700 (Mon, 13 Jun 2011)
New Revision: 25723
Modified:
core3/session-impl/trunk/pom.xml
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionManagerImpl.java
core3/session-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/session-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Updated CySessionManagerImpl for the new vizmap-api and session-api changes
(removed dependency on VisualStyleSerializer and the JAXB Vizmap object).
Modified: core3/session-impl/trunk/pom.xml
===================================================================
--- core3/session-impl/trunk/pom.xml 2011-06-13 16:25:04 UTC (rev 25722)
+++ core3/session-impl/trunk/pom.xml 2011-06-13 17:01:57 UTC (rev 25723)
@@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.cytoscape</groupId>
<artifactId>session-impl</artifactId>
- <version>3.0.0-alpha5-SNAPSHOT</version>
+ <version>3.0.0-alpha6-SNAPSHOT</version>
<name>${bundle.symbolicName}</name>
@@ -112,12 +112,12 @@
<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>
<groupId>org.cytoscape</groupId>
<artifactId>session-api</artifactId>
- <version>3.0.0-alpha5-SNAPSHOT</version>
+ <version>3.0.0-alpha6-SNAPSHOT</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
Modified:
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionManagerImpl.java
===================================================================
---
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionManagerImpl.java
2011-06-13 16:25:04 UTC (rev 25722)
+++
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionManagerImpl.java
2011-06-13 17:01:57 UTC (rev 25723)
@@ -37,7 +37,6 @@
import java.io.File;
import java.math.BigInteger;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
@@ -64,8 +63,6 @@
import org.cytoscape.view.presentation.property.MinimalVisualLexicon;
import org.cytoscape.view.vizmap.VisualMappingManager;
import org.cytoscape.view.vizmap.VisualStyle;
-import org.cytoscape.view.vizmap.VisualStyleSerializer;
-import org.cytoscape.view.vizmap.model.Vizmap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -83,7 +80,6 @@
private final CyNetworkManager netMgr;
private final CyTableManager tblMgr;
private final VisualMappingManager vmMgr;
- private final VisualStyleSerializer vsSer;
private final CyNetworkViewManager nvMgr;
private final CyProperty<Properties> properties;
@@ -95,7 +91,6 @@
CyNetworkManager netMgr,
CyTableManager
tblMgr,
VisualMappingManager vmMgr,
-
VisualStyleSerializer vsSer,
CyNetworkViewManager nvMgr,
CyProperty<Properties> props,
CyProperty<Bookmarks> bkmarks) {
@@ -103,7 +98,6 @@
this.netMgr = netMgr;
this.tblMgr = tblMgr;
this.vmMgr = vmMgr;
- this.vsSer = vsSer;
this.nvMgr = nvMgr;
this.properties = props;
this.bookmarks = bkmarks;
@@ -136,19 +130,14 @@
Cysession cysess =
cysessFactory.createCysession(savingEvent.getDesktop(),
savingEvent.getCytopanels(), null);
Map<String, List<File>> pluginMap =
savingEvent.getPluginFileListMap();
-
Set<CyTableMetadata> tables = tblMgr.getAllTables(true);
-
- Set<VisualStyle> allStyles = vmMgr.getAllVisualStyles();
- Vizmap vizmap = vsSer.createVizmap(allStyles);
-
- // Properties and Bookmarks
+ Set<VisualStyle> styles = vmMgr.getAllVisualStyles();
Properties props = properties != null ?
properties.getProperties() : null;
Bookmarks bkmarks = bookmarks != null ?
bookmarks.getProperties() : null;
// Build the session
CySession sess = new
CySession.Builder().cytoscapeProperties(props).bookmarks(bkmarks).cysession(cysess)
-
.pluginFileListMap(pluginMap).tables(tables).networkViews(netViews).vizmap(vizmap)
+
.pluginFileListMap(pluginMap).tables(tables).networkViews(netViews).visualStyles(styles)
.viewVisualStyleMap(stylesMap).build();
return sess;
@@ -162,19 +151,16 @@
if (emptySession) {
logger.debug("Creating empty session...");
- Set<VisualStyle> allStyles = vmMgr.getAllVisualStyles();
- Vizmap vizmap = vsSer.createVizmap(allStyles);
+ Set<VisualStyle> styles = vmMgr.getAllVisualStyles();
// Cysession info
Cysession cysess = new CysessionFactory(netMgr, nvMgr,
vmMgr).createDefaultCysession();
- // TODO: set default properties again
Properties props = properties != null ?
properties.getProperties() : new Properties();
- // TODO: set default bookmarks again
Bookmarks bkmarks = bookmarks != null ?
bookmarks.getProperties() : new Bookmarks();
sess = new
CySession.Builder().cytoscapeProperties(props).bookmarks(bkmarks).cysession(cysess)
- .vizmap(vizmap).build();
+ .visualStyles(styles).build();
} else {
logger.debug("Restoring the session...");
@@ -199,12 +185,11 @@
// Restore visual styles
logger.debug("Restoring visual styles...");
- Vizmap vizmap = sess.getVizmap();
- Collection<VisualStyle> allStyles =
vsSer.createVisualStyles(vizmap);
+ Set<VisualStyle> styles = sess.getVisualStyles();
Map<String, VisualStyle> stylesMap = new
HashMap<String, VisualStyle>();
- if (allStyles != null) {
- for (VisualStyle vs : allStyles) {
+ if (styles != null) {
+ for (VisualStyle vs : styles) {
vmMgr.addVisualStyle(vs);
stylesMap.put(vs.getTitle(), vs);
// TODO: what if a style with the same
name already exits?
Modified:
core3/session-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/session-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-06-13 16:25:04 UTC (rev 25722)
+++
core3/session-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2011-06-13 17:01:57 UTC (rev 25723)
@@ -35,8 +35,6 @@
<osgi:reference id="visualMappingManagerServiceRef"
interface="org.cytoscape.view.vizmap.VisualMappingManager" />
- <osgi:reference id="visualStyleSerializerServiceRef"
interface="org.cytoscape.view.vizmap.VisualStyleSerializer" />
-
<osgi:reference id="cyPropertyServiceRef"
interface="org.cytoscape.property.CyProperty"
filter="(cyPropertyName=coreSettings)" />
<osgi:reference id="bookmarkServiceRef"
interface="org.cytoscape.property.CyProperty"
filter="(cyPropertyName=bookmarks)" />
Modified:
core3/session-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/session-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-06-13 16:25:04 UTC (rev 25722)
+++
core3/session-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2011-06-13 17:01:57 UTC (rev 25723)
@@ -31,7 +31,6 @@
<constructor-arg ref="cyNetworkManagerServiceRef" />
<constructor-arg ref="cyTableManagerServiceRef" />
<constructor-arg ref="visualMappingManagerServiceRef" />
- <constructor-arg ref="visualStyleSerializerServiceRef" />
<constructor-arg ref="cyNetworkViewManagerServiceRef" />
<constructor-arg ref="cyPropertyServiceRef" />
<constructor-arg ref="bookmarkServiceRef" />
--
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.
