Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/ButtonDescription.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/ButtonDescription.java	(revision 30736)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/ButtonDescription.java	(revision 30737)
@@ -73,5 +73,5 @@
      */
     private static List<SurveyorActionDescription> createFromOneElement(SurveyorActionDescription actionDescription) {
-        List<SurveyorActionDescription> list = new ArrayList<SurveyorActionDescription>();
+        List<SurveyorActionDescription> list = new ArrayList<>();
         list.add(actionDescription);
         return list;
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorActionDescription.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorActionDescription.java	(revision 30736)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorActionDescription.java	(revision 30737)
@@ -51,5 +51,5 @@
         super();
         this.actionClass = actionClass;
-        this.params = new ArrayList<String>();
+        this.params = new ArrayList<>();
         for (int index = 0; index < params.length; index++) {
             this.params.add(params[index]);
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorActionFactory.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorActionFactory.java	(revision 30736)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorActionFactory.java	(revision 30737)
@@ -18,5 +18,5 @@
  */
 public class SurveyorActionFactory {
-    private static Map<String, SurveyorAction>actionCache = new HashMap<String, SurveyorAction>();
+    private static Map<String, SurveyorAction>actionCache = new HashMap<>();
     public static final String DEFAULT_PACKAGE = SurveyorActionFactory.class.getPackage().getName() + ".action";
 
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 30736)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 30737)
@@ -48,5 +48,5 @@
     public SurveyorComponent() {
         super();
-        hotKeys = new HashSet<String>();
+        hotKeys = new HashSet<>();
         setLayout(new BorderLayout());
         streetLabel = new JLabel(tr("Way: "));
@@ -132,5 +132,5 @@
             e.printStackTrace();
         }
-        List<SurveyorActionDescription> actions = new ArrayList<SurveyorActionDescription>();
+        List<SurveyorActionDescription> actions = new ArrayList<>();
         while(parser.hasNext()) {
             Object object = parser.next();
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java	(revision 30736)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorShowAction.java	(revision 30737)
@@ -144,5 +144,5 @@
         SurveyorComponent surveyorComponent = null;
         parser.start(new BufferedReader(new InputStreamReader(in)));
-        List<SurveyorActionDescription> actions = new ArrayList<SurveyorActionDescription>();
+        List<SurveyorActionDescription> actions = new ArrayList<>();
         while(parser.hasNext()) {
             Object object = parser.next();
@@ -154,5 +154,5 @@
                 ((ButtonDescription)object).setActions(actions);
                 surveyorComponent.addButton(((ButtonDescription)object));
-                actions = new ArrayList<SurveyorActionDescription>();
+                actions = new ArrayList<>();
             } else if (object instanceof SurveyorActionDescription) {
                 //System.out.println("SurveyorActionDescription " + object);
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java	(revision 30736)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetNodeAction.java	(revision 30737)
@@ -38,5 +38,5 @@
     @Override
     public void setParameters(List<String> parameters) {
-        keyValues = new ArrayList<Pair<String, String>>();
+        keyValues = new ArrayList<>();
         int pos;
         String key;
@@ -47,5 +47,5 @@
                 key = keyValuePair.substring(0, pos);
                 value = keyValuePair.substring(pos + 1);
-                keyValues.add(new Pair<String, String>(key, value));
+                keyValues.add(new Pair<>(key, value));
             } else {
                 System.err.println("SetNodeAction: ignoring invalid key value pair: " + keyValuePair);
Index: applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java	(revision 30736)
+++ applications/editors/josm/plugins/surveyor/src/org/dinopolis/util/io/Tokenizer.java	(revision 30737)
@@ -730,5 +730,5 @@
   {
     int token = nextToken();
-    List<String> list = new ArrayList<String>();
+    List<String> list = new ArrayList<>();
     String word = "";
 //    while(token != Tokenizer.EOF)
@@ -790,5 +790,5 @@
       Iterator<String> iterator = list.iterator();
       String value;
-      List<String> new_list = new ArrayList<String>();
+      List<String> new_list = new ArrayList<>();
       while(iterator.hasNext())
       {