Author: jm
Date: 2011-06-30 08:53:23 -0700 (Thu, 30 Jun 2011)
New Revision: 25982

Modified:
   
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/util/FilterUtil.java
Log:
Optimized node selection code so it doesn't build up a list of nodes/edges 
before changing the selection

Modified: 
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/util/FilterUtil.java
===================================================================
--- 
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/util/FilterUtil.java
    2011-06-30 15:49:34 UTC (rev 25981)
+++ 
core3/filter-impl/trunk/src/main/java/org/cytoscape/filter/internal/filters/util/FilterUtil.java
    2011-06-30 15:53:23 UTC (rev 25982)
@@ -52,24 +52,18 @@
 
                if (pFilter.getAdvancedSetting().isNodeChecked()&& 
(pFilter.getNodeBits() != null)) {
                        // Select nodes
-                       final List<CyNode> passedNodes = new 
ArrayList<CyNode>();
-
                        CyNode node = null;
 
                        for (int i=0; i< pFilter.getNodeBits().length(); i++) {
                                int next_set_bit = 
pFilter.getNodeBits().nextSetBit(i);
                                
                                node = nodes_list.get(next_set_bit);
-                                                               
-                               passedNodes.add(node);
+                               node.getCyRow().set(CyNetwork.SELECTED, true);
                                i = next_set_bit;
                        }
-                       SelectUtil.setSelectedNodeState(passedNodes, true);
                }
                if (pFilter.getAdvancedSetting().isEdgeChecked()&& 
(pFilter.getEdgeBits() != null)) {
                        // Select edges
-                       final List<CyEdge> passedEdges = new 
ArrayList<CyEdge>();
-
                        CyEdge edge = null;
                        for (int i=0; i< edges_list.size(); i++) {
                                int next_set_bit = 
pFilter.getEdgeBits().nextSetBit(i);
@@ -77,10 +71,9 @@
                                        break;
                                }
                                edge = edges_list.get(next_set_bit);
-                               passedEdges.add(edge);
+                               edge.getCyRow().set(CyNetwork.SELECTED, true);
                                i = next_set_bit;
                        }
-                       SelectUtil.setSelectedEdgeState(passedEdges, true);
                }
                
 //             // TODO: What do we do about CyInit*?

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