jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fschumac...@apache.org
Subject svn commit: r1697162 [2/4] - in /jmeter/trunk/src: components/org/apache/jmeter/assertions/ components/org/apache/jmeter/control/ components/org/apache/jmeter/extractor/ components/org/apache/jmeter/modifiers/ components/org/apache/jmeter/modifiers/gui...
Date Sun, 23 Aug 2015 10:39:39 GMT
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Sun Aug 23 10:39:36 2015
@@ -82,19 +82,19 @@ public final class GuiPackage implements
      * Map from TestElement to JMeterGUIComponent, mapping the nodes in the tree
      * to their corresponding GUI components.
      */
-    private Map<TestElement, JMeterGUIComponent> nodesToGui = new HashMap<TestElement, JMeterGUIComponent>();
+    private Map<TestElement, JMeterGUIComponent> nodesToGui = new HashMap<>();
 
     /**
      * Map from Class to JMeterGUIComponent, mapping the Class of a GUI
      * component to an instance of that component.
      */
-    private Map<Class<?>, JMeterGUIComponent> guis = new HashMap<Class<?>, JMeterGUIComponent>();
+    private Map<Class<?>, JMeterGUIComponent> guis = new HashMap<>();
 
     /**
      * Map from Class to TestBeanGUI, mapping the Class of a TestBean to an
      * instance of TestBeanGUI to be used to edit such components.
      */
-    private Map<Class<?>, JMeterGUIComponent> testBeanGUIs = new HashMap<Class<?>, JMeterGUIComponent>();
+    private Map<Class<?>, JMeterGUIComponent> testBeanGUIs = new HashMap<>();
 
     /** The currently selected node in the tree. */
     private JMeterTreeNode currentNode = null;
@@ -637,9 +637,9 @@ public final class GuiPackage implements
 
         // Forget about all GUIs we've created so far: we'll need to re-created
         // them all!
-        guis = new HashMap<Class<?>, JMeterGUIComponent>();
-        nodesToGui = new HashMap<TestElement, JMeterGUIComponent>();
-        testBeanGUIs = new HashMap<Class<?>, JMeterGUIComponent>();
+        guis = new HashMap<>();
+        nodesToGui = new HashMap<>();
+        testBeanGUIs = new HashMap<>();
 
         // BeanInfo objects also contain locale-sensitive data -- flush them
         // away:
