Changeset 18287 in josm for trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

Timestamp:

2021-10-19T01:26:15+02:00 (3 years ago)

Author:

Don-vip

Message:

fix #20913 - fix handling of GPX files in sessions (patch by Bjoeni)

• revert r17659 (except for unit tests) - see #20233
  • don't save GPX track and marker colors in session file anymore, but in the GPX files as extensions (like before)
  • don't ask to save unmodified GPX file
  • don't override global color settings when individual track doesn't have a color
• ask user to save changes to GPX file when any drawing settings or marker colors have changed (currently only happens for track colors)
• save marker color values to session even when corresponding GPX layer has already been deleted
• save alpha values for GPX marker colors
• added explanation to the "overwrite GPX file" dialog
• inform user if not all files referenced by the session file are saved yet
• allow user to save all files that are not included in the *.jos/*.joz but are only referenced in the session file
• display * next to GPX layers that need to be saved (move isDirty() logic from OsmDataLayer to AbstractModifiableLayer)

File:

• trunk/src/org/openstreetmap/josm/io/session/SessionReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Color;
 import java.awt.GraphicsEnvironment;
 import java.io.BufferedInputStream;
@@ -47 +46 @@
 import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
@@ -620 +618 @@
                 }
             }
-            String colorString = el.getAttribute("color");
-            if (colorString != null) {
-                try {
-                    Color color = ColorHelper.html2color(colorString);
-                    layer.setColor(color);
-                } catch (RuntimeException ex) {
-                    Logging.warn("Cannot parse color " + colorString);
-                }
-            }
             layer.setName(names.get(entry.getKey()));
             layers.add(layer);