Changeset 12987 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.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/actions/mapmode/DrawAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -48 +48 @@
 import org.openstreetmap.josm.data.osm.visitor.paint.ArrowPaintHelper;
 import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
-import org.openstreetmap.josm.data.preferences.AbstractToStringProperty;
+import org.openstreetmap.josm.data.preferences.AbstractProperty;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.CachingProperty;
-import org.openstreetmap.josm.data.preferences.ColorProperty;
 import org.openstreetmap.josm.data.preferences.DoubleProperty;
+import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.data.preferences.StrokeProperty;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -110 +110 @@
 
     static final CachingProperty<Color> SNAP_HELPER_COLOR
-            = new ColorProperty(marktr("draw angle snap"), Color.ORANGE).cached();
+            = new NamedColorProperty(marktr("draw angle snap"), Color.ORANGE).cached();
 
     static final CachingProperty<Color> HIGHLIGHT_COLOR
-            = new ColorProperty(marktr("draw angle snap highlight"), ORANGE_TRANSPARENT).cached();
-
-    static final AbstractToStringProperty<Color> RUBBER_LINE_COLOR
+            = new NamedColorProperty(marktr("draw angle snap highlight"), ORANGE_TRANSPARENT).cached();
+
+    static final AbstractProperty<Color> RUBBER_LINE_COLOR
             = PaintColors.SELECTED.getProperty().getChildColor(marktr("helper line"));