Ticket #20598: 20598.3.patch

src/org/openstreetmap/josm/gui/layer/geoimage/ImageEntry.java

@@ -105 +105 @@
 
     @Override
     public int hashCode() {
-        return Objects.hash(super.hashCode(), thumbnail);
+        return Objects.hash(super.hashCode(), thumbnail, dataSet);
     }
 
     @Override

test/unit/org/openstreetmap/josm/gui/layer/geoimage/ImageEntryTest.java

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
+import java.util.ArrayList;
 
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.ImageData;
 import org.openstreetmap.josm.data.gpx.GpxImageEntry;
 
 import nl.jqno.equalsverifier.EqualsVerifier;
@@ -34 +36 @@
     void testEqualsContract() {
         TestUtils.assumeWorkingEqualsVerifier();
         EqualsVerifier.forClass(ImageEntry.class).usingGetClass()
-            .suppress(Warning.NONFINAL_FIELDS)
-            .withPrefabValues(GpxImageEntry.class, new GpxImageEntry(new File("foo")), new GpxImageEntry(new File("bar")))
+          .suppress(Warning.NONFINAL_FIELDS)
+          .withPrefabValues(GpxImageEntry.class,
+            new GpxImageEntry(new File("foo")),
+            new GpxImageEntry(new File("bar")))
+          .withPrefabValues(ImageData.class, new ImageData(), new ImageData(new ArrayList<>()))
             .verify();
     }
 }