Changeset 12987 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

Timestamp:

2017-10-12T16:02:15+02:00 (7 years ago)

Author:

bastiK

Message:

see #15410 - change preferences scheme for named colors - makes runtime color name registry obsolete

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -26 +26 @@
 import org.openstreetmap.josm.actions.ExpertToggleAction;
 import org.openstreetmap.josm.data.PreferencesUtils;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.gui.layer.gpx.GpxDrawHelper;
 import org.openstreetmap.josm.gui.layer.markerlayer.Marker;
@@ -329 +330 @@
                 // ask the GPX draw for the correct color of that layer ( if there is one )
                 if (null != layerName) {
-                    color = GpxDrawHelper.DEFAULT_COLOR.getChildColor(layerName).get();
+                    color = GpxDrawHelper.DEFAULT_COLOR.getChildColor(
+                            NamedColorProperty.COLOR_CATEGORY_LAYER, layerName, GpxDrawHelper.DEFAULT_COLOR.getName()).get();
                 } else {
                     color = GpxDrawHelper.DEFAULT_COLOR.getDefaultValue();