Author: mes
Date: 2010-10-28 11:42:09 -0700 (Thu, 28 Oct 2010)
New Revision: 22549
Modified:
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
Log:
fixed xml for CyNetworkManager diaspora
Modified:
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-28 18:07:41 UTC (rev 22548)
+++
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-10-28 18:42:09 UTC (rev 22549)
@@ -16,12 +16,6 @@
<osgi:reference id="cyNetworkManagerServiceRef"
interface="org.cytoscape.model.CyNetworkManager" />
- <osgi:reference id="cyNetworkViewManagerServiceRef"
- interface="org.cytoscape.view.model.CyNetworkManager" />
-
- <osgi:reference id="cyApplicationManagerServiceRef"
- interface="org.cytoscape.session.CyApplicationManager" />
-
<osgi:reference id="cyNetworkNamingServiceRef"
interface="org.cytoscape.session.CyNetworkNaming" />
@@ -289,22 +283,22 @@
</value>
<value>org.cytoscape.session.events.SetCurrentNetworkListener
</value>
- <value>org.cytoscape.session.events.NetworkAddedListener
+ <value>org.cytoscape.model.events.NetworkAddedListener
</value>
-
<value>org.cytoscape.session.events.NetworkViewAddedListener
+
<value>org.cytoscape.view.model.events.NetworkViewAddedListener
</value>
-
<value>org.cytoscape.session.events.NetworkAboutToBeDestroyedListener
+
<value>org.cytoscape.model.events.NetworkAboutToBeDestroyedListener
</value>
-
<value>org.cytoscape.session.events.NetworkViewAboutToBeDestroyedListener
+
<value>org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedListener
</value>
</osgi:interfaces>
</osgi:service>
<osgi:service id="networkViewManagerService" ref="networkViewManager">
<osgi:interfaces>
-
<value>org.cytoscape.session.events.NetworkViewAddedListener
+
<value>org.cytoscape.view.model.events.NetworkViewAddedListener
</value>
-
<value>org.cytoscape.session.events.NetworkViewAboutToBeDestroyedListener
+
<value>org.cytoscape.view.model.events.NetworkViewAboutToBeDestroyedListener
</value>
<value>org.cytoscape.session.events.SetCurrentNetworkViewListener
</value>
@@ -319,7 +313,7 @@
</value>
<value>org.cytoscape.session.events.SetCurrentNetworkListener
</value>
-
<value>org.cytoscape.session.events.NetworkViewDestroyedListener
+
<value>org.cytoscape.view.model.events.NetworkViewDestroyedListener
</value>
</osgi:interfaces>
</osgi:service>
@@ -331,7 +325,7 @@
interface="cytoscape.dialogs.AboutDialogFactory" />
<osgi:service id="selectRegisterListenerService"
ref="selectRegisterListener"
-
interface="org.cytoscape.session.events.NetworkViewAddedListener" />
+
interface="org.cytoscape.view.model.events.NetworkViewAddedListener" />
<osgi:service id="sessionShutdownHandlerService"
ref="sessionShutdownHandler"
interface="cytoscape.events.CytoscapeShutdownListener" />
Modified:
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-28 18:07:41 UTC (rev 22548)
+++
cytoscape3/trunk/application/src/main/resources/META-INF/spring/bundle-context.xml
2010-10-28 18:42:09 UTC (rev 22549)
@@ -167,7 +167,7 @@
<bean id="layoutMenuManager"
class="cytoscape.internal.layout.ui.LayoutMenuManager">
<constructor-arg ref="cytoscapeMenus" />
<constructor-arg ref="cyLayoutsServiceRef" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
<constructor-arg ref="guiTaskManagerServiceRef" />
</bean>
@@ -182,7 +182,8 @@
<constructor-arg ref="cyLayoutsServiceRef" />
<constructor-arg ref="cytoscapeDesktop" />
<constructor-arg ref="layoutMenuManager" />
- <constructor-arg ref="cyNetworkManagerServiceRef" />
+ <constructor-arg ref="cyApplicationManagerServiceRef" />
+ <constructor-arg ref="cyNetworkViewManagerServiceRef" />
<constructor-arg ref="guiTaskManagerServiceRef" />
</bean>
<bean id="helpContentsTaskFactory"
class="cytoscape.internal.view.help.HelpContentsTaskFactory">
--
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.
