Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

Timestamp:

2014-04-26T17:39:23+02:00 (10 years ago)

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

File:

• trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -174 +174 @@
             return selectedRelations.iterator().next();
         } else {
-            final HashSet<Relation> relatedRelations = new HashSet<Relation>();
+            final HashSet<Relation> relatedRelations = new HashSet<>();
             for (final Way w : selectedWays) {
                 relatedRelations.addAll(Utils.filteredCollection(w.getReferrers(), Relation.class));
@@ -188 +188 @@
 
         // add ways of existing relation to include them in polygon analysis
-        Set<Way> ways = new HashSet<Way>(selectedWays);
+        Set<Way> ways = new HashSet<>(selectedWays);
         ways.addAll(selectedMultipolygonRelation.getMemberPrimitives(Way.class));
 
@@ -303 +303 @@
     private static void addMembers(JoinedPolygon polygon, Relation rel, String role) {
         final int count = rel.getMembersCount();
-        final HashSet<Way> ways = new HashSet<Way>(polygon.ways);
+        final HashSet<Way> ways = new HashSet<>(polygon.ways);
         for (int i = 0; i < count; i++) {
             final RelationMember m = rel.getMember(i);
@@ -325 +325 @@
      */
     public static List<Command> removeTagsFromWaysIfNeeded( Relation relation ) {
-        Map<String, String> values = new HashMap<String, String>(relation.getKeys());
-
-        List<Way> innerWays = new ArrayList<Way>();
-        List<Way> outerWays = new ArrayList<Way>();
-
-        Set<String> conflictingKeys = new TreeSet<String>();
+        Map<String, String> values = new HashMap<>(relation.getKeys());
+
+        List<Way> innerWays = new ArrayList<>();
+        List<Way> outerWays = new ArrayList<>();
+
+        Set<String> conflictingKeys = new TreeSet<>();
 
         for( RelationMember m : relation.getMembers() ) {
@@ -371 +371 @@
         values.put("area", "yes");
 
-        List<Command> commands = new ArrayList<Command>();
+        List<Command> commands = new ArrayList<>();
         boolean moveTags = Main.pref.getBoolean("multipoly.movetags", true);
 
         for (Entry<String, String> entry : values.entrySet()) {
-            List<OsmPrimitive> affectedWays = new ArrayList<OsmPrimitive>();
+            List<OsmPrimitive> affectedWays = new ArrayList<>();
             String key = entry.getKey();
             String value = entry.getValue();