Author: mes
Date: 2010-07-21 15:33:50 -0700 (Wed, 21 Jul 2010)
New Revision: 20988
Modified:
core3/plugin-impl/trunk/pom.xml
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
removed editormanager since it doesn't seem to a service
Modified: core3/plugin-impl/trunk/pom.xml
===================================================================
--- core3/plugin-impl/trunk/pom.xml 2010-07-21 22:33:42 UTC (rev 20987)
+++ core3/plugin-impl/trunk/pom.xml 2010-07-21 22:33:50 UTC (rev 20988)
@@ -139,11 +139,6 @@
</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>
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:33:42 UTC (rev 20987)
+++
core3/plugin-impl/trunk/src/main/java/org/cytoscape/plugin/internal/CyPluginAdapterImpl.java
2010-07-21 22:33:50 UTC (rev 20988)
@@ -14,7 +14,6 @@
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.view.vizmap.VisualMappingManager;
@@ -39,7 +38,6 @@
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;
@@ -58,7 +56,6 @@
CyNetworkViewFactory cyNetworkViewFactory,
CyRootNetworkFactory cyRootNetworkFactory,
CySessionManager cySessionManager,
- EditorManager editorManager,
PresentationFactory presentationFactory,
TaskManager taskManager,
VisualMappingManager visualMappingManager
@@ -71,7 +68,6 @@
this.cyNetworkViewFactory = cyNetworkViewFactory;
this.cyRootNetworkFactory = cyRootNetworkFactory;
this.cySessionManager = cySessionManager;
- this.editorManager = editorManager;
this.presentationFactory = presentationFactory;
this.taskManager = taskManager;
this.visualMappingManager = visualMappingManager;
@@ -98,8 +94,6 @@
public CySessionManager getCySessionManager() { return
cySessionManager; }
- public EditorManager getEditorManager() { return editorManager; }
-
public PresentationFactory getPresentationFactory() { return
presentationFactory; }
public TaskManager getTaskManager() { return taskManager; }
Modified:
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-07-21 22:33:42 UTC (rev 20987)
+++
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-07-21 22:33:50 UTC (rev 20988)
@@ -6,24 +6,57 @@
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi-1.0.xsd";
default-lazy-init="false">
- <!-- Individual Service -->
+ <!--
+ Keep services in alphabetical order to maintain sanity and
+ make service reference names the class name with a lower case
+ first letter and with "Ref" as a suffix.
+ -->
+
+ <osgi:reference id="cyDataTableFactoryRef"
+ interface="org.cytoscape.model.CyDataTableFactory">
+ </osgi:reference>
+
+ <osgi:reference id="cyEventHelperRef"
+ interface="org.cytoscape.event.CyEventHelper">
+ </osgi:reference>
+
+ <osgi:reference id="cyLayoutsRef"
+ interface="org.cytoscape.view.layout.CyLayouts">
+ </osgi:reference>
+
<osgi:reference id="cyNetworkFactoryRef"
interface="org.cytoscape.model.CyNetworkFactory">
</osgi:reference>
- <osgi:reference id="cyDataTableFactoryRef"
- interface="org.cytoscape.model.CyDataTableFactory">
+ <osgi:reference id="cyNetworkManagerRef"
+ interface="org.cytoscape.session.CyNetworkManager">
</osgi:reference>
-
+
<osgi:reference id="cyNetworkViewFactoryRef"
interface="org.cytoscape.view.model.CyNetworkViewFactory">
</osgi:reference>
-
+
+ <osgi:reference id="cyRootNetworkFactoryRef"
+ interface="org.cytoscape.model.subnetwork.CyRootNetworkFactory">
+ </osgi:reference>
+
+ <osgi:reference id="cySessionManagerRef"
+ interface="org.cytoscape.session.CySessionManager">
+ </osgi:reference>
+
+ <osgi:reference id="presentationFactoryRef"
+ interface="org.cytoscape.view.presentation.PresentationFactory">
+ </osgi:reference>
+
<osgi:reference id="taskManagerRef"
interface="org.cytoscape.work.TaskManager">
</osgi:reference>
+ <osgi:reference id="visualMappingManagerRef"
+ interface="org.cytoscape.view.vizmap.VisualMappingManager">
+ </osgi:reference>
+
<osgi:service id="pluginLoaderTaskFactoryService"
ref="pluginLoaderTaskFactory"
interface="org.cytoscape.work.TaskFactory">
<osgi:service-properties>
Modified:
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-07-21 22:33:42 UTC (rev 20987)
+++
core3/plugin-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-07-21 22:33:50 UTC (rev 20988)
@@ -16,11 +16,19 @@
<context:annotation-config/>
+ <!-- constructor args are in alphabetical order! -->
<bean id="cyPluginAdapter"
class="org.cytoscape.plugin.internal.CyPluginAdapterImpl">
+ <constructor-arg ref="cyDataTableFactoryRef" />
+ <constructor-arg ref="cyEventHelperRef" />
+ <constructor-arg ref="cyLayoutsRef" />
<constructor-arg ref="cyNetworkFactoryRef" />
- <constructor-arg ref="cyDataTableFactoryRef" />
+ <constructor-arg ref="cyNetworkManagerRef" />
<constructor-arg ref="cyNetworkViewFactoryRef" />
+ <constructor-arg ref="cyRootNetworkFactoryRef" />
+ <constructor-arg ref="cySessionManagerRef" />
+ <constructor-arg ref="presentationFactoryRef" />
<constructor-arg ref="taskManagerRef" />
+ <constructor-arg ref="visualMappingManagerRef" />
</bean>
<bean id="pluginLoaderTaskFactory"
class="org.cytoscape.plugin.internal.PluginLoaderTaskFactory">
--
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.
