Author: pwang
Date: 2010-12-17 17:11:50 -0800 (Fri, 17 Dec 2010)
New Revision: 23237

Modified:
   
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/IndexAndSearchTask.java
Log:
Refactored

Modified: 
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/IndexAndSearchTask.java
===================================================================
--- 
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/IndexAndSearchTask.java
 2010-12-18 00:35:49 UTC (rev 23236)
+++ 
core3/search-impl/trunk/src/main/java/org/cytoscape/search/internal/IndexAndSearchTask.java
 2010-12-18 01:11:50 UTC (rev 23237)
@@ -70,7 +70,6 @@
                this.enhancedSearch = enhancedSearch;
                this.tableMgr = tableMgr;
                this.query = query;
-               
        }
 
     @Override
@@ -106,7 +105,16 @@
                        return;
                }
 
+               showResults(queryHandler, taskMonitor);
+       }
+
+    
+    private void showResults(EnhancedSearchQuery queryHandler, final 
TaskMonitor taskMonitor){
                // Display results
+       if (network == null || network.getNodeList().size() == 0){
+               return;
+       }
+       
                List<CyNode> nodeList = network.getNodeList();
                for (CyNode n : nodeList) {
                        n.getCyRow().set("selected",false);
@@ -120,7 +128,7 @@
                int edgeHitCount = queryHandler.getEdgeHitCount();
                if (nodeHitCount == 0 && edgeHitCount == 0) {
                        return;
-               }
+               }       
 
                taskMonitor.setStatusMessage("Selecting " + nodeHitCount + " 
and " + edgeHitCount + " edges");
 
@@ -154,12 +162,12 @@
 
                        taskMonitor.setProgress(numCompleted++ / edgeHitCount);
                }
-
+               
                // Refresh view to show selected nodes and edges
                view.updateView();
-       }
+    }
 
-
+    
     @Override
     public void cancel() {
                this.interrupted = true;

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