svn commit: r1776773 - in /jmeter/trunk/src/core/org/apache/jmeter/gui/action: Load.java SelectTemplatesDialog.java

[pm...@apache.org]

Author: pmouawad
Date: Sat Dec 31 15:09:17 2016
New Revision: 1776773

URL: http://svn.apache.org/viewvc?rev=1776773&view=rev
Log:
Sonar : fix squid:CommentedOutCodeLine "This block of commented-out lines of code should be removed. "

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

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java?rev=1776773&r1=1776772&r2=1776773&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java Sat Dec 31 15:09:17 2016
@@ -164,7 +164,6 @@ public class Load extends AbstractAction
      */
     // Does not appear to be used externally; called by #loadProjectFile()
     public static boolean insertLoadedTree(final int id, final HashTree tree, final boolean merging) throws IllegalUserActionException {
-        // convertTree(tree);
         if (tree == null) {
             throw new IllegalUserActionException("Empty TestPlan or error reading test plan - see log file");
         }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java?rev=1776773&r1=1776772&r2=1776773&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SelectTemplatesDialog.java Sat Dec 31 15:09:17 2016
@@ -73,15 +73,15 @@ public class SelectTemplatesDialog exten
 
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private final JLabeledChoice templateList = new JLabeledChoice(JMeterUtils.getResString("template_choose"), false); //$NON-NLS-1$;
+    private final JLabeledChoice templateList = new JLabeledChoice(JMeterUtils.getResString("template_choose"), false); //$NON-NLS-1$
 
     private final HtmlPane helpDoc = new HtmlPane();
 
-    private final JButton reloadTemplateButton = new JButton(JMeterUtils.getResString("template_reload")); //$NON-NLS-1$;
+    private final JButton reloadTemplateButton = new JButton(JMeterUtils.getResString("template_reload")); //$NON-NLS-1$
 
     private final JButton applyTemplateButton = new JButton();
 
-    private final JButton cancelButton = new JButton(JMeterUtils.getResString("cancel")); //$NON-NLS-1$;
+    private final JButton cancelButton = new JButton(JMeterUtils.getResString("cancel")); //$NON-NLS-1$
     
     private final JScrollPane scroller = new JScrollPane(helpDoc);