Author: mes
Date: 2010-07-21 15:03:16 -0700 (Wed, 21 Jul 2010)
New Revision: 20985

Modified:
   core3/plugin-impl/trunk/pom.xml
   
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
Log:
added several new getters

Modified: core3/plugin-impl/trunk/pom.xml
===================================================================
--- core3/plugin-impl/trunk/pom.xml     2010-07-21 22:02:12 UTC (rev 20984)
+++ core3/plugin-impl/trunk/pom.xml     2010-07-21 22:03:16 UTC (rev 20985)
@@ -104,31 +104,59 @@
 
   <dependencies>
 
+    <!-- dependencies needed to implement this code -->        
     <dependency>
       <groupId>org.cytoscape</groupId>
-      <artifactId>model-api</artifactId>
+      <artifactId>plugin-api</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.cytoscape</groupId>
-      <artifactId>plugin-api</artifactId>
+      <artifactId>core-task-api</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
+
+    <!-- dependencies needed for CyPluginAdapter -->   
     <dependency>
       <groupId>org.cytoscape</groupId>
-      <artifactId>work-api</artifactId>
+      <artifactId>model-api</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.cytoscape</groupId>
-      <artifactId>viewmodel-api</artifactId>
+      <artifactId>work-api</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.cytoscape</groupId>
-      <artifactId>core-task-api</artifactId>
+      <artifactId>viewmodel-api</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+        <groupId>org.cytoscape</groupId>
+        <artifactId>vizmap-api</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+        <groupId>org.cytoscape</groupId>
+        <artifactId>vizmap-gui-api</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+        <groupId>org.cytoscape</groupId>
+        <artifactId>session-api</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+        <groupId>org.cytoscape</groupId>
+        <artifactId>presentation-api</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+        <groupId>org.cytoscape</groupId>
+        <artifactId>layout-api</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </dependency>
 
   </dependencies>
 

Modified: 
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
===================================================================
--- 
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
        2010-07-21 22:02:12 UTC (rev 20984)
+++ 
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
        2010-07-21 22:03:16 UTC (rev 20985)
@@ -1,44 +1,108 @@
 
 package org.cytoscape.plugin.internal;
 
+import org.cytoscape.plugin.CyPluginAdapter;
+
+//
+// Keep these alphabetical by class name
+//
+import org.cytoscape.model.CyDataTableFactory;
+import org.cytoscape.event.CyEventHelper;
+import org.cytoscape.view.layout.CyLayouts;
 import org.cytoscape.model.CyNetworkFactory;
-import org.cytoscape.model.CyDataTableFactory;
+import org.cytoscape.session.CyNetworkManager;
 import org.cytoscape.view.model.CyNetworkViewFactory;
+import org.cytoscape.model.subnetwork.CyRootNetworkFactory;
+import org.cytoscape.session.CySessionManager;
+import org.cytoscape.view.vizmap.gui.editor.EditorManager;
+import org.cytoscape.view.presentation.PresentationFactory;
 import org.cytoscape.work.TaskManager;
