Author: kono
Date: 2011-05-12 12:48:20 -0700 (Thu, 12 May 2011)
New Revision: 25028

Modified:
   
csplugins/trunk/ucsd/kono/cy3-simple-plugin/src/main/java/org/cytoscape/myplugin/internal/MenuAction.java
   
csplugins/trunk/ucsd/kono/cy3-simple-plugin/src/main/resources/META-INF/spring/bundle-context-osgi.xml
   
csplugins/trunk/ucsd/kono/cy3-simple-plugin/src/main/resources/META-INF/spring/bundle-context.xml
Log:
Working version of sample plugin for tutorial.


Modified: 
csplugins/trunk/ucsd/kono/cy3-simple-plugin/src/main/java/org/cytoscape/myplugin/internal/MenuAction.java
===================================================================
--- 
csplugins/trunk/ucsd/kono/cy3-simple-plugin/src/main/java/org/cytoscape/myplugin/internal/MenuAction.java
   2011-05-12 19:03:59 UTC (rev 25027)
+++ 
csplugins/trunk/ucsd/kono/cy3-simple-plugin/src/main/java/org/cytoscape/myplugin/internal/MenuAction.java
   2011-05-12 19:48:20 UTC (rev 25028)
@@ -15,21 +15,21 @@
        private static final long serialVersionUID = -7457271379655577597L;
 
        public MenuAction(final CyApplicationManager applicationManager) {
-               super("Hide unconnected nodes", applicationManager);
+               super("Hide unconnected nodes (OSGi bundle version)", 
applicationManager);
                setPreferredMenu("Select");
        }
 
        public void actionPerformed(ActionEvent e) {
-               final CyNetwork currentNetwork = this.applicationManager
-                               .getCurrentNetwork();
-               if (currentNetwork == null)
+
+               final CyNetworkView currentNetworkView = 
applicationManager.getCurrentNetworkView();
+               if(currentNetworkView == null)
                        return;
-
-               final CyNetworkView currentNetworkView = applicationManager
-                               .getCurrentNetworkView();
-
-               for (CyNode node : currentNetwork.getNodeList()) {
-                       if (currentNetwork.getNeighborList(node, 
CyEdge.Type.ANY).isEmpty())
+               
+               // View is always associated with its model.
+               final CyNetwork network = currentNetworkView.getModel();
+               
+               for (CyNode node : network.getNodeList()) {
+                       if (network.getNeighborList(node, 
CyEdge.Type.ANY).isEmpty())
                                
currentNetworkView.getNodeView(node).setVisualProperty(
                                                
MinimalVisualLexicon.NODE_VISIBLE, false);
                }

Modified: 
csplugins/trunk/ucsd/kono/cy3-simple-plugin/src/main/resources/META-INF/spring/bundle-context-osgi.xml
===================================================================
--- 
csplugins/trunk/ucsd/kono/cy3-simple-plugin/src/main/resources/META-INF/spring/bundle-context-osgi.xml
      2011-05-12 19:03:59 UTC (rev 25027)
+++ 
csplugins/trunk/ucsd/kono/cy3-simple-plugin/src/main/resources/META-INF/spring/bundle-context-osgi.xml
      2011-05-12 19:48:20 UTC (rev 25028)
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans";
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
-       xmlns:osgi="http://www.springframework.org/schema/osgi";
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:osgi="http://www.springframework.org/schema/osgi";
        xsi:schemaLocation="
                http://www.springframework.org/schema/beans 
                http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
@@ -10,4 +9,18 @@
        default-lazy-init="false">
 
 
+       <!-- ================= Import =========================== -->
+
+       <!-- Import OSGi service from service registry -->
+       <osgi:reference id="cyApplicationManagerServiceRef"
+               interface="org.cytoscape.session.CyApplicationManager" />
+               
+       
+       <!-- ================= Export =========================== -->
+       
+       <!-- Export the instance as an OSGi service -->
+       <osgi:service id="menuActionService" ref="menuAction"
+               interface="org.cytoscape.application.swing.CyAction" />
+
+
 </beans>

Modified: 
csplugins/trunk/ucsd/kono/cy3-simple-plugin/src/main/resources/META-INF/spring/bundle-context.xml
===================================================================
--- 
csplugins/trunk/ucsd/kono/cy3-simple-plugin/src/main/resources/META-INF/spring/bundle-context.xml
   2011-05-12 19:03:59 UTC (rev 25027)
+++ 
csplugins/trunk/ucsd/kono/cy3-simple-plugin/src/main/resources/META-INF/spring/bundle-context.xml
   2011-05-12 19:48:20 UTC (rev 25028)
@@ -8,4 +8,10 @@
                http://www.springframework.org/schema/context
                
http://www.springframework.org/schema/context/spring-context-2.5.xsd";>
 
+       <!-- Create an instance (bean) of the class -->
+       <bean id="menuAction" 
class="org.cytoscape.myplugin.internal.MenuAction">
+               <!-- Inject an OSGi service as a constructor argument -->
+               <constructor-arg ref="cyApplicationManagerServiceRef" />
+       </bean>
+
 </beans>

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