Author: mes
Date: 2010-11-15 12:00:29 -0800 (Mon, 15 Nov 2010)
New Revision: 22849
Modified:
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
Log:
fixed package naming problems
Modified:
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
---
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-11-15 19:50:28 UTC (rev 22848)
+++
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-11-15 20:00:29 UTC (rev 22849)
@@ -11,6 +11,9 @@
interface="org.cytoscape.property.CyProperty"
filter="(cyPropertyName=coreSettings)" />
+ <osgi:reference id="openBrowserServiceRef"
+ interface="org.cytoscape.util.swing.OpenBrowser" />
+
<osgi:reference id="cyApplicationManagerServiceRef"
interface="org.cytoscape.session.CyApplicationManager" />
@@ -89,42 +92,42 @@
<!-- <osgi:service id="printActionService" ref="printAction"
interface="cytoscape.view.CyAction"
/> -->
<osgi:service id="exitActionService" ref="exitAction"
- interface="org.cytoscape.view.CyAction" />
+ interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="undoActionService" ref="undoAction"
- interface="org.cytoscape.view.CyAction" />
+ interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="redoActionService" ref="redoAction"
- interface="org.cytoscape.view.CyAction" />
+ interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="deleteActionService" ref="deleteAction"
- interface="org.cytoscape.view.CyAction" />
+ interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="preferenceActionService" ref="preferenceAction"
- interface="org.cytoscape.view.CyAction" />
+ interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="bookmarkActionService" ref="bookmarkAction"
- interface="org.cytoscape.view.CyAction" />
+ interface="org.cytoscape.application.swing.CyAction" />
<!-- <osgi:service id="alphabeticalSelectionActionService"
ref="alphabeticalSelectionAction"
- interface="org.cytoscape.view.CyAction" /> <osgi:service
id="bendSelectedEdgesActionService"
- ref="bendSelectedEdgesAction"
interface="org.cytoscape.view.CyAction" /> <osgi:service
+ interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="bendSelectedEdgesActionService"
+ ref="bendSelectedEdgesAction"
interface="org.cytoscape.application.swing.CyAction" /> <osgi:service
id="straightenSelectedEdgesActionService"
ref="straightenSelectedEdgesAction"
- interface="org.cytoscape.view.CyAction" /> <osgi:service
id="showGraphicsDetailsActionService"
- ref="showGraphicsDetailsAction"
interface="org.cytoscape.view.CyAction" /> -->
+ interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="showGraphicsDetailsActionService"
+ ref="showGraphicsDetailsAction"
interface="org.cytoscape.application.swing.CyAction" /> -->
<osgi:service id="settingsActionService" ref="settingsAction"
- interface="org.cytoscape.view.CyAction" />
+ interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="cytoPanelWestActionService" ref="cytoPanelWestAction"
- interface="org.cytoscape.view.CyAction" />
+ interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="cytoPanelSouthActionService"
ref="cytoPanelSouthAction"
- interface="org.cytoscape.view.CyAction" />
+ interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="cytoPanelEastActionService" ref="cytoPanelEastAction"
- interface="org.cytoscape.view.CyAction" />
+ interface="org.cytoscape.application.swing.CyAction" />
<osgi:service id="cytoPanelSouthWestActionService"
ref="cytoPanelSouthWestAction"
- interface="org.cytoscape.view.CyAction" />
+ interface="org.cytoscape.application.swing.CyAction" />
- <osgi:set id="cyActionSet" interface="org.cytoscape.view.CyAction"
+ <osgi:set id="cyActionSet"
interface="org.cytoscape.application.swing.CyAction"
cardinality="0..N">
<osgi:listener bind-method="addAction"
unbind-method="removeAction"
ref="cytoscapeDesktop" />
</osgi:set>
- <osgi:set id="cytoPanelComponentSet"
interface="org.cytoscape.view.CytoPanelComponent"
+ <osgi:set id="cytoPanelComponentSet"
interface="org.cytoscape.application.swing.CytoPanelComponent"
cardinality="0..N">
<osgi:listener bind-method="addCytoPanelComponent"
unbind-method="removeCytoPanelComponent"
ref="cytoscapeDesktop" />
@@ -265,7 +268,7 @@
<!-- Finally, Export Cytoscape Desktop itself as a service. Other
desktop
components (like VizMapper GUI) can use it through DI -->
<osgi:service id="cytoscapeDesktopService" ref="cytoscapeDesktop"
- interface="org.cytoscape.view.CySwingApplication" />
+ interface="org.cytoscape.application.swing.CySwingApplication"
/>
<osgi:service id="networkPanelService" ref="networkPanel">
<osgi:interfaces>
Modified:
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
---
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-11-15 19:50:28 UTC (rev 22848)
+++
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context.xml
2010-11-15 20:00:29 UTC (rev 22849)
@@ -43,7 +43,7 @@
<!-- Dialog Factories -->
<bean name="aboutDialogFactory"
class="org.cytoscape.internal.dialogs.AboutDialogFactoryImpl">
- <constructor-arg ref="openBrowser" />
+ <constructor-arg ref="openBrowserServiceRef" />
</bean>
<bean name="preferencesDialogFactory"
class="org.cytoscape.internal.dialogs.PreferencesDialogFactoryImpl">
@@ -178,7 +178,7 @@
<constructor-arg ref="cytoscapeDesktop" />
</bean>
<bean id="helpContactHelpDeskTaskFactory"
class="org.cytoscape.internal.view.help.HelpContactHelpDeskTaskFactory">
- <constructor-arg ref="openBrowser" />
+ <constructor-arg ref="openBrowserServiceRef" />
</bean>
<bean id="helpAboutTaskFactory"
class="org.cytoscape.internal.view.help.HelpAboutTaskFactory">
<constructor-arg ref="creditScreenServiceRef" />
@@ -205,25 +205,25 @@
<!-- not a CyAction, but adds menu -->
<bean id="cytoPanelWestAction"
class="org.cytoscape.internal.actions.CytoPanelAction">
- <constructor-arg type="org.cytoscape.view.CytoPanelName"
value="WEST" />
+ <constructor-arg
type="org.cytoscape.application.swing.CytoPanelName" value="WEST" />
<constructor-arg value="true" />
<constructor-arg ref="cytoscapeDesktop" />
<constructor-arg ref="cyApplicationManagerServiceRef" />
</bean>
<bean id="cytoPanelSouthAction"
class="org.cytoscape.internal.actions.CytoPanelAction">
- <constructor-arg type="org.cytoscape.view.CytoPanelName"
value="SOUTH" />
+ <constructor-arg
type="org.cytoscape.application.swing.CytoPanelName" value="SOUTH" />
<constructor-arg value="true" />
<constructor-arg ref="cytoscapeDesktop" />
<constructor-arg ref="cyApplicationManagerServiceRef" />
</bean>
<bean id="cytoPanelEastAction"
class="org.cytoscape.internal.actions.CytoPanelAction">
- <constructor-arg type="org.cytoscape.view.CytoPanelName"
value="EAST" />
+ <constructor-arg
type="org.cytoscape.application.swing.CytoPanelName" value="EAST" />
<constructor-arg value="false" />
<constructor-arg ref="cytoscapeDesktop" />
<constructor-arg ref="cyApplicationManagerServiceRef" />
</bean>
<bean id="cytoPanelSouthWestAction"
class="org.cytoscape.internal.actions.CytoPanelAction">
- <constructor-arg type="org.cytoscape.view.CytoPanelName"
value="SOUTH_WEST" />
+ <constructor-arg
type="org.cytoscape.application.swing.CytoPanelName" value="SOUTH_WEST" />
<constructor-arg value="false" />
<constructor-arg ref="cytoscapeDesktop" />
<constructor-arg ref="cyApplicationManagerServiceRef" />
--
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.
