Index: /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java	(revision 9070)
@@ -188,8 +188,8 @@
         cmds.addAll(resolution);
         cmds.add(new DeleteCommand(deletedWays));
-        final SequenceCommand sequenceCommand = new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
+        final Command sequenceCommand = new SequenceCommand(/* for correct i18n of plural forms - see #9110 */
                 trn("Combine {0} way", "Combine {0} ways", ways.size(), ways.size()), cmds);
 
-        return new Pair<Way, Command>(targetWay, sequenceCommand);
+        return new Pair<>(targetWay, sequenceCommand);
     }
 
Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 9070)
@@ -883,5 +883,5 @@
 
         // add direction perpendicular to the selected segment
-        possibleMoveDirections = new ArrayList<ReferenceSegment>();
+        possibleMoveDirections = new ArrayList<>();
         possibleMoveDirections.add(new ReferenceSegment(new EastNorth(
                 initialN1en.getY() - initialN2en.getY(),
Index: /trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java	(revision 9070)
@@ -24,6 +24,5 @@
             return Collections.<Relation>emptySet();
         } else {
-            return new SubclassFilteredCollection<OsmPrimitive, Relation>(
-                    primitives, OsmPrimitive.relationPredicate);
+            return new SubclassFilteredCollection<>(primitives, OsmPrimitive.relationPredicate);
         }
     }
Index: /trunk/src/org/openstreetmap/josm/command/DeleteCommand.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/command/DeleteCommand.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/command/DeleteCommand.java	(revision 9070)
@@ -368,5 +368,5 @@
             return null;
 
-        Set<OsmPrimitive> primitivesToDelete = new HashSet<OsmPrimitive>(selection);
+        Set<OsmPrimitive> primitivesToDelete = new HashSet<>(selection);
 
         Collection<Relation> relationsToDelete = Utils.filteredCollection(primitivesToDelete, Relation.class);
Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9070)
@@ -1824,8 +1824,8 @@
                 Collection<Map<String, String>> data = getListOfStructs(key, (Collection<Map<String, String>>) null);
                 if (data != null) {
-                    List<Map<String, String>> newlist = new ArrayList<Map<String, String>>();
+                    List<Map<String, String>> newlist = new ArrayList<>();
                     boolean modified = false;
                     for (Map<String, String> map : data) {
-                         Map<String, String> newmap = new LinkedHashMap<String, String>();
+                         Map<String, String> newmap = new LinkedHashMap<>();
                          for (Entry<String, String> entry : map.entrySet()) {
                              String val = entry.getValue();
Index: /trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/data/cache/CacheEntryAttributes.java	(revision 9070)
@@ -22,5 +22,5 @@
 public class CacheEntryAttributes extends ElementAttributes {
     private static final long serialVersionUID = 1L; //version
-    private final Map<String, String> attrs = new ConcurrentHashMap<String, String>(RESERVED_KEYS.size());
+    private final Map<String, String> attrs = new ConcurrentHashMap<>(RESERVED_KEYS.size());
     private static final String NO_TILE_AT_ZOOM = "noTileAtZoom";
     private static final String ETAG = "Etag";
Index: /trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java	(revision 9070)
@@ -169,5 +169,5 @@
             }
         }
-        return new CacheAccess<K, V>(cc);
+        return new CacheAccess<>(cc);
     }
 
Index: /trunk/src/org/openstreetmap/josm/data/notes/Note.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/notes/Note.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/data/notes/Note.java	(revision 9070)
@@ -21,5 +21,5 @@
     private Date closedAt;
     private State state;
-    private List<NoteComment> comments = new ArrayList<NoteComment>();
+    private List<NoteComment> comments = new ArrayList<>();
 
     /**
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java	(revision 9070)
@@ -382,5 +382,5 @@
     public Command fixError(TestError testError) {
         if (!isFixable(testError)) return null;
-        Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>(testError.getPrimitives());
+        Collection<OsmPrimitive> sel = new LinkedList<>(testError.getPrimitives());
         Set<Node> nodes = new LinkedHashSet<>(OsmPrimitive.getFilteredList(sel, Node.class));
 
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java	(revision 9070)
@@ -583,5 +583,5 @@
          */
         public Set<TagCheck> getTagCheckDependencies(Collection<TagCheck> schecks) {
-            Set<TagCheck> result = new HashSet<MapCSSTagChecker.TagCheck>();
+            Set<TagCheck> result = new HashSet<>();
             Set<String> classes = getClassesIds();
             if (schecks != null && !classes.isEmpty()) {
@@ -770,5 +770,5 @@
                 final OsmPrimitive p = OsmUtils.createPrimitive(i.getKey());
                 // Build minimal ordered list of checks to run to test the assertion
-                List<Set<TagCheck>> checksToRun = new ArrayList<Set<TagCheck>>();
+                List<Set<TagCheck>> checksToRun = new ArrayList<>();
                 Set<TagCheck> checkDependencies = check.getTagCheckDependencies(schecks);
                 if (!checkDependencies.isEmpty()) {
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java	(revision 9070)
@@ -302,5 +302,5 @@
                 }
             }
-            List<OsmPrimitive> newPrimitives = new ArrayList<OsmPrimitive>(primitives);
+            List<OsmPrimitive> newPrimitives = new ArrayList<>(primitives);
             newPrimitives.add(0, r);
             error.setPrimitives(newPrimitives);
Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java	(revision 9070)
@@ -41,5 +41,5 @@
     private MultiMap<Way, Way> errorWays;
 
-    private final List<NormalizeRule> rules = new ArrayList<NormalizeRule>();
+    private final List<NormalizeRule> rules = new ArrayList<>();
 
     /**
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java	(revision 9070)
@@ -105,5 +105,5 @@
     private void buildDialog() {
         model = new NoteTableModel();
-        displayList = new JList<Note>(model);
+        displayList = new JList<>(model);
         displayList.setCellRenderer(new NoteRenderer());
         displayList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
Index: /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java	(revision 9070)
@@ -405,5 +405,5 @@
             } else {
                 // Draw message on several lines
-                Map<TextAttribute, Object> map = new HashMap<TextAttribute, Object>();
+                Map<TextAttribute, Object> map = new HashMap<>();
                 map.put(TextAttribute.FAMILY, "Serif");
                 map.put(TextAttribute.SIZE, new Float(18.0));
Index: /trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java	(revision 9070)
@@ -131,5 +131,5 @@
             }
         } else {
-            FutureTask<V> task = new FutureTask<V>(callable);
+            FutureTask<V> task = new FutureTask<>(callable);
             SwingUtilities.invokeLater(task);
             try {
Index: /trunk/src/org/openstreetmap/josm/io/NoteReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/NoteReader.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/io/NoteReader.java	(revision 9070)
@@ -73,9 +73,9 @@
             case "osm":
                 parseMode = NoteParseMode.API;
-                notes = new ArrayList<Note>(100);
+                notes = new ArrayList<>(100);
                 return;
             case "osm-notes":
                 parseMode = NoteParseMode.DUMP;
-                notes = new ArrayList<Note>(10000);
+                notes = new ArrayList<>(10000);
                 return;
             }
Index: /trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/io/OsmServerLocationReader.java	(revision 9070)
@@ -178,5 +178,5 @@
             in = getInputStream(url, progressMonitor.createSubTaskMonitor(1, true));
             if (in == null) {
-                return new ArrayList<Note>();
+                return new ArrayList<>();
             }
             progressMonitor.subTask(tr("Downloading OSM notes..."));
Index: /trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java	(revision 9070)
@@ -57,5 +57,5 @@
         this.geoProp = geoProp;
         this.maxLevel = maxLevel;
-        this.root = new GPLevel<T>(0, new BBox(-180, -90, 180, 90), null, this);
+        this.root = new GPLevel<>(0, new BBox(-180, -90, 180, 90), null, this);
         this.lastLevelUsed = root;
     }
Index: /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 9070)
@@ -331,5 +331,5 @@
     public ImageProvider addOverlay(ImageOverlay overlay) {
         if (overlayInfo == null) {
-            overlayInfo = new LinkedList<ImageOverlay>();
+            overlayInfo = new LinkedList<>();
         }
         overlayInfo.add(overlay);
Index: /trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java	(revision 9070)
@@ -225,5 +225,5 @@
      */
     public static Collection<String> getLanguageCodes(Locale l) {
-        Collection<String> list = new LinkedList<String>();
+        Collection<String> list = new LinkedList<>();
         if (l == null)
             l = Locale.getDefault();
Index: /trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java	(revision 9070)
@@ -80,5 +80,5 @@
             throw new RuntimeException(ex);
         }
-        rlCache = new GeoPropertyIndex<Boolean>(new RLTrafficGeoProperty(), 24);
+        rlCache = new GeoPropertyIndex<>(new RLTrafficGeoProperty(), 24);
     }
 }
Index: /trunk/src/org/openstreetmap/josm/tools/Utils.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 9069)
+++ /trunk/src/org/openstreetmap/josm/tools/Utils.java	(revision 9070)
@@ -141,5 +141,5 @@
 
     public static <T> Collection<T> filter(Collection<? extends T> collection, Predicate<? super T> predicate) {
-        return new FilteredCollection<T>(collection, predicate);
+        return new FilteredCollection<>(collection, predicate);
     }