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

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

@@ -9 +9 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
@@ -89 +88 @@
         for (int i = 0; i < count && count > 2;) {
             Node n = nodes.get(i);
-            if (Objects.equals(last, n)) {
+            if (last == n) {
                 nodes.remove(i);
                 --count;
@@ -362 +361 @@
         boolean locked = writeLock();
         try {
-            boolean closed = Objects.equals(lastNode(), n) && Objects.equals(firstNode(), n);
+            boolean closed = lastNode() == n && firstNode() == n;
             int i;
             List<Node> copy = getNodes();
@@ -371 +370 @@
             if (closed && i > 2) {
                 copy.add(copy.get(0));
-            } else if (i >= 2 && i <= 3 && Objects.equals(copy.get(0), copy.get(i-1))) {
+            } else if (i >= 2 && i <= 3 && copy.get(0) == copy.get(i-1)) {
                 copy.remove(i-1);
             }
@@ -402 +401 @@
             if (closed && i > 2) {
                 copy.add(copy.get(0));
-            } else if (i >= 2 && i <= 3 && Objects.equals(copy.get(0), copy.get(i-1))) {
+            } else if (i >= 2 && i <= 3 && copy.get(0) == copy.get(i-1)) {
                 copy.remove(i-1);
             }
@@ -495 +494 @@
 
         Node[] nodes = this.nodes;
-        return nodes.length >= 3 && Objects.equals(nodes[nodes.length-1], nodes[0]);
+        return nodes.length >= 3 && nodes[nodes.length-1] == nodes[0];
     }
 
@@ -508 +507 @@
             Node distinctNode = null;
             for (int i = 1; i < nodes.length-1; i++) {
-                if (distinctNode == null && !Objects.equals(nodes[i], nodes[0])) {
+                if (distinctNode == null && nodes[i] != nodes[0]) {
                     distinctNode = nodes[i];
-                } else if (distinctNode != null && !Objects.equals(nodes[i], nodes[0]) && !Objects.equals(nodes[i], distinctNode)) {
+                } else if (distinctNode != null && nodes[i] != nodes[0] && nodes[i] != distinctNode) {
                     return true;
                 }
@@ -551 +550 @@
         Node[] nodes = this.nodes;
         if (isIncomplete() || nodes.length == 0) return false;
-        return Objects.equals(n, nodes[0]) || Objects.equals(n, nodes[nodes.length -1]);
+        return n == nodes[0] || n == nodes[nodes.length -1];
     }
 
@@ -564 +563 @@
         if (isIncomplete() || nodes.length <= 2) return false;
         /* circular ways have only inner nodes, so return true for them! */
-        if (Objects.equals(n, nodes[0]) && Objects.equals(n, nodes[nodes.length-1])) return true;
+        if (n == nodes[0] && n == nodes[nodes.length-1]) return true;
         for (int i = 1; i < nodes.length - 1; ++i) {
-            if (Objects.equals(nodes[i], n)) return true;
+            if (nodes[i] == n) return true;
         }
         return false;