Changeset 10660 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2016-07-27T23:18:28+02:00 (8 years ago)

Author:

Don-vip

Message:

see #13225 - fix ImproveWayaccuracy mode (partial revert of r10656)

File:

• trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java (modified) (4 diffs)

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

@@ -1005 +1005 @@
     /**
      * Add new referrer. If referrer is already included then no action is taken
-     * @param referrer The referrer to add. Must not be null
-     * @throws NullPointerException if {@code referrer} is null
+     * @param referrer The referrer to add
      */
     protected void addReferrer(OsmPrimitive referrer) {
@@ -1012 +1011 @@
             referrers = referrer;
         } else if (referrers instanceof OsmPrimitive) {
-            if (!referrer.equals(referrers)) {
+            if (referrers != referrer) {
                 referrers = new OsmPrimitive[] {(OsmPrimitive) referrers, referrer};
             }
         } else {
             for (OsmPrimitive primitive:(OsmPrimitive[]) referrers) {
-                if (referrer.equals(primitive))
+                if (primitive == referrer)
                     return;
             }
@@ -1026 +1025 @@
     /**
      * Remove referrer. No action is taken if referrer is not registered
-     * @param referrer The referrer to remove. Must not be null
-     * @throws NullPointerException if {@code referrer} is null
+     * @param referrer The referrer to remove
      */
     protected void removeReferrer(OsmPrimitive referrer) {
         if (referrers instanceof OsmPrimitive) {
-            if (referrer.equals(referrers)) {
+            if (referrers == referrer) {
                 referrers = null;
             }
@@ -1038 +1036 @@
             int idx = -1;
             for (int i = 0; i < orig.length; i++) {
-                if (referrer.equals(orig[i])) {
+                if (orig[i] == referrer) {
                     idx = i;
                     break;