Author: mes
Date: 2010-10-01 17:13:57 -0700 (Fri, 01 Oct 2010)
New Revision: 22134

Removed:
   
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionImpl.java
   
core3/session-impl/trunk/src/test/java/org/cytoscape/session/internal/CySessionTest.java
Modified:
   
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionManagerImpl.java
Log:
changes made to support change to CySession

Deleted: 
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-10-02 00:10:43 UTC (rev 22133)
+++ 
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionImpl.java
    2010-10-02 00:13:57 UTC (rev 22134)
@@ -1,53 +0,0 @@
-package org.cytoscape.session.internal;
-
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Properties;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.List;
-import java.io.File;
-
-import org.cytoscape.model.CyNetwork;
-import org.cytoscape.model.CyTable;
-import org.cytoscape.view.model.CyNetworkView;
-import org.cytoscape.view.vizmap.VisualStyle;
-import org.cytoscape.session.CySession;
-
-public class CySessionImpl implements CySession {
-
-       @Override
-    public Set<CyNetworkView> getNetworkViews() {
-       return new HashSet<CyNetworkView>();
-    }
-
-       @Override
-    public Set<CyTable> getTables() {
-       return new HashSet<CyTable>();
-    }
-
-       @Override
-    public Map<CyNetworkView,String> getViewVisualStyleMap() {
-       return new HashMap<CyNetworkView,String>();
-    }
-
-       @Override
-    public Properties getCytoscapeProperties() {
-               return new Properties();
-    }
-
-       @Override
-    public Properties getVizmapProperties() {
-               return new Properties();
-    }
-
-       @Override
-    public Properties getDesktopProperties() {
-               return new Properties();
-    }
-
-       @Override
-    public Map<String, List<File>> getPluginFileListMap() {
-               return new HashMap<String, List<File>>(); 
-    }
-}

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-10-02 00:10:43 UTC (rev 22133)
+++ 
core3/session-impl/trunk/src/main/java/org/cytoscape/session/internal/CySessionManagerImpl.java
     2010-10-02 00:13:57 UTC (rev 22134)
@@ -45,13 +45,18 @@
        private String currentFileName;
        private CySession currentSession;
 
-       CySessionManagerImpl() {
+//     private final CyNetworkManager netMgr;
 
-       }
+//     CySessionManagerImpl(CyNetworkManager netMgr) {
+//             this.netMgr = netMgr;           
+//
+//     }
 
     public CySession getCurrentSession() {
-               // TODO 
-       return new CySessionImpl();
+       //      SessionPluginFileRequestEvent ev = new 
SessionPluginFileRequestEvent();
+       //      eventHelper.fireSynchronousEvent(ev);
+               
+               return new CySession.Builder().build();
     }
     
     public void setCurrentSession(CySession sess, String fileName) {

Deleted: 
core3/session-impl/trunk/src/test/java/org/cytoscape/session/internal/CySessionTest.java
===================================================================
--- 
core3/session-impl/trunk/src/test/java/org/cytoscape/session/internal/CySessionTest.java
    2010-10-02 00:10:43 UTC (rev 22133)
+++ 
core3/session-impl/trunk/src/test/java/org/cytoscape/session/internal/CySessionTest.java
    2010-10-02 00:13:57 UTC (rev 22134)
@@ -1,12 +0,0 @@
-package org.cytoscape.session.internal;
-
-import org.cytoscape.session.AbstractCySessionTest;
-import org.junit.Before;
-
-public class CySessionTest extends AbstractCySessionTest {
-
-       @Before
-       public void setUp() {
-               session = new CySessionImpl();
-       }
-}

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