Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/data/validation/util

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use diamond operator where applicable

Location:

trunk/src/org/openstreetmap/josm/data/validation/util

Files:

• AggregatePrimitivesVisitor.java (modified) (1 diff)
• Entities.java (modified) (1 diff)
• ValUtil.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/data/validation/util/AggregatePrimitivesVisitor.java

@@ -21 +21 @@
 public class AggregatePrimitivesVisitor extends AbstractVisitor {
     /** Aggregated data */
-    final Collection<OsmPrimitive> aggregatedData = new HashSet<OsmPrimitive>();
+    final Collection<OsmPrimitive> aggregatedData = new HashSet<>();
 
     /**

trunk/src/org/openstreetmap/josm/data/validation/util/Entities.java

@@ -386 +386 @@
                         if(mapNameToValue == null)
                         {
-                            mapNameToValue = new HashMap<String, String>();
+                            mapNameToValue = new HashMap<>();
                             for (String[] pair : ARRAY)
                                 mapNameToValue.put(pair[0], pair[1]);

trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java

@@ -40 +40 @@
         Node n2 = w.getNode(w.getNodesCount() - 1);
 
-        List<List<Way>> cells = new ArrayList<List<Way>>(2);
-        Set<Point2D> cellNodes = new HashSet<Point2D>();
+        List<List<Way>> cells = new ArrayList<>(2);
+        Set<Point2D> cellNodes = new HashSet<>();
         Point2D cell;
 
@@ -55 +55 @@
         List<Way> ways = cellWays.get(cell);
         if (ways == null) {
-            ways = new ArrayList<Way>();
+            ways = new ArrayList<>();
             cellWays.put(cell, ways);
         }
@@ -66 +66 @@
             ways = cellWays.get( cell );
             if (ways == null) {
-                ways = new ArrayList<Way>();
+                ways = new ArrayList<>();
                 cellWays.put(cell, ways);
             }
@@ -84 +84 @@
             ways = cellWays.get(cell);
             if (ways == null) {
-                ways = new ArrayList<Way>();
+                ways = new ArrayList<>();
                 cellWays.put(cell, ways);
             }
@@ -96 +96 @@
             ways = cellWays.get(cell);
             if (ways == null) {
-                ways = new ArrayList<Way>();
+                ways = new ArrayList<>();
                 cellWays.put(cell, ways);
             }
@@ -134 +134 @@
         CheckParameterUtil.ensureParameterNotNull(en1, "en1");
         CheckParameterUtil.ensureParameterNotNull(en2, "en2");
-        List<Point2D> cells = new ArrayList<Point2D>();
+        List<Point2D> cells = new ArrayList<>();
         double x0 = en1.east() * gridDetail;
         double x1 = en2.east() * gridDetail;