Author: mes
Date: 2010-11-09 13:20:30 -0800 (Tue, 09 Nov 2010)
New Revision: 22785
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeDesktop.java
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
Log:
re-enabled CyAction service registering
Modified:
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeDesktop.java
===================================================================
---
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeDesktop.java
2010-11-09 21:06:30 UTC (rev 22784)
+++
core3/swing-application-impl/trunk/src/main/java/org/cytoscape/internal/view/CytoscapeDesktop.java
2010-11-09 21:20:30 UTC (rev 22785)
@@ -52,6 +52,7 @@
import javax.swing.JSplitPane;
import javax.swing.JTabbedPane;
import javax.swing.WindowConstants;
+import java.util.Dictionary;
/**
@@ -263,10 +264,18 @@
return networkViewManager;
}
+ public void addAction(CyAction action, Dictionary props) {
+ cyMenus.addAction(action);
+ }
+
public void addAction(CyAction action) {
cyMenus.addAction(action);
}
+ public void removeAction(CyAction action, Dictionary props) {
+ cyMenus.removeAction(action);
+ }
+
public void removeAction(CyAction action) {
cyMenus.removeAction(action);
}
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-09 21:06:30 UTC (rev 22784)
+++
core3/swing-application-impl/trunk/src/main/resources/META-INF/spring/bundle-context-osgi.xml
2010-11-09 21:20:30 UTC (rev 22785)
@@ -117,13 +117,11 @@
<osgi:service id="cytoPanelEastActionService" ref="cytoPanelEastAction"
interface="org.cytoscape.view.CyAction" />
-<!--
<osgi:set id="cyActionSet" interface="org.cytoscape.view.CyAction"
cardinality="0..N">
<osgi:listener bind-method="addAction"
unbind-method="removeAction"
- ref="cytoscapeMenus" />
+ ref="cytoscapeDesktop" />
</osgi:set>
- -->
<!-- task factories for CyMenuPopulator -->
<osgi:set id="taskFactorySet" interface="org.cytoscape.work.TaskFactory"
--
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.
