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

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

@@ -72 +72 @@
      * Remember movements, so the user can later undo it for certain nodes
      */
-    private static final Map<Node, EastNorth> rememberMovements = new HashMap<Node, EastNorth>();
+    private static final Map<Node, EastNorth> rememberMovements = new HashMap<>();
 
     /**
@@ -98 +98 @@
             if (!isEnabled())
                 return;
-            final Collection<Command> commands = new LinkedList<Command>();
+            final Collection<Command> commands = new LinkedList<>();
             final Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
             try {
@@ -145 +145 @@
         }
 
-        final List<Node> nodeList = new ArrayList<Node>();
-        final List<WayData> wayDataList = new ArrayList<WayData>();
+        final List<Node> nodeList = new ArrayList<>();
+        final List<WayData> wayDataList = new ArrayList<>();
         final Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
 
@@ -165 +165 @@
                 if (nodeList.size() == 2 || nodeList.isEmpty()) {
                     OrthogonalizeAction.rememberMovements.clear();
-                    final Collection<Command> commands = new LinkedList<Command>();
+                    final Collection<Command> commands = new LinkedList<>();
 
                     if (nodeList.size() == 2) {  // fixed direction
@@ -202 +202 @@
      */
     private static List<List<WayData>> buildGroups(List<WayData> wayDataList) {
-        List<List<WayData>> groups = new ArrayList<List<WayData>>();
-        Set<WayData> remaining = new HashSet<WayData>(wayDataList);
+        List<List<WayData>> groups = new ArrayList<>();
+        Set<WayData> remaining = new HashSet<>(wayDataList);
         while (!remaining.isEmpty()) {
-            List<WayData> group = new ArrayList<WayData>();
+            List<WayData> group = new ArrayList<>();
             groups.add(group);
             Iterator<WayData> it = remaining.iterator();
             WayData next = it.next();
             it.remove();
-            extendGroupRec(group, next, new ArrayList<WayData>(remaining));
+            extendGroupRec(group, next, new ArrayList<>(remaining));
             remaining.removeAll(group);
         }
@@ -283 +283 @@
 
         // put the nodes of all ways in a set
-        final HashSet<Node> allNodes = new HashSet<Node>();
+        final HashSet<Node> allNodes = new HashSet<>();
         for (WayData w : wayDataList) {
             for (Node n : w.way.getNodes()) {
@@ -291 +291 @@
 
         // the new x and y value for each node
-        final HashMap<Node, Double> nX = new HashMap<Node, Double>();
-        final HashMap<Node, Double> nY = new HashMap<Node, Double>();
+        final HashMap<Node, Double> nX = new HashMap<>();
+        final HashMap<Node, Double> nY = new HashMap<>();
 
         // calculate the centroid of all nodes
@@ -314 +314 @@
         final Direction[][] ORIENTATIONS = {HORIZONTAL, VERTICAL};
         for (Direction[] orientation : ORIENTATIONS){
-            final HashSet<Node> s = new HashSet<Node>(allNodes);
+            final HashSet<Node> s = new HashSet<>(allNodes);
             int s_size = s.size();
             for (int dummy = 0; dummy < s_size; ++dummy) {
@@ -322 +322 @@
                 final Node dummy_n = s.iterator().next();     // pick arbitrary element of s
 
-                final HashSet<Node> cs = new HashSet<Node>(); // will contain each node that can be reached from dummy_n
+                final HashSet<Node> cs = new HashSet<>(); // will contain each node that can be reached from dummy_n
                 cs.add(dummy_n);                              // walking only on horizontal / vertical segments
 
@@ -381 +381 @@
 
         // rotate back and log the change
-        final Collection<Command> commands = new LinkedList<Command>();
+        final Collection<Command> commands = new LinkedList<>();
         for (Node n: allNodes) {
             EastNorth tmp = new EastNorth(nX.get(n), nY.get(n));