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

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

@@ -106 +106 @@
                 return;
             }
-            Set<Node> tmpNodes = new HashSet<Node>();
+            Set<Node> tmpNodes = new HashSet<>();
             for (Node n : selectedNodes) {
                 int count = 0;
@@ -165 +165 @@
      */
     private void unglueNode(ActionEvent e) {
-        LinkedList<Command> cmds = new LinkedList<Command>();
+        LinkedList<Command> cmds = new LinkedList<>();
 
         Node c = new Node(selectedNode);
@@ -274 +274 @@
             return false;
 
-        selectedNodes = new HashSet<Node>();
+        selectedNodes = new HashSet<>();
         for (OsmPrimitive p : selection) {
             if (p instanceof Node) {
@@ -307 +307 @@
         cmds.add(new AddCommand(newNode));
 
-        List<Node> nn = new ArrayList<Node>();
+        List<Node> nn = new ArrayList<>();
         for (Node pushNode : w.getNodes()) {
             if (originalNode == pushNode) {
@@ -337 +337 @@
                     if (newRel == null) {
                         newRel = new Relation(r);
-                        rolesToReAdd = new HashSet<String>();
+                        rolesToReAdd = new HashSet<>();
                     }
                     rolesToReAdd.add(rm.getRole());
@@ -359 +359 @@
      */
     private void unglueWays() {
-        LinkedList<Command> cmds = new LinkedList<Command>();
-        LinkedList<Node> newNodes = new LinkedList<Node>();
+        LinkedList<Command> cmds = new LinkedList<>();
+        LinkedList<Node> newNodes = new LinkedList<>();
 
         if (selectedWay == null) {
             Way wayWithSelectedNode = null;
-            LinkedList<Way> parentWays = new LinkedList<Way>();
+            LinkedList<Way> parentWays = new LinkedList<>();
             for (OsmPrimitive osm : selectedNode.getReferrers()) {
                 if (osm.isUsable() && osm instanceof Way) {
@@ -407 +407 @@
     private boolean unglueSelfCrossingWay() {
         // According to previous check, only one valid way through that node
-        LinkedList<Command> cmds = new LinkedList<Command>();
+        LinkedList<Command> cmds = new LinkedList<>();
         Way way = null;
         for (Way w: OsmPrimitive.getFilteredList(selectedNode.getReferrers(), Way.class))
@@ -414 +414 @@
             }
         List<Node> oldNodes = way.getNodes();
-        ArrayList<Node> newNodes = new ArrayList<Node>(oldNodes.size());
-        ArrayList<Node> addNodes = new ArrayList<Node>();
+        ArrayList<Node> newNodes = new ArrayList<>(oldNodes.size());
+        ArrayList<Node> addNodes = new ArrayList<>();
         boolean seen = false;
         for (Node n: oldNodes) {
@@ -449 +449 @@
      */
     private void unglueWays2() {
-        LinkedList<Command> cmds = new LinkedList<Command>();
-        List<Node> allNewNodes = new LinkedList<Node>();
+        LinkedList<Command> cmds = new LinkedList<>();
+        List<Node> allNewNodes = new LinkedList<>();
         Way tmpWay = selectedWay;
 
         for (Node n : selectedNodes) {
-            List<Node> newNodes = new LinkedList<Node>();
+            List<Node> newNodes = new LinkedList<>();
             tmpWay = modifyWay(n, tmpWay, cmds, newNodes);
             fixRelations(n, cmds, newNodes);
@@ -481 +481 @@
 
     protected boolean checkAndConfirmOutlyingUnglue() {
-        List<OsmPrimitive> primitives = new ArrayList<OsmPrimitive>(2 + (selectedNodes == null ? 0 : selectedNodes.size()));
+        List<OsmPrimitive> primitives = new ArrayList<>(2 + (selectedNodes == null ? 0 : selectedNodes.size()));
         if (selectedNodes != null)
             primitives.addAll(selectedNodes);