svn commit: r1733666 - /jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

[pmouawad]

Author: pmouawad
Date: Fri Mar  4 22:29:02 2016
New Revision: 1733666

URL: http://svn.apache.org/viewvc?rev=1733666&view=rev
Log:
remove dead code
Contribution by Benoit Wiart 
#resolve #145
https://github.com/apache/jmeter/pull/145/

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1733666&r1=1733665&r2=1733666&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Fri Mar  4 22:29:02 2016
@@ -286,14 +286,14 @@ public class JMeter implements JMeterPlu
     public JMeter() {
     }
 
-    // Hack to allow automated tests to find when test has ended
-    //transient boolean testEnded = false;
-
+    
     private JMeter parent;
 
-    private Properties remoteProps; // Properties to be sent to remote servers
+    /** Properties to be sent to remote servers */
+    private Properties remoteProps; 
 
-    private boolean remoteStop; // should remote engines be stopped at end of 
non-GUI test?
+    /** should remote engines be stopped at end of non-GUI test? */
+    private boolean remoteStop; 
 
     /**
      * Starts up JMeter in GUI mode
@@ -580,7 +580,7 @@ public class JMeter implements JMeterPlu
         if (bshinit != null){
             log.info("Run Beanshell on file: "+bshinit);
             try {
-                BeanShellInterpreter bsi = new 
BeanShellInterpreter();//bshinit,log);
+                BeanShellInterpreter bsi = new BeanShellInterpreter();
                 bsi.source(bshinit);
             } catch (ClassNotFoundException e) {
                 log.warn("Could not start Beanshell: 
"+e.getLocalizedMessage());
@@ -946,7 +946,8 @@ public class JMeter implements JMeterPlu
     }
 
     /**
-     * Refactored from AbstractAction.java
+     * Remove disabled elements
+     * Replace the ReplaceableController with the target subtree
      *
      * @param tree The {@link HashTree} to convert
      */
@@ -1032,8 +1033,6 @@ public class JMeter implements JMeterPlu
     private static class ListenToTest implements TestStateListener, Runnable, 
Remoteable {
         private final AtomicInteger started = new AtomicInteger(0); // keep 
track of remote tests
 
-        //NOT YET USED private JMeter _parent;
-
         private final List<JMeterEngine> engines;
 
         private ReportGenerator reportGenerator;
@@ -1044,7 +1043,6 @@ public class JMeter implements JMeterPlu
          * @param reportGenerator {@link ReportGenerator}
          */
         public ListenToTest(JMeter unused, List<JMeterEngine> engines, 
ReportGenerator reportGenerator) {
-            //_parent = unused;
             this.engines=engines;
             this.reportGenerator = reportGenerator;
         }