svn commit: r1776205 - /jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java

[pmouawad]

Author: pmouawad
Date: Tue Dec 27 21:44:33 2016
New Revision: 1776205

URL: http://svn.apache.org/viewvc?rev=1776205&view=rev
Log:
Sonar : Fix code smell

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java?rev=1776205&r1=1776204&r2=1776205&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java 
Tue Dec 27 21:44:33 2016
@@ -297,20 +297,18 @@ public class SearchTreeDialog extends JD
                 Searchable searchable = (Searchable) 
jMeterTreeNode.getUserObject();
                 List<String> searchableTokens = 
searchable.getSearchableTokens();
                 boolean result = searcher.search(searchableTokens);
-                if (result) {
-                    if(jMeterTreeNode.getUserObject() instanceof Replaceable) {
-                        Replaceable replaceable = (Replaceable) 
jMeterTreeNode.getUserObject();
-                        int numberOfReplacements = replaceable.replace(regex, 
wordToReplace, caseSensitiveReplacement);
-                        if(logger.isInfoEnabled()) {
-                            logger.info("Replaced "+numberOfReplacements+" in 
element:"
-                                    
+((TestElement)jMeterTreeNode.getUserObject()).getName());
-                        }
-                        totalReplaced += numberOfReplacements;
-                        if(numberOfReplacements > 0) {
-                            List<JMeterTreeNode> matchingNodes = 
jMeterTreeNode.getPathToThreadGroup();
-                            nodes.addAll(matchingNodes);
-                        }
-                    }   
+                if (result && jMeterTreeNode.getUserObject() instanceof 
Replaceable) {
+                    Replaceable replaceable = (Replaceable) 
jMeterTreeNode.getUserObject();
+                    int numberOfReplacements = replaceable.replace(regex, 
wordToReplace, caseSensitiveReplacement);
+                    if(logger.isInfoEnabled()) {
+                        logger.info("Replaced "+numberOfReplacements+" in 
element:"
+                                
+((TestElement)jMeterTreeNode.getUserObject()).getName());
+                    }
+                    totalReplaced += numberOfReplacements;
+                    if(numberOfReplacements > 0) {
+                        List<JMeterTreeNode> matchingNodes = 
jMeterTreeNode.getPathToThreadGroup();
+                        nodes.addAll(matchingNodes);
+                    }
                 }
             } catch (Exception ex) {
                 logger.error("Error occured replacing data in 
node:"+jMeterTreeNode.getName(), ex);