@@ -766,7 +766,7 @@ public final class GuiPackage implements
      * @return copy of list of {@link Stoppable}s
      */
     public List<Stoppable> getStoppables() {
-        ArrayList<Stoppable> list = new ArrayList<Stoppable>();
+        ArrayList<Stoppable> list = new ArrayList<>();
         list.addAll(stoppables);
         return list;
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Sun Aug 23 10:39:36 2015
@@ -164,7 +164,7 @@ public class MainFrame extends JFrame im
     private JButton runningIndicator;
 
     /** The set of currently running hosts. */
-    private final Set<String> hosts = new HashSet<String>();
+    private final Set<String> hosts = new HashSet<>();
 
     /** A message dialog shown while JMeter threads are stopping. */
     private JDialog stoppingMessage;

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Sun Aug 23 10:39:36 2015
@@ -55,7 +55,7 @@ public class SavePropertyDialog extends
 
     private static final long serialVersionUID = 232L;
 
-    private static final Map<String, Functor> functors = new HashMap<String, Functor>();
+    private static final Map<String, Functor> functors = new HashMap<>();
 
     private static final String NAME_SAVE_PFX   = "save";  // $NON-NLS-1$ i.e. boolean saveXXX()
     private static final String NAME_SET_PREFIX = "set";   // $NON-NLS-1$ i.e. void setXXX(boolean)

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java Sun Aug 23 10:39:36 2015
@@ -83,7 +83,7 @@ public class UndoHistory implements Tree
     /**
      * temporary storage for GUI tree expansion state
      */
-    private ArrayList<Integer> savedExpanded = new ArrayList<Integer>();
+    private ArrayList<Integer> savedExpanded = new ArrayList<>();
 
     /**
      * temporary storage for GUI tree selected row
@@ -95,7 +95,7 @@ public class UndoHistory implements Tree
 
     private static final int HISTORY_SIZE = JMeterUtils.getPropDefault("undo.history.size", 0);
 
-    private List<UndoHistoryItem> history = new LimitedArrayList<UndoHistoryItem>(HISTORY_SIZE);
+    private List<UndoHistoryItem> history = new LimitedArrayList<>(HISTORY_SIZE);
 
     /**
      * flag to prevent recursive actions
@@ -105,7 +105,7 @@ public class UndoHistory implements Tree
     /**
      * History listeners
      */
-    private List<HistoryListener> listeners = new ArrayList<UndoHistory.HistoryListener>();
+    private List<HistoryListener> listeners = new ArrayList<>();
 
     public UndoHistory() {
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AboutCommand.java Sun Aug 23 10:39:36 2015
@@ -53,7 +53,7 @@ public class AboutCommand implements Com
     private static JDialog about;
 
     static {
-        HashSet<String> commands = new HashSet<String>();
+        HashSet<String> commands = new HashSet<>();
         commands.add(ActionNames.ABOUT);
         commandSet = Collections.unmodifiableSet(commands);
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java Sun Aug 23 10:39:36 2015
@@ -44,13 +44,13 @@ public final class ActionRouter implemen
 
     private static volatile ActionRouter router;
 
-    private Map<String, Set<Command>> commands = new HashMap<String, Set<Command>>();
+    private Map<String, Set<Command>> commands = new HashMap<>();
 
     private final Map<String, HashSet<ActionListener>> preActionListeners =
-        new HashMap<String, HashSet<ActionListener>>();
+            new HashMap<>();
 
     private final Map<String, HashSet<ActionListener>> postActionListeners =
-        new HashMap<String, HashSet<ActionListener>>();
+            new HashMap<>();
 
     private ActionRouter() {
     }
@@ -124,7 +124,7 @@ public final class ActionRouter implemen
      *         <code>actionName</code>
      */
     public Set<Command> getAction(String actionName) {
-        Set<Command> set = new HashSet<Command>();
+        Set<Command> set = new HashSet<>();
         for (Command c : commands.get(actionName)) {
             try {
                 set.add(c);
@@ -190,7 +190,7 @@ public final class ActionRouter implemen
         if (action != null) {
             HashSet<ActionListener> set = preActionListeners.get(action.getName());
             if (set == null) {
-                set = new HashSet<ActionListener>();
+                set = new HashSet<>();
             }
             set.add(listener);
             preActionListeners.put(action.getName(), set);
@@ -233,7 +233,7 @@ public final class ActionRouter implemen
         if (action != null) {
             HashSet<ActionListener> set = postActionListeners.get(action.getName());
             if (set == null) {
-                set = new HashSet<ActionListener>();
+                set = new HashSet<>();
             }
             set.add(listener);
             postActionListeners.put(action.getName(), set);
@@ -295,7 +295,7 @@ public final class ActionRouter implemen
                     // Ignore the classes which are specific to the reporting tool
                     "org.apache.jmeter.report.gui", // $NON-NLS-1$ // notContains - classname should not contain this string
                     false); // annotations - true if classnames are annotations
-            commands = new HashMap<String, Set<Command>>(listClasses.size());
+            commands = new HashMap<>(listClasses.size());
             if (listClasses.isEmpty()) {
                 log.fatalError("!!!!!Uh-oh, didn't find any action handlers!!!!!");
                 throw new JMeterError("No action handlers found - check JMeterHome and libraries");
@@ -306,7 +306,7 @@ public final class ActionRouter implemen
                 for (String commandName : command.getActionNames()) {
                     Set<Command> commandObjects = commands.get(commandName);
                     if (commandObjects == null) {
-                        commandObjects = new HashSet<Command>();
+                        commandObjects = new HashSet<>();
                         commands.put(commandName, commandObjects);
                     }
                     commandObjects.add(command);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddParent.java Sun Aug 23 10:39:36 2015
@@ -35,7 +35,7 @@ import org.apache.log.Logger;
 public class AddParent implements Command {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.ADD_PARENT);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java Sun Aug 23 10:39:36 2015
@@ -40,7 +40,7 @@ public class AddToTree implements Comman
     private static final Set<String> commandSet;
 
     static {
-        HashSet<String> commands = new HashSet<String>();
+        HashSet<String> commands = new HashSet<>();
         commands.add(ActionNames.ADD);
         commandSet = Collections.unmodifiableSet(commands);
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Analyze.java Sun Aug 23 10:39:36 2015
@@ -30,7 +30,7 @@ import org.apache.jmeter.reporters.FileR
 import org.apache.jmeter.util.JMeterUtils;
 
 public class Analyze implements Command {
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.ANALYZE_FILE);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeLanguage.java Sun Aug 23 10:39:36 2015
@@ -33,7 +33,7 @@ import org.apache.log.Logger;
  * @version $Revision$
  */
 public class ChangeLanguage implements Command {
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     private static final Logger log = LoggingManager.getLoggerForClass();
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ChangeParent.java Sun Aug 23 10:39:36 2015
@@ -38,7 +38,7 @@ import org.apache.log.Logger;
 public class ChangeParent implements Command {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.CHANGE_PARENT);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/CheckDirty.java Sun Aug 23 10:39:36 2015
@@ -49,7 +49,7 @@ public class CheckDirty extends Abstract
 
     private boolean dirty = false;
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.CHECK_DIRTY);
@@ -61,7 +61,7 @@ public class CheckDirty extends Abstract
     }
 
     public CheckDirty() {
-        previousGuiItems = new HashMap<JMeterTreeNode, TestElement>();
+        previousGuiItems = new HashMap<>();
         ActionRouter.getInstance().addPreActionListener(ExitCommand.class, this);
     }
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Clear.java Sun Aug 23 10:39:36 2015
@@ -38,7 +38,7 @@ import org.apache.log.Logger;
 public class Clear implements Command {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.CLEAR);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Close.java Sun Aug 23 10:39:36 2015
@@ -36,7 +36,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class Close implements Command {
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.CLOSE);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/CollapseExpand.java Sun Aug 23 10:39:36 2015
@@ -32,7 +32,7 @@ import org.apache.jmeter.gui.GuiPackage;
  */
 public class CollapseExpand implements Command {
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.COLLAPSE_ALL);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Copy.java Sun Aug 23 10:39:36 2015
@@ -43,7 +43,7 @@ import org.apache.log.Logger;
 public class Copy extends AbstractAction {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final HashSet<String> commands = new HashSet<String>();
+    private static final HashSet<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.COPY);
@@ -94,7 +94,7 @@ public class Copy extends AbstractAction
      * @return JMeterTreeNode[]
      */
     static JMeterTreeNode[] keepOnlyAncestors(JMeterTreeNode[] currentNodes) {
-        List<JMeterTreeNode> nodes = new ArrayList<JMeterTreeNode>();
+        List<JMeterTreeNode> nodes = new ArrayList<>();
         for (int i = 0; i < currentNodes.length; i++) {
             boolean exclude = false;
             for (int j = 0; j < currentNodes.length; j++) {

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/CreateFunctionDialog.java Sun Aug 23 10:39:36 2015
@@ -29,7 +29,7 @@ public class CreateFunctionDialog extend
 
     private static final Set<String> commands;
     static {
-        commands = new HashSet<String>();
+        commands = new HashSet<>();
         commands.add(ActionNames.FUNCTIONS);
     }
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Cut.java Sun Aug 23 10:39:36 2015
@@ -29,7 +29,7 @@ import org.apache.jmeter.gui.tree.JMeter
  * Implements the Cut menu item command
  */
 public class Cut extends AbstractAction {
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.CUT);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Duplicate.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Duplicate.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Duplicate.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Duplicate.java Sun Aug 23 10:39:36 2015
@@ -37,7 +37,7 @@ import org.apache.jmeter.gui.tree.JMeter
  */
 public class Duplicate extends AbstractAction {
 
-    private static final HashSet<String> commands = new HashSet<String>();
+    private static final HashSet<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.DUPLICATE);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/EditCommand.java Sun Aug 23 10:39:36 2015
@@ -30,7 +30,7 @@ import org.apache.jmeter.gui.NamePanel;
  * Implements the Edit menu item.
  */
 public class EditCommand implements Command {
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.EDIT);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/EnableComponent.java Sun Aug 23 10:39:36 2015
@@ -33,7 +33,7 @@ import org.apache.log.Logger;
 public class EnableComponent implements Command {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.ENABLE);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ExitCommand.java Sun Aug 23 10:39:36 2015
@@ -29,7 +29,7 @@ import org.apache.jmeter.util.JMeterUtil
 
 public class ExitCommand implements Command {
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.EXIT);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Help.java Sun Aug 23 10:39:36 2015
@@ -42,7 +42,7 @@ import org.apache.log.Logger;
 public class Help implements Command {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     private static final String HELP_DOCS = "file:///"  // $NON-NLS-1$
         + JMeterUtils.getJMeterHome()

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=1697162&r1=1697161&r2=1697162&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 Sun Aug 23 10:39:36 2015
@@ -55,7 +55,7 @@ public class Load implements Command {
 
     private static final boolean expandTree = JMeterUtils.getPropDefault("onload.expandtree", false); //$NON-NLS-1$
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.OPEN);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java Sun Aug 23 10:39:36 2015
@@ -40,7 +40,7 @@ public class LoadRecentProject extends L
     private static final String USER_PREFS_KEY = "recent_file_"; //$NON-NLS-1$
     /** The number of menu items used for recent files */
     private static final int NUMBER_OF_MENU_ITEMS = 9;
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.OPEN_RECENT);
@@ -83,7 +83,7 @@ public class LoadRecentProject extends L
      * @return a List of JMenuItem and a JSeparator, representing recent files
      */
     public static List<JComponent> getRecentFileMenuItems() {
-        LinkedList<JComponent> menuItems = new LinkedList<JComponent>();
+        LinkedList<JComponent> menuItems = new LinkedList<>();
         // Get the preference for the recent files
         for(int i = 0; i < NUMBER_OF_MENU_ITEMS; i++) {
             // Create the menu item
@@ -121,7 +121,7 @@ public class LoadRecentProject extends L
     public static void updateRecentFileMenuItems(List<JComponent> menuItems, String loadedFileName) {
         // Get the preference for the recent files
 
-        LinkedList<String> newRecentFiles = new LinkedList<String>();
+        LinkedList<String> newRecentFiles = new LinkedList<>();
         // Check if the new file is already in the recent list
         boolean alreadyExists = false;
         for(int i = 0; i < NUMBER_OF_MENU_ITEMS; i++) {

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoggerPanelEnableDisable.java Sun Aug 23 10:39:36 2015
@@ -33,7 +33,7 @@ import org.apache.jmeter.gui.GuiPackage;
  */
 public class LoggerPanelEnableDisable implements Command {
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.LOGGER_PANEL_ENABLE_DISABLE);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java Sun Aug 23 10:39:36 2015
@@ -45,7 +45,7 @@ public class LookAndFeelCommand implemen
 
     private static final String JMETER_LAF = "jmeter.laf"; // $NON-NLS-1$
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     private static final Preferences PREFS = Preferences.userNodeForPackage(LookAndFeelCommand.class);
     // Note: Windows user preferences are stored relative to: HKEY_CURRENT_USER\Software\JavaSoft\Prefs
@@ -60,7 +60,7 @@ public class LookAndFeelCommand implemen
         }
         String jMeterLaf = getJMeterLaf();
         if (log.isInfoEnabled()) {
-            ArrayList<String> names=new ArrayList<String>();
+            ArrayList<String> names = new ArrayList<>();
             for(UIManager.LookAndFeelInfo laf : lfs) {
                 if (laf.getClassName().equals(jMeterLaf)) {
                     names.add(laf.getName());

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Move.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Move.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Move.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Move.java Sun Aug 23 10:39:36 2015
@@ -36,7 +36,7 @@ import org.apache.jmeter.testelement.Tes
 import org.apache.jmeter.testelement.WorkBench;
 
 public class Move extends AbstractAction {
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.MOVE_DOWN);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Paste.java Sun Aug 23 10:39:36 2015
@@ -40,7 +40,7 @@ public class Paste extends AbstractActio
 
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.PASTE);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java Sun Aug 23 10:39:36 2015
@@ -41,7 +41,7 @@ public class RemoteStart extends Abstrac
 
     private static final String REMOTE_HOSTS_SEPARATOR = ","; // $NON-NLS-1$
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.REMOTE_START);
@@ -94,7 +94,7 @@ public class RemoteStart extends Abstrac
     private List<String> getRemoteHosts() {
         String remote_hosts_string = JMeterUtils.getPropDefault(REMOTE_HOSTS, LOCAL_HOST);
         StringTokenizer st = new StringTokenizer(remote_hosts_string, REMOTE_HOSTS_SEPARATOR);
-        List<String> list = new LinkedList<String>();
+        List<String> list = new LinkedList<>();
         while (st.hasMoreElements())
             list.add((String) st.nextElement());
         return list;

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Remove.java Sun Aug 23 10:39:36 2015
@@ -35,7 +35,7 @@ import org.apache.jmeter.util.JMeterUtil
  */
 public class Remove implements Command {
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     // Whether to skip the delete confirmation dialogue
     private static final boolean SKIP_CONFIRM = JMeterUtils.getPropDefault("confirm.delete.skip", false); // $NON-NLS-1$

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ResetSearchCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ResetSearchCommand.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ResetSearchCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ResetSearchCommand.java Sun Aug 23 10:39:36 2015
@@ -33,7 +33,7 @@ import org.apache.jmeter.gui.tree.JMeter
  */
 public class ResetSearchCommand extends AbstractAction {
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.SEARCH_RESET);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/RevertProject.java Sun Aug 23 10:39:36 2015
@@ -32,7 +32,7 @@ import org.apache.jmeter.util.JMeterUtil
  *
  */
 public class RevertProject implements Command {
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.REVERT_PROJECT);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SSLManagerCommand.java Sun Aug 23 10:39:36 2015
@@ -55,7 +55,7 @@ import org.apache.jmeter.util.SSLManager
 public class SSLManagerCommand implements Command {
     private static final Set<String> commandSet;
     static {
-        HashSet<String> commands = new HashSet<String>();
+        HashSet<String> commands = new HashSet<>();
         commands.add(ActionNames.SSL_MANAGER);
         commandSet = Collections.unmodifiableSet(commands);
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Sun Aug 23 10:39:36 2015
@@ -97,7 +97,7 @@ public class Save implements Command {
     // NumberFormat to format version number in backup file names
     private static final DecimalFormat BACKUP_VERSION_FORMATER = new DecimalFormat("000000"); //$NON-NLS-1$
     
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.SAVE_AS); // Save (Selection) As
@@ -337,7 +337,7 @@ public class Save implements Command {
         // create a file filter that select files matching a given regex pattern
         IOFileFilter patternFileFilter = new PrivatePatternFileFilter(backupPattern);
         // get all backup files in the backup directory
-        List<File> backupFiles = new ArrayList<File>(FileUtils.listFiles(backupDir, patternFileFilter, null));
+        List<File> backupFiles = new ArrayList<>(FileUtils.listFiles(backupDir, patternFileFilter, null));
         // find the highest version number among existing backup files (this
         // should be the more recent backup)
         int lastVersionNumber = 0;
@@ -351,7 +351,7 @@ public class Save implements Command {
             }
         }
         // find expired backup files
-        List<File> expiredFiles = new ArrayList<File>();
+        List<File> expiredFiles = new ArrayList<>();
         if (BACKUP_MAX_HOURS > 0) {
             Calendar cal = Calendar.getInstance();
             cal.add(Calendar.HOUR_OF_DAY, -BACKUP_MAX_HOURS);
@@ -410,7 +410,7 @@ public class Save implements Command {
 
     // package protected to allow access from test code
     void convertSubTree(HashTree tree) {
-        Iterator<Object> iter = new LinkedList<Object>(tree.list()).iterator();
+        Iterator<Object> iter = new LinkedList<>(tree.list()).iterator();
         while (iter.hasNext()) {
             JMeterTreeNode item = (JMeterTreeNode) iter.next();
             convertSubTree(tree.getTree(item));

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SaveGraphics.java Sun Aug 23 10:39:36 2015
@@ -45,7 +45,7 @@ import org.apache.jmeter.visualizers.Pri
  */
 public class SaveGraphics implements Command {
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.SAVE_GRAPHICS);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeCommand.java Sun Aug 23 10:39:36 2015
@@ -28,7 +28,7 @@ import java.util.Set;
  */
 public class SearchTreeCommand extends AbstractAction {
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.SEARCH_TREE);

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=1697162&r1=1697161&r2=1697162&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 Sun Aug 23 10:39:36 2015
@@ -197,7 +197,7 @@ public class SearchTreeDialog extends JD
         }
         GuiPackage guiPackage = GuiPackage.getInstance();
         JMeterTreeModel jMeterTreeModel = guiPackage.getTreeModel();
-        Set<JMeterTreeNode> nodes = new HashSet<JMeterTreeNode>();
+        Set<JMeterTreeNode> nodes = new HashSet<>();
         for (JMeterTreeNode jMeterTreeNode : jMeterTreeModel.getNodesOfType(Searchable.class)) {
             try {
                 if (jMeterTreeNode.getUserObject() instanceof Searchable){

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java Sun Aug 23 10:39:36 2015
@@ -40,7 +40,7 @@ import org.apache.log.Logger;
 public class Start extends AbstractAction {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.ACTION_START);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/StopStoppables.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/StopStoppables.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/StopStoppables.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/StopStoppables.java Sun Aug 23 10:39:36 2015
@@ -32,7 +32,7 @@ import org.apache.jmeter.gui.Stoppable;
  * @since 2.5.1
  */
 public class StopStoppables extends AbstractAction implements ActionListener {
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.STOP_THREAD);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/TemplatesCommand.java Sun Aug 23 10:39:36 2015
@@ -28,7 +28,7 @@ import java.util.Set;
  */
 public class TemplatesCommand extends AbstractAction {
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     // Ensure the dialog is only created when it is first needed
     // In turn this avoids scanning the templates until first needed

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ToolBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ToolBar.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ToolBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ToolBar.java Sun Aug 23 10:39:36 2015
@@ -30,7 +30,7 @@ import org.apache.jmeter.gui.GuiPackage;
  */
 public class ToolBar implements Command {
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.TOOLBAR);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCommand.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCommand.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCommand.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCommand.java Sun Aug 23 10:39:36 2015
@@ -33,7 +33,7 @@ import org.apache.jorphan.collections.Ha
  */
 public class UndoCommand implements Command {
 
-    private static final Set<String> commands = new HashSet<String>();
+    private static final Set<String> commands = new HashSet<>();
 
     static {
         commands.add(ActionNames.UNDO);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/What.java Sun Aug 23 10:39:36 2015
@@ -47,7 +47,7 @@ public class What implements Command {
     private static final Set<String> commandSet;
 
     static {
-        HashSet<String> commands = new HashSet<String>();
+        HashSet<String> commands = new HashSet<>();
         commands.add(ActionNames.WHAT_CLASS);
         commands.add(ActionNames.DEBUG_ON);
         commands.add(ActionNames.DEBUG_OFF);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/template/TemplateManager.java Sun Aug 23 10:39:36 2015
@@ -41,7 +41,7 @@ public class TemplateManager {
          * N.B. Must use LinkedHashMap for field type
          * XStream creates a plain HashMap if one uses Map as the field type.
          */
-        private final LinkedHashMap<String, Template> templates = new LinkedHashMap<String, Template>();
+        private final LinkedHashMap<String, Template> templates = new LinkedHashMap<>();
     }
     private static final String TEMPLATE_FILES = JMeterUtils.getPropDefault("template.files", // $NON-NLS-1$
             "/bin/templates/templates.xml");
@@ -103,7 +103,7 @@ public class TemplateManager {
     }
 
     private Map<String, Template> readTemplates() {
-        final Map<String, Template> temps = new LinkedHashMap<String, Template>();
+        final Map<String, Template> temps = new LinkedHashMap<>();
        
         final String[] templateFiles = TEMPLATE_FILES.split(",");
         for (String templateFile : templateFiles) {

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java Sun Aug 23 10:39:36 2015
@@ -74,7 +74,7 @@ public class JMeterTreeModel extends Def
      * @return a list of tree nodes of the given <code>type</code>, or an empty list
      */
     public List<JMeterTreeNode> getNodesOfType(Class<?> type) {
-        List<JMeterTreeNode> nodeList = new LinkedList<JMeterTreeNode>();
+        List<JMeterTreeNode> nodeList = new LinkedList<>();
         traverseAndFind(type, (JMeterTreeNode) this.getRoot(), nodeList);
         return nodeList;
     }

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java Sun Aug 23 10:39:36 2015
@@ -76,7 +76,7 @@ public class JMeterTreeNode extends Defa
      * @return {@link List} of {@link JMeterTreeNode}s
      */
     public List<JMeterTreeNode> getPathToThreadGroup() {
-        List<JMeterTreeNode> nodes = new ArrayList<JMeterTreeNode>();
+        List<JMeterTreeNode> nodes = new ArrayList<>();
         if(treeModel != null) {
             TreeNode[] nodesToRoot = treeModel.getPathToRoot(this);
             for (TreeNode node : nodesToRoot) {

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeTransferHandler.java Sun Aug 23 10:39:36 2015
@@ -234,7 +234,7 @@ public class JMeterTreeTransferHandler e
         TreePath dest = dl.getPath();
         JMeterTreeNode target = (JMeterTreeNode) dest.getLastPathComponent();
        
-        nodesForRemoval = new ArrayList<JMeterTreeNode>();
+        nodesForRemoval = new ArrayList<>();
         int index = dl.getChildIndex();
         TreePath[] pathsToSelect = new TreePath[nodes.length];
         int pathPosition = 0;
@@ -253,7 +253,7 @@ public class JMeterTreeTransferHandler e
             
             // first copy the children as the call to copy.add will modify the collection we're iterating on
             Enumeration<?> enumFrom = node.children();
-            List<JMeterTreeNode> tmp = new ArrayList<JMeterTreeNode>();
+            List<JMeterTreeNode> tmp = new ArrayList<>();
             while (enumFrom.hasMoreElements()) {
                 JMeterTreeNode child = (JMeterTreeNode) enumFrom.nextElement();
                 tmp.add(child);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java Sun Aug 23 10:39:36 2015
@@ -61,7 +61,7 @@ public class FileListPanel extends JPane
 
     private JButton delete = new JButton(JMeterUtils.getResString("delete")); // $NON-NLS-1$
 
-    private List<ChangeListener> listeners = new LinkedList<ChangeListener>();
+    private List<ChangeListener> listeners = new LinkedList<>();
 
     private String title;
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java Sun Aug 23 10:39:36 2015
@@ -46,7 +46,7 @@ public class FilePanelEntry extends Hori
 
     private static final String ACTION_BROWSE = "browse"; //$NON-NLS-1$
 
-    private final List<ChangeListener> listeners = new LinkedList<ChangeListener>();
+    private final List<ChangeListener> listeners = new LinkedList<>();
 
     private final String[] filetypes;
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java Sun Aug 23 10:39:36 2015
@@ -52,7 +52,7 @@ public class JLabeledRadioI18N extends J
 
     private final ButtonGroup bGroup = new ButtonGroup();
 
-    private final ArrayList<ChangeListener> mChangeListeners = new ArrayList<ChangeListener>(3);
+    private final ArrayList<ChangeListener> mChangeListeners = new ArrayList<>(3);
 
     /**
      *
@@ -129,7 +129,7 @@ public class JLabeledRadioI18N extends J
      */
     public void resetButtons(String[] resouces, String selected) {
         Enumeration<AbstractButton> buttons = bGroup.getElements();
-        List<AbstractButton> buttonsToRemove = new ArrayList<AbstractButton>(this.bGroup.getButtonCount());
+        List<AbstractButton> buttonsToRemove = new ArrayList<>(this.bGroup.getButtonCount());
         while (buttons.hasMoreElements()) {
             AbstractButton abstractButton = buttons
                     .nextElement();
@@ -206,7 +206,7 @@ public class JLabeledRadioI18N extends J
      */
     @Override
     public List<JComponent> getComponentList() {
-        List<JComponent> comps = new LinkedList<JComponent>();
+        List<JComponent> comps = new LinkedList<>();
         comps.add(mLabel);
         Enumeration<AbstractButton> en = this.bGroup.getElements();
         while (en.hasMoreElements()) {

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Sun Aug 23 10:39:36 2015
@@ -149,12 +149,12 @@ public class JMeterMenuBar extends JMenu
 
     public JMeterMenuBar() {
         // List for recent files menu items
-        file_load_recent_files = new LinkedList<JComponent>();
+        file_load_recent_files = new LinkedList<>();
         // Lists for remote engines menu items
-        remote_engine_start = new LinkedList<JMenuItem>();
-        remote_engine_stop = new LinkedList<JMenuItem>();
-        remote_engine_shut = new LinkedList<JMenuItem>();
-        remote_engine_exit = new LinkedList<JMenuItem>();
+        remote_engine_start = new LinkedList<>();
+        remote_engine_stop = new LinkedList<>();
+        remote_engine_shut = new LinkedList<>();
+        remote_engine_exit = new LinkedList<>();
         remoteHosts = JOrphanUtils.split(JMeterUtils.getPropDefault("remote_hosts", ""), ","); //$NON-NLS-1$
         if (remoteHosts.length == 1 && remoteHosts[0].equals("")) {
             remoteHosts = new String[0];
@@ -238,7 +238,7 @@ public class JMeterMenuBar extends JMenu
      * should be defined in a file somewhere, but that is for later.
      */
     public void createMenuBar() {
-        this.menuCreators = new ArrayList<MenuCreator>();
+        this.menuCreators = new ArrayList<>();
         try {
             List<String> listClasses = ClassFinder.findClassesThatExtend(
                     JMeterUtils.getSearchPaths(), 
@@ -387,7 +387,7 @@ public class JMeterMenuBar extends JMenu
      */
     // Also used by org.apache.jmeter.resources.PackageTest
     public static String[] getLanguages(){
-        List<String> lang = new ArrayList<String>(20);
+        List<String> lang = new ArrayList<>(20);
         lang.add(Locale.ENGLISH.toString()); // en
         lang.add(Locale.FRENCH.toString()); // fr
         lang.add(Locale.GERMAN.toString()); // de

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java Sun Aug 23 10:39:36 2015
@@ -164,7 +164,7 @@ public class JMeterToolBar extends JTool
         
         String iconSize = JMeterUtils.getPropDefault(TOOLBAR_ICON_SIZE, DEFAULT_TOOLBAR_ICON_SIZE); 
 
-        List<IconToolbarBean> listIcons = new ArrayList<IconToolbarBean>();
+        List<IconToolbarBean> listIcons = new ArrayList<>();
         for (String key : oList) {
             log.debug("Toolbar icon key: " + key); //$NON-NLS-1$
             String trimmed = key.trim();
@@ -204,7 +204,7 @@ public class JMeterToolBar extends JTool
      */
     private Map<String, Boolean> getCurrentButtonsStates() {
         Component[] components = getComponents();
-        Map<String, Boolean> buttonStates = new HashMap<String, Boolean>(components.length);
+        Map<String, Boolean> buttonStates = new HashMap<>(components.length);
         for (int i = 0; i < components.length; i++) {
             if (components[i] instanceof JButton) {
                 JButton button = (JButton) components[i];
@@ -219,7 +219,7 @@ public class JMeterToolBar extends JTool
      */
     public void initButtonsState() {
         final boolean started = false;
-        Map<String, Boolean> buttonStates = new HashMap<String, Boolean>();
+        Map<String, Boolean> buttonStates = new HashMap<>();
         buttonStates.put(ActionNames.ACTION_START, Boolean.valueOf(!started));
         buttonStates.put(ActionNames.ACTION_START_NO_TIMERS, Boolean.valueOf(!started));
         buttonStates.put(ActionNames.ACTION_STOP, Boolean.valueOf(started));
@@ -240,7 +240,7 @@ public class JMeterToolBar extends JTool
      *            Flag whether local test is started
      */
     public void setLocalTestStarted(boolean started) {
-        Map<String, Boolean> buttonStates = new HashMap<String, Boolean>(3);
+        Map<String, Boolean> buttonStates = new HashMap<>(3);
         buttonStates.put(ActionNames.ACTION_START, Boolean.valueOf(!started));
         buttonStates.put(ActionNames.ACTION_START_NO_TIMERS, Boolean.valueOf(!started));
         buttonStates.put(ActionNames.ACTION_STOP, Boolean.valueOf(started));
@@ -255,7 +255,7 @@ public class JMeterToolBar extends JTool
      *            Flag whether the test is started
      */
     public void setRemoteTestStarted(boolean started) {
-        Map<String, Boolean> buttonStates = new HashMap<String, Boolean>(3);
+        Map<String, Boolean> buttonStates = new HashMap<>(3);
         buttonStates.put(ActionNames.REMOTE_START_ALL, Boolean.valueOf(!started));
         buttonStates.put(ActionNames.REMOTE_STOP_ALL, Boolean.valueOf(started));
         buttonStates.put(ActionNames.REMOTE_SHUT_ALL, Boolean.valueOf(started));
@@ -273,7 +273,7 @@ public class JMeterToolBar extends JTool
      *            {@link ActionNames#REDO} should be enabled
      */
     public void updateUndoRedoIcons(boolean canUndo, boolean canRedo) {
-        Map<String, Boolean> buttonStates = new HashMap<String, Boolean>(2);
+        Map<String, Boolean> buttonStates = new HashMap<>(2);
         buttonStates.put(ActionNames.UNDO, Boolean.valueOf(canUndo));
         buttonStates.put(ActionNames.REDO, Boolean.valueOf(canRedo));
         updateButtons(buttonStates);

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java Sun Aug 23 10:39:36 2015
@@ -90,10 +90,9 @@ public final class MenuFactory {
 
     public static final String LISTENERS = "menu_listener"; //$NON-NLS-1$
 
-    private static final Map<String, List<MenuInfo>> menuMap =
-        new HashMap<String, List<MenuInfo>>();
+    private static final Map<String, List<MenuInfo>> menuMap = new HashMap<>();
 
-    private static final Set<String> elementsToSkip = new HashSet<String>();
+    private static final Set<String> elementsToSkip = new HashSet<>();
 
     // MENU_ADD_xxx - controls which items are in the ADD menu
     // MENU_PARENT_xxx - controls which items are in the Insert Parent menu
@@ -128,17 +127,17 @@ public final class MenuFactory {
         postProcessors, preProcessors;
 
     static {
-        threads = new LinkedList<MenuInfo>();
-        fragments = new LinkedList<MenuInfo>();
-        timers = new LinkedList<MenuInfo>();
-        controllers = new LinkedList<MenuInfo>();
-        samplers = new LinkedList<MenuInfo>();
-        configElements = new LinkedList<MenuInfo>();
-        assertions = new LinkedList<MenuInfo>();
-        listeners = new LinkedList<MenuInfo>();
-        postProcessors = new LinkedList<MenuInfo>();
-        preProcessors = new LinkedList<MenuInfo>();
-        nonTestElements = new LinkedList<MenuInfo>();
+        threads = new LinkedList<>();
+        fragments = new LinkedList<>();
+        timers = new LinkedList<>();
+        controllers = new LinkedList<>();
+        samplers = new LinkedList<>();
+        configElements = new LinkedList<>();
+        assertions = new LinkedList<>();
+        listeners = new LinkedList<>();
+        postProcessors = new LinkedList<>();
+        preProcessors = new LinkedList<>();
+        nonTestElements = new LinkedList<>();
         menuMap.put(THREADS, threads);
         menuMap.put(FRAGMENTS, fragments);
         menuMap.put(TIMERS, timers);

Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java Sun Aug 23 10:39:36 2015
@@ -44,7 +44,7 @@ public abstract class AbstractListenerEl
     }
 
     public void setListener(Visualizer vis) {
-        listener = new WeakReference<Visualizer>(vis);
+        listener = new WeakReference<>(vis);
     }
 
     @Override

Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java Sun Aug 23 10:39:36 2015
@@ -55,7 +55,7 @@ public class FileReporter extends JPanel
 
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private final Map<String, List<Integer>> data = new ConcurrentHashMap<String, List<Integer>>();
+    private final Map<String, List<Integer>> data = new ConcurrentHashMap<>();
 
     /**
      * Initialize a file reporter from a file

Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java Sun Aug 23 10:39:36 2015
@@ -105,7 +105,7 @@ public class ResultCollector extends Abs
     private static final Object LOCK = new Object();
 
     //@GuardedBy("LOCK")
-    private static final Map<String, FileEntry> files = new HashMap<String, FileEntry>();
+    private static final Map<String, FileEntry> files = new HashMap<>();
 
     /**
      * Shutdown Hook that ensures PrintWriter is flushed is CTRL+C or kill is called during a test

Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/Summariser.java Sun Aug 23 10:39:36 2015
@@ -95,7 +95,7 @@ public class Summariser extends Abstract
      * This map allows summarisers with the same name to contribute to the same totals.
      */
     //@GuardedBy("LOCK") - needed to ensure consistency between this and INSTANCE_COUNT
-    private static final Map<String, Totals> ACCUMULATORS = new ConcurrentHashMap<String, Totals>();
+    private static final Map<String, Totals> ACCUMULATORS = new ConcurrentHashMap<>();
 
     //@GuardedBy("LOCK")
     private static int INSTANCE_COUNT; // number of active tests

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java Sun Aug 23 10:39:36 2015
@@ -67,7 +67,7 @@ public class AsynchSampleSender extends
     private Object readResolve() throws ObjectStreamException{
         int capacity = getCapacity();
         log.info("Using batch queue size (asynch.batch.queue.size): " + capacity); // server log file
-        queue = new ArrayBlockingQueue<SampleEvent>(capacity);        
+        queue = new ArrayBlockingQueue<>(capacity);
         Worker worker = new Worker(queue, listener);
         worker.setDaemon(true);
         worker.start();
@@ -142,7 +142,7 @@ public class AsynchSampleSender extends
             try {
                 boolean eof = false;
                 while (!eof) {
-                    List<SampleEvent> l = new ArrayList<SampleEvent>();
+                    List<SampleEvent> l = new ArrayList<>();
                     SampleEvent e = queue.take();
                     while (!(eof = (e == FINAL_EVENT)) && e != null) { // try to process as many as possible
                         l.add(e);

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java Sun Aug 23 10:39:36 2015
@@ -57,7 +57,7 @@ public class BatchSampleSender extends A
 
     private final RemoteSampleListener listener;
 
-    private final List<SampleEvent> sampleStore = new ArrayList<SampleEvent>();
+    private final List<SampleEvent> sampleStore = new ArrayList<>();
 
     // Server-only work item
     private transient long batchSendTime = -1;

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/Entry.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/Entry.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/Entry.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/Entry.java Sun Aug 23 10:39:36 2015
@@ -37,9 +37,9 @@ public class Entry {
     private List<Assertion> assertions;
 
     public Entry() {
-        configSet = new HashMap<Class<?>, ConfigElement>();
+        configSet = new HashMap<>();
         // clonedSet = new HashSet();
-        assertions = new LinkedList<Assertion>();
+        assertions = new LinkedList<>();
     }
 
     public void addAssertion(Assertion assertion) {

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java Sun Aug 23 10:39:36 2015
@@ -36,7 +36,7 @@ public class HoldSampleSender extends Ab
 
     private static final long serialVersionUID = 240L;
 
-    private final List<SampleEvent> sampleStore = new ArrayList<SampleEvent>();
+    private final List<SampleEvent> sampleStore = new ArrayList<>();
 
     private final RemoteSampleListener listener;
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Sun Aug 23 10:39:36 2015
@@ -175,7 +175,7 @@ public class SampleResult implements Ser
     /** In Non GUI mode and when best config is used, size never exceeds 1, 
      * but as a compromise set it to 3 
      */
-    private final Set<String> files = new HashSet<String>(3);
+    private final Set<String> files = new HashSet<>(3);
 
     private String dataEncoding;// (is this really the character set?) e.g.
                                 // ISO-8895-1, UTF-8
@@ -569,7 +569,7 @@ public class SampleResult implements Ser
 
     public void addAssertionResult(AssertionResult assertResult) {
         if (assertionResults == null) {
-            assertionResults = new ArrayList<AssertionResult>();
+            assertionResults = new ArrayList<>();
         }
         assertionResults.add(assertResult);
     }
@@ -636,7 +636,7 @@ public class SampleResult implements Ser
      */
     public void storeSubResult(SampleResult subResult) {
         if (subResults == null) {
-            subResults = new ArrayList<SampleResult>();
+            subResults = new ArrayList<>();
         }
         subResults.add(subResult);
         subResult.setParent(this);

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java Sun Aug 23 10:39:36 2015
@@ -68,10 +68,10 @@ public class StatisticalSampleSender ext
 
     private final RemoteSampleListener listener;
 
-    private final List<SampleEvent> sampleStore = new ArrayList<SampleEvent>();
+    private final List<SampleEvent> sampleStore = new ArrayList<>();
 
     //@GuardedBy("sampleStore") TODO perhaps use ConcurrentHashMap ?
-    private final Map<String, StatisticalSampleResult> sampleTable = new HashMap<String, StatisticalSampleResult>();
+    private final Map<String, StatisticalSampleResult> sampleTable = new HashMap<>();
 
     // Settings; readResolve sets these from the server/client values as appropriate
     // TODO would be nice to make these final; not 100% sure volatile is needed as not changed after creation

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java Sun Aug 23 10:39:36 2015
@@ -1045,7 +1045,7 @@ public final class CSVSaveService {
             throws IOException {
         int ch;
         ParserState state = ParserState.INITIAL;
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         CharArrayWriter baos = new CharArrayWriter(200);
         boolean push = false;
         while (-1 != (ch = infile.read())) {

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Sun Aug 23 10:39:36 2015
@@ -422,7 +422,7 @@ public class SaveService {
     // Allow test code to check for spurious class references
     static List<String> checkClasses(){
         final ClassLoader classLoader = SaveService.class.getClassLoader();
-        List<String> missingClasses = new ArrayList<String>();
+        List<String> missingClasses = new ArrayList<>();
         //boolean OK = true;
         for (Object clazz : classToAlias.keySet()) {
             String name = (String) clazz;

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java Sun Aug 23 10:39:36 2015
@@ -147,7 +147,7 @@ public class ConversionHelp {
     /**
      *  Names of properties that are handled specially
      */
-    private static final Map<String, String> propertyToAttribute=new HashMap<String, String>();
+    private static final Map<String, String> propertyToAttribute = new HashMap<>();
 
     private static void mapentry(String prop, String att){
         propertyToAttribute.put(prop,att);

Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java Sun Aug 23 10:39:36 2015
@@ -85,7 +85,7 @@ public class TestResultWrapperConverter
     @Override
     public Object unmarshal(HierarchicalStreamReader reader, UnmarshallingContext context) {
         TestResultWrapper results = new TestResultWrapper();
-        Collection<SampleResult> samples = new ArrayList<SampleResult>();
+        Collection<SampleResult> samples = new ArrayList<>();
         String ver = reader.getAttribute("version");  //$NON-NLS-1$
         if (ver == null || ver.length() == 0) {
             ver = "1.0";  //$NON-NLS-1$

Modified: jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java Sun Aug 23 10:39:36 2015
@@ -79,7 +79,7 @@ public class FileServer {
     private File base;
 
     //@GuardedBy("this") NOTE this also guards against possible window in checkForOpenFiles()
-    private final Map<String, FileEntry> files = new HashMap<String, FileEntry>();
+    private final Map<String, FileEntry> files = new HashMap<>();
 
     private static final FileServer server = new FileServer();
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java Sun Aug 23 10:39:36 2015
@@ -137,7 +137,7 @@ public class TestBeanHelper {
     {
         if(prop instanceof CollectionProperty)
         {
-            Collection<Object> values = new LinkedList<Object>();
+            Collection<Object> values = new LinkedList<>();
             PropertyIterator iter = prop.iterator();
             while(iter.hasNext())
             {

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java Sun Aug 23 10:39:36 2015
@@ -113,7 +113,7 @@ class ComboStringEditor extends Property
         model = new DefaultComboBoxModel<>();
 
         if (rb != null && tags.length > 0) {
-            validTranslations=new HashMap<String, String>();
+            validTranslations = new HashMap<>();
             for (String tag : this.tags) {
                 validTranslations.put(tag, rb.getString(tag));
             }

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java Sun Aug 23 10:39:36 2015
@@ -138,7 +138,7 @@ public class TableEditor extends Propert
 
     private Collection<Object> convertCollection(Collection<?> values)
     {
-        List<Object> l = new LinkedList<Object>();
+        List<Object> l = new LinkedList<>();
         for(Object obj : values)
         {
             if(obj instanceof TestElementProperty)

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java Sun Aug 23 10:39:36 2015
@@ -122,7 +122,7 @@ public class TestBeanGUI extends Abstrac
     /**
      * The property name to value map that the active customizer edits:
      */
-    private final Map<String, Object> propertyMap = new HashMap<String, Object>();
+    private final Map<String, Object> propertyMap = new HashMap<>();
 
     /**
      * Whether the GUI components have been created.
@@ -130,7 +130,7 @@ public class TestBeanGUI extends Abstrac
     private boolean initialized = false;
 
     static {
-        List<String> paths = new LinkedList<String>();
+        List<String> paths = new LinkedList<>();
         paths.add("org.apache.jmeter.testbeans.gui");// $NON-NLS-1$
         paths.addAll(Arrays.asList(PropertyEditorManager.getEditorSearchPath()));
         String s = JMeterUtils.getPropDefault("propertyEditorSearchPath", null);// $NON-NLS-1$
@@ -356,7 +356,7 @@ public TestElement createTestElement() {
     /** {@inheritDoc} */
     @Override
     public Collection<String> getMenuCategories() {
-        List<String> menuCategories = new LinkedList<String>();
+        List<String> menuCategories = new LinkedList<>();
         BeanDescriptor bd = beanInfo.getBeanDescriptor();
 
         // We don't want to show expert beans in the menus unless we're

Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java Sun Aug 23 10:39:36 2015
@@ -150,7 +150,7 @@ public abstract class AbstractScopedTest
      * @return list containing the current sample and/or its child samples
      */
     protected List<SampleResult> getSampleList(SampleResult result) {
-        List<SampleResult> sampleList = new ArrayList<SampleResult>();
+        List<SampleResult> sampleList = new ArrayList<>();
 
         String scope = fetchScope();
         if (isScopeParent(scope) || isScopeAll(scope)) {

Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java Sun Aug 23 10:39:36 2015
@@ -535,7 +535,7 @@ public abstract class AbstractTestElemen
     @Override
     public void setTemporary(JMeterProperty property) {
         if (temporaryProperties == null) {
-            temporaryProperties = new LinkedHashSet<JMeterProperty>();
+            temporaryProperties = new LinkedHashSet<>();
         }
         temporaryProperties.add(property);
         if (property instanceof MultiProperty) {
@@ -629,7 +629,7 @@ public abstract class AbstractTestElemen
      */
     @Override
     public List<String> getSearchableTokens() {
-        List<String> result = new ArrayList<String>(25);
+        List<String> result = new ArrayList<>(25);
         PropertyIterator iterator = propertyIterator();
         while(iterator.hasNext()) {
             JMeterProperty jMeterProperty = iterator.next();    

Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java Sun Aug 23 10:39:36 2015
@@ -57,7 +57,7 @@ public class TestPlan extends AbstractTe
 
     private static final String BASEDIR = "basedir";
 
-    private transient List<AbstractThreadGroup> threadGroups = new LinkedList<AbstractThreadGroup>();
+    private transient List<AbstractThreadGroup> threadGroups = new LinkedList<>();
 
     // There's only 1 test plan, so can cache the mode here
     private static volatile boolean functionalMode = false;
@@ -76,7 +76,7 @@ public class TestPlan extends AbstractTe
 
     // create transient item
     private Object readResolve(){
-        threadGroups = new LinkedList<AbstractThreadGroup>();
+        threadGroups = new LinkedList<>();
         return this;
     }
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/VariablesCollection.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/VariablesCollection.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/VariablesCollection.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/VariablesCollection.java Sun Aug 23 10:39:36 2015
@@ -31,7 +31,7 @@ public class VariablesCollection impleme
 
     private static final long serialVersionUID = 240L;
 
-    private final Map<String, JMeterVariables> varMap = new HashMap<String, JMeterVariables>();
+    private final Map<String, JMeterVariables> varMap = new HashMap<>();
 
     public void addJMeterVariables(JMeterVariables jmVars) {
         varMap.put(Thread.currentThread().getName(), jmVars);

Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java Sun Aug 23 10:39:36 2015
@@ -39,7 +39,7 @@ public class CollectionProperty extends
 
     public CollectionProperty() {
         super();
-        value = new ArrayList<JMeterProperty>();
+        value = new ArrayList<>();
     }
 
     @Override

Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java?rev=1697162&r1=1697161&r2=1697162&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java Sun Aug 23 10:39:36 2015
@@ -36,7 +36,7 @@ import org.apache.log.Logger;
 public class FindTestElementsUpToRootTraverser implements HashTreeTraverser {
     private static final Logger log = LoggingManager.getLoggerForClass();
 
-    private final LinkedList<TestElement> stack = new LinkedList<TestElement>();
+    private final LinkedList<TestElement> stack = new LinkedList<>();
 
     /**
      * Node to find in TestTree
@@ -89,8 +89,8 @@ public class FindTestElementsUpToRootTra
      * @return List of {@link Controller}
      */
     public List<Controller> getControllersToRoot() {
-        List<Controller> result = new ArrayList<Controller>(stack.size());
-        LinkedList<TestElement> stackLocalCopy = new LinkedList<TestElement>(stack);
+        List<Controller> result = new ArrayList<>(stack.size());
+        LinkedList<TestElement> stackLocalCopy = new LinkedList<>(stack);
         while(stackLocalCopy.size()>0) {
             TestElement te = stackLocalCopy.getLast();
             if(te instanceof Controller) {



Mime
View raw message