Author: Christian Lopes
Date: 2011-06-13 14:21:24 -0700 (Mon, 13 Jun 2011)
New Revision: 25736

Modified:
   
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/session/SessionWriterImpl.java
Log:
Removed the Vizmap (JAXB) dependency.
Missing changes. Sorry, I had problems with SVN and the Eclipse plugin.

Modified: 
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/session/SessionWriterImpl.java
===================================================================
--- 
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/session/SessionWriterImpl.java
    2011-06-13 19:50:02 UTC (rev 25735)
+++ 
core3/io-impl/trunk/src/main/java/org/cytoscape/io/internal/write/session/SessionWriterImpl.java
    2011-06-13 21:21:24 UTC (rev 25736)
@@ -73,7 +73,7 @@
 import org.cytoscape.property.session.SessionState;
 import org.cytoscape.session.CySession;
 import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.vizmap.model.Vizmap;
+import org.cytoscape.view.vizmap.VisualStyle;
 import org.cytoscape.work.AbstractTask;
 import org.cytoscape.work.TaskMonitor;
 
@@ -111,7 +111,6 @@
        
        // Document versions
        private static final String CYSESSION_VERSION = "3.0";
-       private static final String VIZMAP_VERSION = "3.0";
 
        // Extension for the xgmml file
        private static final String XGMML_EXT = ".xgmml";
@@ -137,7 +136,6 @@
        private Plugins plugins;
 
        private final String cysessionDocId;
-       private final String vizmapDocId;
        private final String sessionDir;
        private ZipOutputStream zos; 
        private TaskMonitor taskMonitor;
@@ -185,7 +183,6 @@
                String now = df.format(new Date());
 
                cysessionDocId = "CytoscapeSession-" + now;
-               vizmapDocId = "VizMap-" + now;
                sessionDir = cysessionDocId + "/"; 
                
                networkMap = new HashMap<String,Long>();
@@ -220,13 +217,11 @@
         * Writes the vizmap.props file to the session zip.
         */
        private void zipVizmap() throws Exception {
-               Vizmap vizmap = session.getVizmap();
-               vizmap.setId(vizmapDocId);
-               vizmap.setDocumentVersion(VIZMAP_VERSION);
-               
+               Set<VisualStyle> styles = session.getVisualStyles();
+
                zos.putNextEntry(new ZipEntry(sessionDir + VIZMAP_FILE) );
 
-               CyWriter vizmapWriter = vizmapWriterMgr.getWriter(vizmap, 
vizmapFilter, zos );
+               CyWriter vizmapWriter = vizmapWriterMgr.getWriter(styles, 
vizmapFilter, zos);
                vizmapWriter.run(taskMonitor);
 
                zos.closeEntry();

-- 
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.

Reply via email to