Changeset 10656 in josm for trunk/src/org/openstreetmap/josm/tools/Geometry.java

Timestamp:

2016-07-27T01:09:02+02:00 (8 years ago)

Author:

Don-vip

Message:

see #12472 - fix warning "ReferenceEquality"

File:

• trunk/src/org/openstreetmap/josm/tools/Geometry.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -15 +15 @@
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
@@ -115 +116 @@
                         int commonCount = 0;
                         //test if we have common nodes to add.
-                        if (seg1Node1 == seg2Node1 || seg1Node1 == seg2Node2) {
+                        if (Objects.equals(seg1Node1, seg2Node1) || Objects.equals(seg1Node1, seg2Node2)) {
                             commonCount++;
 
@@ -127 +128 @@
                         }
 
-                        if (seg1Node2 == seg2Node1 || seg1Node2 == seg2Node2) {
+                        if (Objects.equals(seg1Node2, seg2Node1) || Objects.equals(seg1Node2, seg2Node2)) {
                             commonCount++;
 
@@ -189 +190 @@
                                 intersectionNodes.add(intNode);
 
-                                if (intNode == newNode) {
+                                if (Objects.equals(intNode, newNode)) {
                                     cmds.add(new AddCommand(intNode));
                                 }
@@ -702 +703 @@
     public static boolean isClockwise(List<Node> nodes) {
         int nodesCount = nodes.size();
-        if (nodesCount < 3 || nodes.get(0) != nodes.get(nodesCount - 1)) {
+        if (nodesCount < 3 || !Objects.equals(nodes.get(0), nodes.get(nodesCount - 1))) {
             throw new IllegalArgumentException("Way must be closed to check orientation.");
         }
@@ -990 +991 @@
         double perimeter = 0;
         if (!nodes.isEmpty()) {
-            boolean closed = nodes.get(0) == nodes.get(nodes.size() - 1);
+            boolean closed = Objects.equals(nodes.get(0), nodes.get(nodes.size() - 1));
             int numSegments = closed ? nodes.size() - 1 : nodes.size();
             EastNorth p1 = projection == null ? nodes.get(0).getEastNorth() : projection.latlon2eastNorth(nodes.get(0).getCoor());