Changeset 12987 in josm for trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.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/layer/gpx/GpxDrawHelper.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

@@ -43 +43 @@
 import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener;
 import org.openstreetmap.josm.data.gpx.WayPoint;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.MapViewState;
@@ -69 +69 @@
      * @since 10824
      */
-    public static final ColorProperty DEFAULT_COLOR = new ColorProperty(marktr("gps point"), Color.magenta);
+    public static final NamedColorProperty DEFAULT_COLOR = new NamedColorProperty(marktr("gps point"), Color.magenta);
 
     private final GpxData data;
@@ -266 +266 @@
     public Color getColor(String layerName, boolean ignoreCustom) {
         if (ignoreCustom || getColorMode(layerName) == ColorMode.NONE) {
-            return DEFAULT_COLOR.getChildColor(specName(layerName)).get();
+            return DEFAULT_COLOR.getChildColor(
+                    NamedColorProperty.COLOR_CATEGORY_LAYER,
+                    layerName,
+                    DEFAULT_COLOR.getName()).get();
         } else {
             return null;