Changeset 18399 in josm

Timestamp:

2022-03-13T13:40:25+01:00 (2 years ago)

Author:

stoecker

Message:

fix #21922 - patch by Bjoeni - GPX file marked as modified when saving session

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxData.java (modified) (3 diffs)
• data/gpx/GpxTrack.java (modified) (3 diffs)
• io/GpxWriter.java (modified) (1 diff)

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

@@ -1093 +1093 @@
     }
 
+    /**
+     * Put a key / value pair as a new attribute. Overrides key / value pair with the same key (if present).
+     *
+     * @param key the key
+     * @param value the value
+     */
     @Override
     public void put(String key, Object value) {
+        put(key, value, true);
+    }
+
+    /**
+     * Put a key / value pair as a new attribute. Overrides key / value pair with the same key (if present).
+     * Only sets the modified state when setModified is true.
+     *
+     * @param key the key
+     * @param value the value
+     * @param setModified whether to change the modified state
+     * @since 18399
+     */
+    public void put(String key, Object value, boolean setModified) {
         super.put(key, value);
-        invalidate();
+        fireInvalidate(setModified);
     }
 
@@ -1133 +1152 @@
 
     private void fireInvalidate(boolean setModified) {
+        if (setModified) {
+            setModified(true);
+        }
         if (updating || initializing) {
             suppressedInvalidate = true;
         } else {
-            if (setModified) {
-                setModified(true);
-            }
             if (listeners.hasListeners()) {
                 GpxDataChangeEvent e = new GpxDataChangeEvent(this);
@@ -1159 +1178 @@
      */
     public void endUpdate() {
-        boolean setModified = updating;
         updating = initializing = false;
         if (suppressedInvalidate) {
-            fireInvalidate(setModified);
+            fireInvalidate(false);
             suppressedInvalidate = false;
         }

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

@@ -83 +83 @@
     @Override
     public void setColor(Color color) {
-        setColorExtension(color);
+        setColorExtensionGPXD(color, true);
         colorCache = color;
     }
 
-    private void setColorExtension(Color color) {
+    private void setColorExtensionGPXD(Color color, boolean invalidate) {
         getExtensions().findAndRemove("gpxx", "DisplayColor");
         if (color == null) {
@@ -94 +94 @@
             getExtensions().addOrUpdate("gpxd", "color", String.format("#%02X%02X%02X", color.getRed(), color.getGreen(), color.getBlue()));
         }
-        fireInvalidate();
+        colorFormat = ColorFormat.GPXD;
+        if (invalidate) {
+            fireInvalidate();
+        }
     }
 
@@ -168 +171 @@
                 getExtensions().addIfNotPresent("gpxx", "TrackExtension").getExtensions().addOrUpdate("gpxx", "DisplayColor", colorString);
             } else if (cFormat == ColorFormat.GPXD) {
-                setColor(c);
+                setColorExtensionGPXD(c, false);
             }
             colorFormat = cFormat;

trunk/src/org/openstreetmap/josm/io/GpxWriter.java

@@ -124 +124 @@
             });
         }
-        data.put(META_TIME, (metaTime != null ? metaTime : Instant.now()).toString());
+        data.put(META_TIME, (metaTime != null ? metaTime : Instant.now()).toString(), false);
         data.endUpdate();