Changeset 17659 in josm for trunk/src

Timestamp:

2021-03-24T23:04:28+01:00 (4 years ago)

Author:

simon04

Message:

fix #20233 - Session: export/import layer color

Location:

trunk/src/org/openstreetmap/josm/io/session

Files:

• SessionReader.java (modified) (3 diffs)
• SessionWriter.java (modified) (2 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;
@@ -46 +47 @@
 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;
@@ -618 +620 @@
                 }
             }
+            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);

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

@@ -44 +44 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference;
+import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
@@ -239 +240 @@
             if (!Utils.equalsEpsilon(layer.getOpacity(), 1.0)) {
                 el.setAttribute("opacity", Double.toString(layer.getOpacity()));
+            }
+            if (layer.getColor() != null) {
+                el.setAttribute("color", ColorHelper.color2html(layer.getColor()));
             }
             Set<Layer> deps = dependencies.get(layer);