Changeset 18622 in josm

Timestamp:

2023-01-03T21:28:24+01:00 (17 months ago)

Author:

taylor.smock

Message:

Fix #22625: SOE in ImageViewer

This was fallout from reworking #21605 -- originally the code did not use
equals. Since it now uses equals, RemoteEntry either needed to be the same
(for object equality) or have an implemented equals method.

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntry.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntryTest.java (added)

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/RemoteEntry.java

@@ -331 +331 @@
         this.title = text;
     }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(this.uri, this.width, this.height, this.pos,
+                this.exifOrientation, this.elevation, this.speed, this.exifImgDir,
+                this.exifCoor, this.exifTime, this.exifGpsTime, this.gpsTime,
+                this.iptcObjectName, this.iptcCaption, this.iptcHeadline, this.iptcKeywords,
+                this.projection, this.title);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (super.equals(obj)) {
+            return true;
+        }
+        if (obj != null && obj.getClass() == this.getClass()) {
+            RemoteEntry other = this.getClass().cast(obj);
+            return Objects.equals(this.uri, other.uri)
+                    && this.height == other.height
+                    && this.width == other.width
+                    && Objects.equals(this.elevation, other.elevation)
+                    && Objects.equals(this.exifCoor, other.exifCoor)
+                    && Objects.equals(this.exifGpsTime, other.exifGpsTime)
+                    && Objects.equals(this.exifImgDir, other.exifImgDir)
+                    && Objects.equals(this.exifOrientation, other.exifOrientation)
+                    && Objects.equals(this.exifTime, other.exifTime)
+                    && Objects.equals(this.gpsTime, other.gpsTime)
+                    && Objects.equals(this.iptcCaption, other.iptcCaption)
+                    && Objects.equals(this.iptcHeadline, other.iptcHeadline)
+                    && Objects.equals(this.iptcKeywords, other.iptcKeywords)
+                    && Objects.equals(this.iptcObjectName, other.iptcObjectName)
+                    && Objects.equals(this.pos, other.pos)
+                    && Objects.equals(this.projection, other.projection)
+                    && Objects.equals(this.speed, other.speed)
+                    && Objects.equals(this.title, other.title);
+        }
+        return false;
+    }
 }