Changeset 9248 in josm

Timestamp:

2016-01-01T22:41:38+01:00 (8 years ago)

Author:

simon04

Message:

fix #11237 - Change default color of waypoints and GPS tracks to magenta

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• gpx/GpxDrawHelper.java (modified) (3 diffs)
• markerlayer/MarkerLayer.java (modified) (2 diffs)

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

@@ -81 +81 @@
     private int hdopAlpha;
 
+    private static final Color DEFAULT_COLOR = Color.magenta;
 
     // lookup array to draw arrows without doing any math
@@ -128 +129 @@
      */
     public Color getColor(String layerName, boolean ignoreCustom) {
-        Color c = Main.pref.getColor(marktr("gps point"), specName(layerName), Color.gray);
+        Color c = Main.pref.getColor(marktr("gps point"), specName(layerName), DEFAULT_COLOR);
         return ignoreCustom || getColorMode(layerName) == ColorMode.NONE ? c : null;
     }
@@ -151 +152 @@
      **/
     public static Color getGenericColor() {
-        return Main.pref.getColor(marktr("gps point"), Color.gray);
+        return Main.pref.getColor(marktr("gps point"), DEFAULT_COLOR);
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -74 +74 @@
     public AudioMarker syncAudioMarker;
 
+    private static final Color DEFAULT_COLOR = Color.magenta;
+
     /**
      * Constructs a new {@code MarkerLayer}.
@@ -190 +192 @@
     public Color getColor(boolean ignoreCustom) {
         String name = getName();
-        return Main.pref.getColor(marktr("gps marker"), name != null ? "layer "+name : null, Color.gray);
+        return Main.pref.getColor(marktr("gps marker"), name != null ? "layer "+name : null, DEFAULT_COLOR);
     }
 
     /* for preferences */
     public static Color getGenericColor() {
-        return Main.pref.getColor(marktr("gps marker"), Color.gray);
+        return Main.pref.getColor(marktr("gps marker"), DEFAULT_COLOR);
     }