-import org.cytoscape.plugin.CyPluginAdapter;
+import org.cytoscape.view.vizmap.VisualMappingManager;
 
 
 /**
- * A Java-only api providing access to cytoscape functionality.
+ * An implementation of CyPluginAdapter
  */
 public class CyPluginAdapterImpl implements CyPluginAdapter {
 
-       CyNetworkFactory netFac;
-       CyDataTableFactory tabFac;
-       CyNetworkViewFactory viewFac;
-       TaskManager tm;
+       //
+       // Since there are a lot of fields, keep them
+       // in alphabetical order to maintain some order.
+       // Always make the field name same as the class
+       // name, but with a lower case first letter.
+       //
+       private final CyDataTableFactory cyDataTableFactory;
+       private final CyEventHelper cyEventHelper;
+       private final CyLayouts cyLayouts;
+       private final CyNetworkFactory cyNetworkFactory;
+       private final CyNetworkManager cyNetworkManager;
+       private final CyNetworkViewFactory cyNetworkViewFactory;
+       private final CyRootNetworkFactory cyRootNetworkFactory;
+       private final CySessionManager cySessionManager;
+       private final EditorManager editorManager;
+       private final PresentationFactory presentationFactory;
+       private final TaskManager taskManager;
+       private final VisualMappingManager visualMappingManager;
 
-       CyPluginAdapterImpl(CyNetworkFactory netFac, CyDataTableFactory tabFac,
-                  CyNetworkViewFactory viewFac, TaskManager tm ) {
-               this.netFac = netFac;
-               this.tabFac = tabFac;
-               this.viewFac = viewFac;
-               this.tm = tm;
+       //
+       // Since this is implementation code, there shouldn't be a
+       // a problem adding new arguments as needed.  Therefore, to
+       // maintain sanity, keep the arguments in alphabetical order.
+       //
+       CyPluginAdapterImpl( 
+                           CyDataTableFactory cyDataTableFactory,
+                           CyEventHelper cyEventHelper,
+                           CyLayouts cyLayouts,
+                       CyNetworkFactory cyNetworkFactory,
+                       CyNetworkManager cyNetworkManager,
+                       CyNetworkViewFactory cyNetworkViewFactory,
+                       CyRootNetworkFactory cyRootNetworkFactory,
+                       CySessionManager cySessionManager,
+                       EditorManager editorManager,
+                       PresentationFactory presentationFactory,
+                       TaskManager taskManager,
+                       VisualMappingManager visualMappingManager
+                                           ) {
+               this.cyDataTableFactory = cyDataTableFactory;
+               this.cyEventHelper = cyEventHelper;
+               this.cyLayouts = cyLayouts;
+               this.cyNetworkFactory = cyNetworkFactory;
+               this.cyNetworkManager = cyNetworkManager;
+               this.cyNetworkViewFactory = cyNetworkViewFactory;
+               this.cyRootNetworkFactory = cyRootNetworkFactory;
+               this.cySessionManager = cySessionManager;
+               this.editorManager = editorManager;
+               this.presentationFactory = presentationFactory;
+               this.taskManager = taskManager;
+               this.visualMappingManager = visualMappingManager;
        }
 
-       public CyNetworkFactory getCyNetworkFactory() {
-               return netFac;
-       }
 
-       public CyDataTableFactory getCyDataTableFactory(){
-               return tabFac;
-       } 
+       //
+       // May as well keep the methods alphabetical too!
+       // 
 
-       public CyNetworkViewFactory getCyNetworkViewFactory(){
-               return viewFac;
-       }
+       public CyDataTableFactory getCyDataTableFactory() { return 
cyDataTableFactory; } 
 
-       public TaskManager getTaskManager(){
-               return tm;
-       }
+       public CyEventHelper getCyEventHelper() { return cyEventHelper; } 
+
+       public CyLayouts getCyLayouts() { return cyLayouts; } 
+
+       public CyNetworkFactory getCyNetworkFactory() { return 
cyNetworkFactory; }
+
+       public CyNetworkManager getCyNetworkManager() { return 
cyNetworkManager; } 
+
+       public CyNetworkViewFactory getCyNetworkViewFactory() { return 
cyNetworkViewFactory; }
+
+       public CyRootNetworkFactory getCyRootNetworkFactory() { return 
cyRootNetworkFactory; } 
+
+       public CySessionManager getCySessionManager() { return 
cySessionManager; } 
+
+       public EditorManager getEditorManager() { return editorManager; } 
+
+       public PresentationFactory getPresentationFactory() { return 
presentationFactory; }
+
+       public TaskManager getTaskManager() { return taskManager; }
+
+       public VisualMappingManager getVisualMappingManager() { return 
visualMappingManager; } 
 }

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