Author: pmouawad
Date: Wed Oct 12 10:40:53 2011
New Revision: 1182305
URL: http://svn.apache.org/viewvc?rev=1182305&view=rev
Log:
Bug 51876 - Functionnality to search in Samplers TreeView
Fixed issue with empty search and no reset of previous search results
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java?rev=1182305&r1=1182304&r2=1182305&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
Wed Oct 12 10:40:53 2011
@@ -26,6 +26,7 @@ import java.util.Set;
import javax.swing.JOptionPane;
+import org.apache.commons.lang.StringUtils;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.Searchable;
import org.apache.jmeter.gui.tree.JMeterTreeModel;
@@ -66,12 +67,18 @@ public class SearchTreeCommand extends A
JMeterTreeNode jMeterTreeNode = (JMeterTreeNode) iter.next();
if (jMeterTreeNode.getUserObject() instanceof Searchable){
Searchable searchable = (Searchable)
jMeterTreeNode.getUserObject();
-
- boolean result = searchable.searchContent(wordToSearch);
- jMeterTreeNode.setMarkedBySearch(false);
- if(result) {
- List<JMeterTreeNode> matchingNodes =
jMeterTreeNode.getPathToThreadGroup();
- nodes.addAll(matchingNodes);
+ List<JMeterTreeNode> matchingNodes =
jMeterTreeNode.getPathToThreadGroup();
+ for (Iterator<JMeterTreeNode> iterator =
matchingNodes.iterator(); iterator
+ .hasNext();) {
+ JMeterTreeNode jMeterTreeNode2 = iterator
+ .next();
+ jMeterTreeNode2.setMarkedBySearch(false);
+ }
+ if(!StringUtils.isEmpty(wordToSearch)) {
+ boolean result =
searchable.searchContent(wordToSearch);
+ if(result) {
+ nodes.addAll(matchingNodes);
+ }
}
}
} catch (Exception ex) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
