Misc clean up

extras/jmeter.fb

@@ -52,7 +52,6 @@ lib/velocity-1.4-dev.jar
 lib/xalan.jar
 lib/xercesimpl.jar
 lib/xml-apis.jar
-lib/xpp3-1.1.3.4.d.jar
 lib/xstream-1.0.1.jar
 lib/opt/activation.jar
 lib/opt/bsf.jar

src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java

@@ -26,7 +26,6 @@
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 import java.rmi.server.ServerNotActiveException;
-import java.util.Iterator;
 import java.util.Properties;
 
 import org.apache.jmeter.services.FileServer;
@@ -216,8 +215,7 @@ public void rsetProperties(Properties p) throws RemoteException, IllegalStateExc
         if(remotelySetProperties != null) {
             Properties jmeterProperties = JMeterUtils.getJMeterProperties();
             log.info("Cleaning previously set properties "+remotelySetProperties);
-            for (Iterator<?> iterator = remotelySetProperties.keySet().iterator(); iterator.hasNext();) {
-                String key = (String) iterator.next();
+            for (Object key  : remotelySetProperties.keySet()) {
                 jmeterProperties.remove(key);
             }
         }

src/core/org/apache/jmeter/gui/SavePropertyDialog.java

@@ -75,7 +75,6 @@ public SavePropertyDialog(){
      * @throws java.awt.HeadlessException - when run headless
      */
     public SavePropertyDialog(Frame owner, String title, boolean modal, SampleSaveConfiguration s)
-    // throws HeadlessException
     {
         super(owner, title, modal);
         saveConfig = s;

src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java

@@ -91,7 +91,7 @@ public void processPath() {
     public List<Controller> getControllersToRoot() {
         List<Controller> result = new ArrayList<>(stack.size());
         LinkedList<TestElement> stackLocalCopy = new LinkedList<>(stack);
-        while(stackLocalCopy.size()>0) {
+        while(!stackLocalCopy.isEmpty()) {
             TestElement te = stackLocalCopy.getLast();
             if(te instanceof Controller) {
                 result.add((Controller)te);

src/core/org/apache/jmeter/threads/JMeterThread.java

@@ -20,7 +20,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.concurrent.TimeUnit;
@@ -329,29 +328,26 @@ public void run() {
      */
     private void triggerEndOfLoopOnParentControllers(Sampler sam, JMeterContext threadContext) {
         // Find parent controllers of current sampler
-        FindTestElementsUpToRootTraverser pathToRootTraverser=null;
+        FindTestElementsUpToRootTraverser pathToRootTraverser = null;
         TransactionSampler transactionSampler = null;
         if(sam instanceof TransactionSampler) {
             transactionSampler = (TransactionSampler) sam;
-            pathToRootTraverser = new FindTestElementsUpToRootTraverser((transactionSampler).getTransactionController());
+            pathToRootTraverser = new FindTestElementsUpToRootTraverser(transactionSampler.getTransactionController());
         } else {
             pathToRootTraverser = new FindTestElementsUpToRootTraverser(sam);
         }
         testTree.traverse(pathToRootTraverser);
         List<Controller> controllersToReinit = pathToRootTraverser.getControllersToRoot();
-
         // Trigger end of loop condition on all parent controllers of current sampler
-        for (Iterator<Controller> iterator = controllersToReinit
-                .iterator(); iterator.hasNext();) {
-            Controller parentController =  iterator.next();
+        for (Controller parentController : controllersToReinit) {
             if(parentController instanceof AbstractThreadGroup) {
                 AbstractThreadGroup tg = (AbstractThreadGroup) parentController;
                 tg.startNextLoop();
             } else {
                 parentController.triggerEndOfLoop();
             }
         }
-        if(transactionSampler!=null) {
+        if(transactionSampler != null) {
             processSampler(transactionSampler, null, threadContext);
         }
     }

src/core/org/apache/jmeter/threads/ListenerNotifier.java

@@ -41,26 +41,10 @@
 import org.apache.jorphan.logging.LoggingManager;
 import org.apache.log.Logger;
 
-///**
-// * The <code>ListenerNotifier</code> thread is responsible for performing
-// * asynchronous notifications that a sample has occurred. Each time a sample
-// * occurs, the <code>addLast</code> method should be called to add the sample
-// * and its list of listeners to the notification queue. This thread will then
-// * notify those listeners asynchronously at some future time.
-// * <p>
-// * In the current implementation, the notifications will be made in batches,
-// * with 2 seconds between the beginning of successive batches. If the notifier
-// * thread starts to get behind, the priority of the thread will be increased in
-// * an attempt to help it to keep up.
-// *
-// * @see org.apache.jmeter.samplers.SampleListener
-// *
-// */
 /**
  * Processes sample events.
  * The current implementation processes events in the calling thread
  * using {@link #notifyListeners(SampleEvent, List)}
- * The other code is not used currently, so is commented out.
  */
 public class ListenerNotifier {
     private static final Logger log = LoggingManager.getLoggerForClass();

src/core/org/apache/jmeter/util/SSLManager.java

@@ -253,20 +253,6 @@ protected SSLManager() {
     public static final synchronized SSLManager getInstance() {
         if (null == SSLManager.manager) {
             SSLManager.manager = new JsseSSLManager(null);
-//          if (SSLManager.isSSLSupported) {
-//              String classname = null;
-//              classname = "org.apache.jmeter.util.JsseSSLManager"; // $NON-NLS-1$
-//
-//              try {
-//                  Class clazz = Class.forName(classname);
-//                  Constructor con = clazz.getConstructor(new Class[] { Provider.class });
-//                  SSLManager.manager = (SSLManager) con.newInstance(new Object[] { SSLManager.sslProvider });
-//              } catch (Exception e) {
-//                  log.error("Could not create SSLManager instance", e); // $NON-NLS-1$
-//                  SSLManager.isSSLSupported = false;
-//                  return null;
-//              }
-//          }
         }
 
         return SSLManager.manager;

src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java

@@ -1066,11 +1066,11 @@ public void clear() {
 
     private void clearHeaderFields() {
         headerFieldName.setVisible(false);
-           headerFieldValue.setVisible(false);
+        headerFieldValue.setVisible(false);
 
         for (Iterator<JButton> iterator = removeButtons.keySet().iterator(); iterator.hasNext();) {
             JButton removeButton = iterator.next();
-               JTextField headerName = removeButtons.get(removeButton);
+            JTextField headerName = removeButtons.get(removeButton);
             JTextField headerValue = headerFields.get(headerName);
 
             headerFieldsPanel.remove(headerName);

test/src/org/apache/jmeter/JMeterVersionTest.java

@@ -53,7 +53,6 @@ public class JMeterVersionTest extends JMeterTestCase {
         JAR_TO_BUILD_PROP.put("mail", "javamail");
         JAR_TO_BUILD_PROP.put("oro", "jakarta-oro");
         JAR_TO_BUILD_PROP.put("xercesImpl", "xerces");
-        JAR_TO_BUILD_PROP.put("xpp3_min", "xpp3");
     }
 
     private static final File JMETER_HOME = new File(JMeterUtils.getJMeterHome());