Index: trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 10592)
+++ trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java	(revision 10593)
@@ -940,7 +940,7 @@
         }
         if (existing != null)
-            return new ArrayList<Collection<String>>(existing.getValue());
+            return new ArrayList<>(existing.getValue());
         else
-            return defaults.getValue() == null ? null : new ArrayList<Collection<String>>(defaults.getValue());
+            return defaults.getValue() == null ? null : new ArrayList<>(defaults.getValue());
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 10592)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 10593)
@@ -156,6 +156,6 @@
         mode = Mode.RESOLVING_ONE_TAGCOLLECTION_ONLY;
         tagsForAllPrimitives = tagsForAllPrimitives == null ? new TagCollection() : tagsForAllPrimitives;
-        sourceStatistics = sourceStatistics == null ? new HashMap<OsmPrimitiveType, Integer>() : sourceStatistics;
-        targetStatistics = targetStatistics == null ? new HashMap<OsmPrimitiveType, Integer>() : targetStatistics;
+        sourceStatistics = sourceStatistics == null ? new HashMap<>() : sourceStatistics;
+        targetStatistics = targetStatistics == null ? new HashMap<>() : targetStatistics;
 
         // init the resolver
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java	(revision 10592)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java	(revision 10593)
@@ -162,5 +162,5 @@
         decisions.clear();
         relations = relations == null ? Collections.<Relation>emptyList() : relations;
-        memberPrimitives = memberPrimitives == null ? new LinkedList<OsmPrimitive>() : memberPrimitives;
+        memberPrimitives = memberPrimitives == null ? new LinkedList<>() : memberPrimitives;
         for (Relation r : relations) {
             for (OsmPrimitive p: memberPrimitives) {
@@ -180,5 +180,5 @@
      */
     public void populate(Collection<RelationToChildReference> references) {
-        references = references == null ? new LinkedList<RelationToChildReference>() : references;
+        references = references == null ? new LinkedList<>() : references;
         decisions.clear();
         this.relations = new HashSet<>(references.size());
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 10592)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 10593)
@@ -133,5 +133,5 @@
         this.tags = tags;
         displayedKeys = new ArrayList<>();
-        this.keysWithConflicts = keysWithConflicts == null ? new HashSet<String>() : keysWithConflicts;
+        this.keysWithConflicts = keysWithConflicts == null ? new HashSet<>() : keysWithConflicts;
         decisions = new HashMap<>();
         rebuild();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 10592)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java	(revision 10593)
@@ -473,5 +473,5 @@
             boolean isDblClick = isDoubleClick(e);
 
-            Collection<OsmPrimitive> sel = isDblClick ? new HashSet<OsmPrimitive>(40) : null;
+            Collection<OsmPrimitive> sel = isDblClick ? new HashSet<>(40) : null;
 
             boolean hasFixes = setSelection(sel, isDblClick);
@@ -576,5 +576,5 @@
         FixTask(Collection<TestError> testErrors) {
             super(tr("Fixing errors ..."), false /* don't ignore exceptions */);
-            this.testErrors = testErrors == null ? new ArrayList<TestError>() : testErrors;
+            this.testErrors = testErrors == null ? new ArrayList<>() : testErrors;
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/preferences/DefaultTabPreferenceSetting.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/DefaultTabPreferenceSetting.java	(revision 10592)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/DefaultTabPreferenceSetting.java	(revision 10593)
@@ -42,5 +42,5 @@
         this.title = title;
         this.tabpane = tabpane;
-        this.subSettingMap = tabpane != null ? new HashMap<SubPreferenceSetting, Component>() : null;
+        this.subSettingMap = tabpane != null ? new HashMap<>() : null;
     }