Changeset 10662 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

Timestamp:

2016-07-28T01:00:46+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12472, fix #13230, fix #13225, fix #13228 - disable ReferenceEquality warning + partial revert of r10656 + r10659, causes too much problems

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -28 +28 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
@@ -527 +526 @@
 
                 // User clicked last node again, finish way
-                if (Objects.equals(n0, n)) {
+                if (n0 == n) {
                     finishDrawing();
                     return;
@@ -576 +575 @@
 
                 // Add new node to way
-                if (Objects.equals(way.getNode(way.getNodesCount() - 1), n0)) {
+                if (way.getNode(way.getNodesCount() - 1) == n0) {
                     way.addNode(n);
                 } else {
@@ -818 +817 @@
         }
 
-        if (getCurrentBaseNode() == null || getCurrentBaseNode().equals(currentMouseNode))
+        if (getCurrentBaseNode() == null || getCurrentBaseNode() == currentMouseNode)
             return; // Don't create zero length way segments.
+
 
         double curHdg = Math.toDegrees(getCurrentBaseNode().getEastNorth()
@@ -904 +904 @@
     private void continueWayFromNode(Way way, Node node) {
         int n = way.getNodesCount();
-        if (Objects.equals(node, way.firstNode())) {
+        if (node == way.firstNode()) {
             currentBaseNode = node;
             if (n > 1) previousNode = way.getNode(1);
-        } else if (Objects.equals(node, way.lastNode())) {
+        } else if (node == way.lastNode()) {
             currentBaseNode = node;
             if (n > 1) previousNode = way.getNode(n-2);
@@ -944 +944 @@
             Node firstNode = w.getNode(0);
             Node lastNode = w.getNode(w.getNodesCount() - 1);
-            if ((Objects.equals(firstNode, n) || Objects.equals(lastNode, n)) && !Objects.equals(firstNode, lastNode)) {
+            if ((firstNode == n || lastNode == n) && (firstNode != lastNode)) {
                 if (way != null)
                     return null;