Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.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/data/osm/MultipolygonCreate.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/data/osm/MultipolygonCreate.java

@@ -49 +49 @@
          */
         private List<Node> getNodes() {
-            List<Node> nodes = new ArrayList<Node>();
+            List<Node> nodes = new ArrayList<>();
 
             for(int waypos = 0; waypos < this.ways.size(); waypos ++) {
@@ -85 +85 @@
             this.outerWay = _pol;
             this.level = _level;
-            this.innerWays = new ArrayList<JoinedPolygon>();
+            this.innerWays = new ArrayList<>();
         }
     }
@@ -98 +98 @@
 
     public MultipolygonCreate(){
-        this.outerWays = new ArrayList<JoinedPolygon>(0);
-        this.innerWays = new ArrayList<JoinedPolygon>(0);
+        this.outerWays = new ArrayList<>(0);
+        this.innerWays = new ArrayList<>(0);
     }
 
@@ -109 +109 @@
      */
     public String makeFromWays(Collection<Way> ways){
-        List<JoinedPolygon> joinedWays = new ArrayList<JoinedPolygon>();
+        List<JoinedPolygon> joinedWays = new ArrayList<>();
 
         //collect ways connecting to each node.
-        MultiMap<Node, Way> nodesWithConnectedWays = new MultiMap<Node, Way>();
-        Set<Way> usedWays = new HashSet<Way>();
+        MultiMap<Node, Way> nodesWithConnectedWays = new MultiMap<>();
+        Set<Way> usedWays = new HashSet<>();
 
         for(Way w: ways) {
@@ -139 +139 @@
 
             Node startNode = startWay.firstNode();
-            List<Way> collectedWays = new ArrayList<Way>();
-            List<Boolean> collectedWaysReverse = new ArrayList<Boolean>();
+            List<Way> collectedWays = new ArrayList<>();
+            List<Boolean> collectedWaysReverse = new ArrayList<>();
             Way curWay = startWay;
             Node prevNode = startNode;
@@ -197 +197 @@
         }
 
-        this.outerWays = new ArrayList<JoinedPolygon>(0);
-        this.innerWays = new ArrayList<JoinedPolygon>(0);
+        this.outerWays = new ArrayList<>(0);
+        this.innerWays = new ArrayList<>(0);
 
         //take every other level
@@ -221 +221 @@
 
         //TODO: bad performance for deep nesting...
-        List<PolygonLevel> result = new ArrayList<PolygonLevel>();
+        List<PolygonLevel> result = new ArrayList<>();
 
         for (JoinedPolygon outerWay : boundaryWays) {
 
             boolean outerGood = true;
-            List<JoinedPolygon> innerCandidates = new ArrayList<JoinedPolygon>();
+            List<JoinedPolygon> innerCandidates = new ArrayList<>();
 
             for (JoinedPolygon innerWay : boundaryWays) {