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

Timestamp:

2016-07-27T02:48:44+02:00 (10 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/SplitWayAction.java (modified) (5 diffs)

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

@@ -18 +18 @@
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -444 +445 @@
 
         if (wayChunks.size() < 2) {
-            if (wayChunks.get(0).get(0) == wayChunks.get(0).get(wayChunks.get(0).size() - 1)) {
+            if (Objects.equals(wayChunks.get(0).get(0), wayChunks.get(0).get(wayChunks.get(0).size() - 1))) {
                 new Notification(
                         tr("You must select two or more nodes to split a circular way."))
@@ -569 +570 @@
             List<RelationMember> relationMembers = r.getMembers();
             for (RelationMember rm: relationMembers) {
-                if (rm.isWay() && rm.getMember() == way) {
+                if (rm.isWay() && Objects.equals(rm.getMember(), way)) {
                     boolean insert = true;
                     if ("restriction".equals(type) || "destination_sign".equals(type)) {
@@ -630 +631 @@
                             if ((ir - k >= 0) && relationMembers.get(ir - k).isWay()) {
                                 Way w = relationMembers.get(ir - k).getWay();
-                                if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
+                                if (Objects.equals(w.lastNode(), way.firstNode()) || Objects.equals(w.firstNode(), way.firstNode())) {
                                     backwards = Boolean.FALSE;
-                                } else if ((w.firstNode() == way.lastNode()) || w.lastNode() == way.lastNode()) {
+                                } else if (Objects.equals(w.firstNode(), way.lastNode()) || Objects.equals(w.lastNode(), way.lastNode())) {
                                     backwards = Boolean.TRUE;
                                 }
@@ -639 +640 @@
                             if ((ir + k < relationMembers.size()) && relationMembers.get(ir + k).isWay()) {
                                 Way w = relationMembers.get(ir + k).getWay();
-                                if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
+                                if (Objects.equals(w.lastNode(), way.firstNode()) || Objects.equals(w.firstNode(), way.firstNode())) {
                                     backwards = Boolean.TRUE;
-                                } else if ((w.firstNode() == way.lastNode()) || w.lastNode() == way.lastNode()) {
+                                } else if (Objects.equals(w.firstNode(), way.lastNode()) || Objects.equals(w.lastNode(), way.lastNode())) {
                                     backwards = Boolean.FALSE;
                                 }