Author: mes
Date: 2010-09-30 13:40:02 -0700 (Thu, 30 Sep 2010)
New Revision: 22108

Modified:
   
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionImpl.java
   
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionManagerImpl.java
Log:
updated session api based on existing session reader

Modified: 
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionImpl.java
===================================================================
--- 
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionImpl.java
    2010-09-30 20:39:53 UTC (rev 22107)
+++ 
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionImpl.java
    2010-09-30 20:40:02 UTC (rev 22108)
@@ -15,16 +15,6 @@
 public class CySessionImpl implements CySession {
 
        @Override
-    public String getSessionName() {
-       return "test";
-    }
-
-       @Override
-    public Set<CyNetwork> getNetworks() {
-       return new HashSet<CyNetwork>();
-    }
-
-       @Override
     public Set<CyNetworkView> getNetworkViews() {
        return new HashSet<CyNetworkView>();
     }
@@ -35,21 +25,22 @@
     }
 
        @Override
-    public Set<VisualStyle> getVisualStyles() {
-       return new HashSet<VisualStyle>();
+    public Map<CyNetworkView,String> getViewVisualStyleMap() {
+       return new HashMap<CyNetworkView,String>();
     }
 
        @Override
-    public Map<String,Properties> getProperties() {
-               Map<String,Properties> map = new HashMap<String,Properties>();
-               map.put("cytoscape", new Properties());
-               map.put("vizmap", new Properties());
-       return map;
+    public Properties getCytoscapeProperties() {
+               return new Properties();
     }
 
        @Override
-       public String getFileName() {
-               return "default";
-       }
-       
+    public Properties getVizmapProperties() {
+               return new Properties();
+    }
+
+       @Override
+    public Properties getDesktopProperties() {
+               return new Properties();
+    }
 }

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
     2010-09-30 20:39:53 UTC (rev 22107)
+++ 
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionManagerImpl.java
     2010-09-30 20:40:02 UTC (rev 22108)
@@ -42,25 +42,30 @@
 // TODO this is still pretty much just a placeholder class
 public class CySessionManagerImpl implements CySessionManager {
 
+       private String currentFileName;
+       private CySession currentSession;
 
        CySessionManagerImpl() {
 
        }
 
-
-    public State getCurrentSessionState() {
-               return null;
-       
-    }
     public CySession getCurrentSession() {
+               // TODO 
        return new CySessionImpl();
-       
     }
     
-    public void setCurrentSession(CySession sess) {
-               // do stuff
-       
+    public void setCurrentSession(CySession sess, String fileName) {
+               if ( sess == null )
+                       // TODO throw exception?
+                       return;
+
+               currentSession = sess;
+               currentFileName = fileName;
+               // do stuff
     }
 
+       public String getCurrentSessionFileName() {
+               return currentFileName;
+       }
 }
 

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