Changeset 15629 in josm

Timestamp:

2020-01-04T19:40:53+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #18511 - Remove GpxExtension parent from equals contract (patch by Bjoeni)

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/gpx/GpxExtension.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/gpx/GpxExtensionTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/gpx/GpxExtension.java

@@ -234 +234 @@
     @Override
     public int hashCode() {
-        return Objects.hash(prefix, key, value, attr, parent, visible, super.hashCode());
+        return Objects.hash(prefix, key, value, attr, visible, super.hashCode());
     }
 
@@ -270 +270 @@
         } else if (!attr.equals(other.attr))
             return false;
-        if (parent == null) {
-            if (other.parent != null)
-                return false;
-        } else if (!parent.equals(other.parent))
-            return false;
         return true;
     }

trunk/test/unit/org/openstreetmap/josm/data/gpx/GpxExtensionTest.java

@@ -39 +39 @@
         EqualsVerifier.forClass(GpxExtension.class).usingGetClass()
         .suppress(Warning.NONFINAL_FIELDS)
-        .withIgnoredFields("qualifiedName")
+        .withIgnoredFields("qualifiedName", "parent")
         .withPrefabValues(GpxExtensionCollection.class, new GpxExtensionCollection(), col)
         .verify();