Author: ruschein
Date: 2010-07-28 10:22:21 -0700 (Wed, 28 Jul 2010)
New Revision: 21048

Modified:
   cytoscape/trunk/src/cytoscape/view/NetworkPanel.java
Log:
Fixed a bug relating to Mantis feature request #2312.

Modified: cytoscape/trunk/src/cytoscape/view/NetworkPanel.java
===================================================================
--- cytoscape/trunk/src/cytoscape/view/NetworkPanel.java        2010-07-28 
17:10:52 UTC (rev 21047)
+++ cytoscape/trunk/src/cytoscape/view/NetworkPanel.java        2010-07-28 
17:22:21 UTC (rev 21048)
@@ -322,7 +322,7 @@
        public void onSelectEvent(final SelectEvent event) {
                if (event.getTargetType() == SelectEvent.SINGLE_NODE || 
event.getTargetType() == SelectEvent.NODE_SET) {
                        final Set<Node> selectedNodes = 
(Set<Node>)Cytoscape.getCurrentNetwork().getSelectedNodes();
-                       final Set<String> selectedNestedNetworkIDs = new 
TreeSet<String>();
+                       final List<String> selectedNestedNetworkIDs = new 
ArrayList<String>();
                        for (final Node node : selectedNodes) {
                                final CyNetwork nestedNetwork = 
(CyNetwork)node.getNestedNetwork();
                                if (nestedNetwork != null)
@@ -332,7 +332,7 @@
                        if (!selectedNestedNetworkIDs.isEmpty()) {
                                doNotEnterValueChanged = true;
                                try {
-                                       final TreePath[] treePaths = new 
TreePath[selectedNestedNetworkIDs.size()];
+                                       final TreePath[] treePaths = new 
TreePath[selectedNestedNetworkIDs.size() + 1];
                                        int index = 0;
                                        final String currentNetworkID = 
Cytoscape.getCurrentNetwork().getIdentifier();
                                        TreePath currentPath = null;
@@ -346,6 +346,9 @@
                                                        treePaths[index++] = 
path;
                                        }
 
+                                       
Cytoscape.setSelectedNetworks(selectedNestedNetworkIDs);
+
+                                       treePaths[index] = currentPath;
                                        
tree.getSelectionModel().setSelectionPaths(treePaths);
                                        tree.scrollPathToVisible(currentPath);
                                } finally {

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