Changeset 7005 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.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/gui/dialogs/relation/sort/RelationNodeMap.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/RelationNodeMap.java

@@ -32 +32 @@
 
     private static class NodesWays{
-        public final Map<Node, Set<Integer>> nodes = new TreeMap<Node, Set<Integer>>();
-        public final Map<Integer, Set<Node>> ways = new TreeMap<Integer, Set<Node>>();
+        public final Map<Node, Set<Integer>> nodes = new TreeMap<>();
+        public final Map<Integer, Set<Node>> ways = new TreeMap<>();
         public final boolean oneWay;
         public NodesWays(boolean oneWay){
@@ -53 +53 @@
      * Used to keep track of what members are done.
      */
-    private final Set<Integer> remaining = new TreeSet<Integer>();
-    private final Map<Integer, Set<Node>> remainingOneway = new TreeMap<Integer, Set<Node>>();
+    private final Set<Integer> remaining = new TreeSet<>();
+    private final Map<Integer, Set<Node>> remainingOneway = new TreeMap<>();
 
     /**
      * All members that are incomplete or not a way
      */
-    private final List<Integer> notSortable = new ArrayList<Integer>();
+    private final List<Integer> notSortable = new ArrayList<>();
 
     public static Node firstOnewayNode(RelationMember m){
@@ -109 +109 @@
         Set<Integer> ts = map.nodes.get(n);
         if (ts == null) {
-            ts = new TreeSet<Integer>();
+            ts = new TreeSet<>();
             map.nodes.put(n, ts);
         }
@@ -116 +116 @@
         Set<Node> ts2 = map.ways.get(i);
         if (ts2 == null) {
-            ts2 = new TreeSet<Node>();
+            ts2 = new TreeSet<>();
             map.ways.put(i, ts2);
         }
@@ -125 +125 @@
         Set<Integer> ts = onewayMap.nodes.get(n);
         if (ts == null) {
-            ts = new TreeSet<Integer>();
+            ts = new TreeSet<>();
             onewayMap.nodes.put(n, ts);
         }
@@ -134 +134 @@
         Set<Node> ts2 = onewayMap.ways.get(i);
         if (ts2 == null) {
-            ts2 = new TreeSet<Node>();
+            ts2 = new TreeSet<>();
             onewayMap.ways.put(i, ts2);
         }
@@ -143 +143 @@
         Set<Integer> ts = onewayReverseMap.nodes.get(n);
         if (ts == null) {
-            ts = new TreeSet<Integer>();
+            ts = new TreeSet<>();
             onewayReverseMap.nodes.put(n, ts);
         }
@@ -152 +152 @@
         Set<Node> ts2 = onewayReverseMap.ways.get(i);
         if (ts2 == null) {
-            ts2 = new TreeSet<Node>();
+            ts2 = new TreeSet<>();
             onewayReverseMap.ways.put(i, ts2);
         }
@@ -161 +161 @@
         Set<Node> ts2 = remainingOneway.get(i);
         if (ts2 == null) {
-            ts2 = new TreeSet<Node>();
+            ts2 = new TreeSet<>();
             remainingOneway.put(i, ts2);
         }
@@ -233 +233 @@
     private Integer popBackwardOnewayPart(int way){
         if (lastOnewayNode != null) {
-            TreeSet<Node> nodes = new TreeSet<Node>();
+            TreeSet<Node> nodes = new TreeSet<>();
             if (onewayReverseMap.ways.containsKey(way)) {
                 nodes.addAll(onewayReverseMap.ways.get(way));