Changeset 10662 in josm

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

Location:

trunk

Files:

• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/AlignInCircleAction.java (modified) (7 diffs)
• src/org/openstreetmap/josm/actions/CombineWayAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/SimplifyWayAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (5 diffs)
• src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (6 diffs)
• src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/conflict/Conflict.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/Relation.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/RelationMember.java (modified) (1 diff)
• src/org/openstreetmap/josm/data/osm/Way.java (modified) (9 diffs)
• src/org/openstreetmap/josm/data/osm/history/HistoryWay.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java (modified) (2 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/AudioPlayer.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/Geometry.java (modified) (6 diffs)

trunk/build.xml

@@ -265 +265 @@
             <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
             <compilerarg value="-XDignore.symbol.file"/>
+            <compilerarg value="-Xep:ReferenceEquality:OFF"/>
             <compilerarg line="-Xmaxwarns 1000"/>
         </javac>
@@ -287 +288 @@
             <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
             <compilerarg value="-XDignore.symbol.file"/>
+            <compilerarg value="-Xep:ReferenceEquality:OFF"/>
             <compilerarg line="-Xmaxwarns 1000"/>
         </javac>

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

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

@@ -295 +295 @@
 
         public boolean isSuccessorOf(NodePair other) {
-            return Objects.equals(other.getB(), a);
+            return other.getB() == a;
         }
 
         public boolean isPredecessorOf(NodePair other) {
-            return Objects.equals(b, other.getA());
+            return b == other.getA();
         }
 
@@ -323 +323 @@
          */
         public boolean contains(Node n) {
-            return Objects.equals(a, n) || Objects.equals(b, n);
+            return a == n || b == n;
         }
 

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

@@ -14 +14 @@
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
@@ -244 +243 @@
         } else {
             // Simplify segment
-            if (simplifiedNodes.isEmpty() || !Objects.equals(simplifiedNodes.get(simplifiedNodes.size()-1), fromN)) {
+            if (simplifiedNodes.isEmpty() || simplifiedNodes.get(simplifiedNodes.size()-1) != fromN) {
                 simplifiedNodes.add(fromN);
             }
-            if (!Objects.equals(fromN, toN)) {
+            if (fromN != toN) {
                 simplifiedNodes.add(toN);
             }

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;
@@ -445 +444 @@
 
         if (wayChunks.size() < 2) {
-            if (Objects.equals(wayChunks.get(0).get(0), wayChunks.get(0).get(wayChunks.get(0).size() - 1))) {
+            if (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."))
@@ -570 +569 @@
             List<RelationMember> relationMembers = r.getMembers();
             for (RelationMember rm: relationMembers) {
-                if (rm.isWay() && Objects.equals(rm.getMember(), way)) {
+                if (rm.isWay() && rm.getMember() == way) {
                     boolean insert = true;
                     if ("restriction".equals(type) || "destination_sign".equals(type)) {
@@ -631 +630 @@
                             if ((ir - k >= 0) && relationMembers.get(ir - k).isWay()) {
                                 Way w = relationMembers.get(ir - k).getWay();
-                                if (Objects.equals(w.lastNode(), way.firstNode()) || Objects.equals(w.firstNode(), way.firstNode())) {
+                                if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
                                     backwards = Boolean.FALSE;
-                                } else if (Objects.equals(w.firstNode(), way.lastNode()) || Objects.equals(w.lastNode(), way.lastNode())) {
+                                } else if ((w.firstNode() == way.lastNode()) || w.lastNode() == way.lastNode()) {
                                     backwards = Boolean.TRUE;
                                 }
@@ -640 +639 @@
                             if ((ir + k < relationMembers.size()) && relationMembers.get(ir + k).isWay()) {
                                 Way w = relationMembers.get(ir + k).getWay();
-                                if (Objects.equals(w.lastNode(), way.firstNode()) || Objects.equals(w.firstNode(), way.firstNode())) {
+                                if ((w.lastNode() == way.firstNode()) || w.firstNode() == way.firstNode()) {
                                     backwards = Boolean.TRUE;
-                                } else if (Objects.equals(w.firstNode(), way.lastNode()) || Objects.equals(w.lastNode(), way.lastNode())) {
+                                } else if ((w.firstNode() == way.lastNode()) || w.lastNode() == way.lastNode()) {
                                     backwards = Boolean.FALSE;
                                 }

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;

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -1033 +1033 @@
                 if (ref instanceof Relation && !ref.isIncomplete() && !ref.isDeleted()) {
                     for (RelationMember m : ((Relation) ref).getMembers()) {
-                        if (osm.equals(m.getMember())) {
+                        if (m.getMember() == osm) {
                             String testRole = m.getRole();
                             if (role.equals(testRole == null ? "" : testRole))

trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java

@@ -48 +48 @@
 
     public boolean isMatchingMy(OsmPrimitive my) {
-        return Objects.equals(this.my, my);
+        return this.my == my;
     }
 
     public boolean isMatchingTheir(OsmPrimitive their) {
-        return Objects.equals(this.their, their);
+        return this.their == their;
     }
 

trunk/src/org/openstreetmap/josm/data/imagery/ImageryLayerInfo.java

@@ -334 +334 @@
      */
     public String getUniqueId(ImageryInfo info) {
-        if (info.getId() != null && info.equals(layerIds.get(info.getId()))) {
+        if (info.getId() != null && layerIds.get(info.getId()) == info) {
             return info.getId();
         }

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

@@ -9 +9 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Set;
 
@@ -117 +116 @@
             RelationMember originalMember = members[index];
             members[index] = member;
-            if (!Objects.equals(originalMember.getMember(), member.getMember())) {
+            if (originalMember.getMember() != member.getMember()) {
                 member.getMember().addReferrer(this);
                 member.getMember().clearCachedStyle();

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

@@ -161 +161 @@
      */
     public boolean refersTo(OsmPrimitive primitive) {
-        return Objects.equals(member, primitive);
+        return member == primitive;
     }
 

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;

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java

@@ -8 +8 @@
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -138 +137 @@
      */
     public boolean isClosed() {
-        return getNumNodes() >= 3 && Objects.equals(nodeIds.get(0), nodeIds.get(nodeIds.size()-1));
+        return getNumNodes() >= 3 && nodeIds.get(0) == nodeIds.get(nodeIds.size()-1);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintSettings.java

@@ -3 +3 @@
 
 import java.awt.Color;
-import java.util.Objects;
 
 import org.openstreetmap.josm.Main;
@@ -84 +83 @@
         taggedColor = PaintColors.TAGGED.get();
         connectionColor = PaintColors.CONNECTION.get();
-        if (!Objects.equals(taggedColor, nodeColor)) {
+        if (taggedColor != nodeColor) {
             taggedConnectionColor = taggedColor;
         } else {

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -34 +34 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
-import java.util.Objects;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
@@ -1147 +1146 @@
         /* find the "direct" nodes before the via node */
         Node fromNode;
-        if (Objects.equals(fromWay.firstNode(), via)) {
+        if (fromWay.firstNode() == via) {
             fromNode = fromWay.getNode(1);
         } else {
@@ -1442 +1441 @@
             GeneralPath highlightSegs = null;
             for (WaySegment ws : highlightWaySegments) {
-                if (!Objects.equals(ws.way, way) || ws.lowerIndex < offset) {
+                if (ws.way != way || ws.lowerIndex < offset) {
                     continue;
                 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/relations/Multipolygon.java

@@ -11 +11 @@
 import java.util.Iterator;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
 
@@ -299 +298 @@
                 }
             }
-            if (nodes.size() >= 3 && Objects.equals(nodes.get(0), nodes.get(nodes.size() - 1))) {
+            if (nodes.size() >= 3 && nodes.get(0) == nodes.get(nodes.size() - 1)) {
                 poly.closePath();
             }
@@ -549 +548 @@
                             if (nodes == null) {
                                 nl = w.getNodesCount()-1;
-                                if (Objects.equals(w.getNode(nl), c.getNode(0))) {
+                                if (w.getNode(nl) == c.getNode(0)) {
                                     mode = 21;
-                                } else if (Objects.equals(w.getNode(nl), c.getNode(cl))) {
+                                } else if (w.getNode(nl) == c.getNode(cl)) {
                                     mode = 22;
-                                } else if (Objects.equals(w.getNode(0), c.getNode(0))) {
+                                } else if (w.getNode(0) == c.getNode(0)) {
                                     mode = 11;
-                                } else if (Objects.equals(w.getNode(0), c.getNode(cl))) {
+                                } else if (w.getNode(0) == c.getNode(cl)) {
                                     mode = 12;
                                 }
                             } else {
                                 nl = nodes.size()-1;
-                                if (Objects.equals(nodes.get(nl), c.getNode(0))) {
+                                if (nodes.get(nl) == c.getNode(0)) {
                                     mode = 21;
-                                } else if (Objects.equals(nodes.get(0), c.getNode(cl))) {
+                                } else if (nodes.get(0) == c.getNode(cl)) {
                                     mode = 12;
-                                } else if (Objects.equals(nodes.get(0), c.getNode(0))) {
+                                } else if (nodes.get(0) == c.getNode(0)) {
                                     mode = 11;
-                                } else if (Objects.equals(nodes.get(nl), c.getNode(cl))) {
+                                } else if (nodes.get(nl) == c.getNode(cl)) {
                                     mode = 22;
                                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -692 +692 @@
                     int i = 1;
                     for (RelationMember m : r.getMembers()) {
-                        if (primitive.equals(m.getMember())) {
+                        if (m.getMember() == primitive) {
                             mi.add(m, i);
                         }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -678 +678 @@
                 for (int i = 0; i < tagData.getRowCount(); ++i) {
                     if (item.getValue().equals(tagData.getValueAt(i, 0) /* sic! do not use getDataKey*/)) {
-                        if (item.equals(itemToSelect)) {
+                        if (itemToSelect == item) {
                             itemToSelect = null;
                         }

trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java

@@ -27 +27 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -660 +659 @@
             @Override
             public boolean isDataFlavorSupported(DataFlavor flavor) {
-                return Objects.equals(flavors[0], flavor);
+                return flavors[0] == flavor;
             }
         }

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

@@ -7 +7 @@
 import java.io.IOException;
 import java.net.URL;
-import java.util.Objects;
 
 import javax.sound.sampled.AudioFormat;
@@ -298 +297 @@
                             double offset = command.offset();
                             speed = command.speed();
-                            if (!Objects.equals(playingUrl, command.url()) ||
+                            if (playingUrl != command.url() ||
                                     stateChange != State.PAUSED ||
                                     offset != 0) {

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;
 
@@ -116 +115 @@
                         int commonCount = 0;
                         //test if we have common nodes to add.
-                        if (Objects.equals(seg1Node1, seg2Node1) || Objects.equals(seg1Node1, seg2Node2)) {
+                        if (seg1Node1 == seg2Node1 || seg1Node1 == seg2Node2) {
                             commonCount++;
 
@@ -128 +127 @@
                         }
 
-                        if (Objects.equals(seg1Node2, seg2Node1) || Objects.equals(seg1Node2, seg2Node2)) {
+                        if (seg1Node2 == seg2Node1 || seg1Node2 == seg2Node2) {
                             commonCount++;
 
@@ -190 +189 @@
                                 intersectionNodes.add(intNode);
 
-                                if (Objects.equals(intNode, newNode)) {
+                                if (intNode == newNode) {
                                     cmds.add(new AddCommand(intNode));
                                 }
@@ -703 +702 @@
     public static boolean isClockwise(List<Node> nodes) {
         int nodesCount = nodes.size();
-        if (nodesCount < 3 || !Objects.equals(nodes.get(0), nodes.get(nodesCount - 1))) {
+        if (nodesCount < 3 || nodes.get(0) != nodes.get(nodesCount - 1)) {
             throw new IllegalArgumentException("Way must be closed to check orientation.");
         }
@@ -992 +991 @@
         double perimeter = 0;
         if (!nodes.isEmpty()) {
-            boolean closed = Objects.equals(nodes.get(0), nodes.get(nodes.size() - 1));
+            boolean closed = 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());