Changeset 17579 in josm for trunk

Timestamp:

2021-03-17T15:10:20+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20598 - Add method to indicate that a temporary copy has been updated, fix broken tests (patch by taylor.smock)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/ImageData.java (modified) (1 diff)
• data/gpx/GpxImageCorrelation.java (modified) (2 diffs)
• data/gpx/GpxImageEntry.java (modified) (3 diffs)
• gui/layer/geoimage/ImageEntry.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/ImageData.java

@@ -60 +60 @@
             Collections.sort(data);
             this.data = data;
+            this.data.forEach(image -> image.setDataSet(this));
         } else {
             this.data = new ArrayList<>();
         }
         this.geoImages.addAll(this.data);
-        data.forEach(image -> image.setDataSet(this));
         selectedImagesIndex.add(-1);
     }

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

@@ -241 +241 @@
                     curTmp.setGpsTime(new Date(curImg.getExifTime().getTime() - offset));
                     curTmp.flagNewGpsData();
+                    curImg.tmpUpdated();
+
                     ret++;
                 }
@@ -265 +267 @@
                     curTmp.setGpsTime(new Date(curImg.getExifTime().getTime() - offset));
                     curTmp.flagNewGpsData();
+                    curImg.tmpUpdated();
 
                     ret++;

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

@@ -509 +509 @@
             tmp = null;
         }
+        tmpUpdated();
     }
 
@@ -517 +518 @@
     public void discardTmp() {
         tmp = null;
+        tmpUpdated();
     }
 
@@ -548 +550 @@
         isNewGpsData = true;
    }
+
+    /**
+     * Indicate that the temporary copy has been updated. Mostly used to prevent UI issues.
+     * By default, this is a no-op. Override when needed in subclasses.
+     * @since 17579
+     */
+    protected void tmpUpdated() {
+        // No-op by default
+    }
 
     @Override

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

@@ -33 +33 @@
         super(other);
         thumbnail = other.thumbnail;
+        dataSet = other.dataSet;
     }
 
@@ -78 +79 @@
 
     @Override
-    public void applyTmp() {
-        super.applyTmp();
-        if (this.dataSet != null) {
-            this.dataSet.fireNodeMoved(this);
-        }
-    }
-
-    @Override
-    public void discardTmp() {
-        super.discardTmp();
+    protected void tmpUpdated() {
+        super.tmpUpdated();
         if (this.dataSet != null) {
             this.dataSet.fireNodeMoved(this);
@@ -123 +116 @@
             return false;
         ImageEntry other = (ImageEntry) obj;
-        return Objects.equals(thumbnail, other.thumbnail);
+        return Objects.equals(thumbnail, other.thumbnail) && Objects.equals(dataSet, other.dataSet);
     }
 }