Changeset 11542 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java

Timestamp:

2017-02-07T22:00:43+01:00 (9 years ago)

Author:

stoecker

Message:

null colors never worked in preferences and don't make much sense

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java (modified) (3 diffs)

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

@@ -33 +33 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.WaySegment;
-import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
 import org.openstreetmap.josm.data.preferences.AbstractToStringProperty;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
@@ -106 +105 @@
     private static final CachingProperty<Double> SNAP_DISTANCE_CHINESE  = new DoubleProperty(prefKey("snap-distance-chinese"), 1).cached();
     private static final CachingProperty<Double> SNAP_DISTANCE_NAUTICAL = new DoubleProperty(prefKey("snap-distance-nautical"), 0.1).cached();
-    private static final CachingProperty<Color> MAIN_COLOR = new ColorProperty(marktr("make parallel helper line"), (Color) null).cached();
+    private static final CachingProperty<Color> MAIN_COLOR = new ColorProperty(marktr("make parallel helper line"), Color.RED).cached();
 
     private static final CachingProperty<Map<Modifier, Boolean>> SNAP_MODIFIER_COMBO
@@ -461 +460 @@
 
             Color mainColor = MAIN_COLOR.get();
-            if (mainColor == null) {
-                mainColor = PaintColors.SELECTED.get();
-            }
-
             // FIXME: should clip the line (gets insanely slow when zoomed in on a very long line
             g.setStroke(REF_LINE_STROKE.get());