Changeset 10659 in josm for trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

Timestamp:

2016-07-27T02:48:44+02:00 (9 years ago)

Author:

Don-vip

Message:

see #12472 - fix more warnings, increase maximum number of reported warnings from 100 to 1000

File:

• trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) (7 diffs)

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

@@ -13 +13 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
@@ -313 +314 @@
         Node lastNode = null;
         Way lastWay = null;
-        while (firstNode != lastNode) {
+        while (!Objects.equals(firstNode, lastNode)) {
             if (lastNode == null) lastNode = firstNode;
             for (Way way: ways) {
-                if (way == lastWay) continue;
-                if (way.firstNode() == lastNode) {
+                if (Objects.equals(way, lastWay)) continue;
+                if (Objects.equals(way.firstNode(), lastNode)) {
                     List<Node> wayNodes = way.getNodes();
                     for (int i = 0; i < wayNodes.size() - 1; i++) {
@@ -326 +327 @@
                     break;
                 }
-                if (way.lastNode() == lastNode) {
+                if (Objects.equals(way.lastNode(), lastNode)) {
                     List<Node> wayNodes = way.getNodes();
                     for (int i = wayNodes.size() - 1; i > 0; i--) {
@@ -394 +395 @@
                 if (way.isFirstLastNode(node)) continue;
                 for (Way wayOther: ways) {
-                    if (way == wayOther) continue;
+                    if (Objects.equals(way, wayOther)) continue;
                     if (node.getReferrers().contains(wayOther)) return false;
                 }
@@ -407 +408 @@
             for (Way w: ways) {
                 if (w.isClosed()) return ways.size() == 1;
-                if (w == currentWay) continue;
+                if (Objects.equals(w, currentWay)) continue;
                 if (currentWay == null) {
                     nextWay = w;
@@ -414 +415 @@
                     break;
                 }
-                if (w.firstNode() == endNode) {
+                if (Objects.equals(w.firstNode(), endNode)) {
                     nextWay = w;
                     endNode = w.lastNode();
                     break;
                 }
-                if (w.lastNode() == endNode) {
+                if (Objects.equals(w.lastNode(), endNode)) {
                     nextWay = w;
                     endNode = w.firstNode();
@@ -428 +429 @@
             used += 1;
             currentWay = nextWay;
-            if (endNode == startNode) return used == ways.size();
+            if (Objects.equals(endNode, startNode)) return used == ways.size();
         }
     }