Changeset 11542 in josm

Timestamp:

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

Author:

stoecker

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/ExtrudeAction.java (modified) (2 diffs)
• actions/mapmode/ImproveWayAccuracyAction.java (modified) (2 diffs)
• actions/mapmode/ParallelWayAction.java (modified) (3 diffs)
• data/preferences/ColorProperty.java (modified) (3 diffs)

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

@@ -43 +43 @@
 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.ColorProperty;
 import org.openstreetmap.josm.gui.MainMenu;
@@ -305 +304 @@
         initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay", 200);
         initialMoveThreshold = Main.pref.getInteger("extrude.initial-move-threshold", 1);
-        mainColor = new ColorProperty(marktr("Extrude: main line"), (Color) null).get();
-        if (mainColor == null) mainColor = PaintColors.SELECTED.get();
+        mainColor = new ColorProperty(marktr("Extrude: main line"), Color.RED).get();
         helperColor = new ColorProperty(marktr("Extrude: helper line"), Color.ORANGE).get();
         helperStrokeDash = GuiHelper.getCustomizedStroke(Main.pref.get("extrude.stroke.helper-line", "1 4"));

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

@@ -36 +36 @@
 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.CachingProperty;
 import org.openstreetmap.josm.data.preferences.ColorProperty;
@@ -155 +154 @@
     @Override
     protected void readPreferences() {
-        guideColor = new ColorProperty(marktr("improve way accuracy helper line"), (Color) null).get();
-        if (guideColor == null)
-            guideColor = PaintColors.HIGHLIGHT.get();
+        guideColor = new ColorProperty(marktr("improve way accuracy helper line"), Color.RED).get();
     }
 

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());

trunk/src/org/openstreetmap/josm/data/preferences/ColorProperty.java

@@ -5 +5 @@
 import java.util.Locale;
 
+import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.ColorHelper;
 
@@ -21 +22 @@
      */
     public ColorProperty(String colName, String defaultValue) {
-        this(colName, defaultValue == null ? null : ColorHelper.html2color(defaultValue));
+        this(colName, ColorHelper.html2color(defaultValue));
     }
 
@@ -31 +32 @@
     public ColorProperty(String colName, Color defaultValue) {
         super(getColorKey(colName), defaultValue);
+        CheckParameterUtil.ensureParameterNotNull(defaultValue, "defaultValue");
         this.name = colName;
         getPreferences().registerColor(getColorKey(colName), colName);