Author: apico
Date: 2011-06-04 17:26:31 -0700 (Sat, 04 Jun 2011)
New Revision: 25646

Modified:
   
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/commands/MetaNodeCommandHandler.java
   
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/ui/MetanodeSettingsDialog.java
Log:
"apply to selected" now applies to metanodes whose children are selected. This 
allows settings to be applied to metanodes in expanded states, e.g., going from 
expanded to nested.

Modified: 
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/commands/MetaNodeCommandHandler.java
===================================================================
--- 
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/commands/MetaNodeCommandHandler.java
       2011-06-04 02:43:45 UTC (rev 25645)
+++ 
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/commands/MetaNodeCommandHandler.java
       2011-06-05 00:26:31 UTC (rev 25646)
@@ -226,6 +226,8 @@
                if (args.containsKey(METANODE) && 
!Command.CREATE.equals(command)) {
                        String metanodeName = (String)args.get(METANODE);
                        metaGroup = CyGroupManager.findGroup(metanodeName);
+                       if (metaGroup == null)
+                               throw new RuntimeException("metanode: can't 
find metagroup "+metanodeName);
                        metaNode = MetaNodeManager.getMetaNode(metaGroup);
                        if (metaNode == null)
                                throw new RuntimeException("metanode: can't 
find metanode "+metanodeName);
@@ -608,6 +610,10 @@
                                MetaNode mn = MetaNodeManager.getMetaNode(node);
                                if (mn != null) {
                                        
settingsDialog.updateMetaNodeSettings(mn);
+                               } else {
+                                       for (CyGroup gn :node.getGroups()){
+                                               
settingsDialog.updateMetaNodeSettings(MetaNodeManager.getMetaNode(gn));
+                                       }
                                }
                        }
                } else if (Command.SETAGGOVERRIDE.equals(command)) {

Modified: 
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/ui/MetanodeSettingsDialog.java
===================================================================
--- 
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/ui/MetanodeSettingsDialog.java
     2011-06-04 02:43:45 UTC (rev 25645)
+++ 
csplugins/trunk/ucsf/scooter/metaNodePlugin2/src/metaNodePlugin2/ui/MetanodeSettingsDialog.java
     2011-06-05 00:26:31 UTC (rev 25646)
@@ -570,6 +570,10 @@
                                MetaNode mn = MetaNodeManager.getMetaNode(node);
                                if (mn != null) {
                                        updateMetaNodeSettings(mn);
+                               } else {
+                                       for (CyGroup gn :node.getGroups()){
+                                               
updateMetaNodeSettings(MetaNodeManager.getMetaNode(gn));
+                                       }
                                }
                        }
                        setVisible(false);

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