Ticket #11237: magenta.patch

File magenta.patch, 2.5 KB (added by simon04, 10 years ago)
  • src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java

    diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java b/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
    index d0b7610..ade44d9 100644
    a b  
    7878    /** Opacity for hdop points **/
    7979    private int hdopAlpha;
    8080
     81    private static final Color DEFAULT_COLOR = Color.magenta;
     82
    8183
    8284    // lookup array to draw arrows without doing any math
    8385    private static final int ll0 = 9;
    private static String specName(String layerName) {  
    125127     * @return the color or null if the color is not constant
    126128     */
    127129    public Color getColor(String layerName, boolean ignoreCustom) {
    128         Color c = Main.pref.getColor(marktr("gps point"), specName(layerName), Color.gray);
     130        Color c = Main.pref.getColor(marktr("gps point"), specName(layerName), DEFAULT_COLOR);
    129131        return ignoreCustom || getColorMode(layerName) == ColorMode.NONE ? c : null;
    130132    }
    131133
    public ColorMode getColorMode(String layerName) {  
    148150     * @return the color
    149151     **/
    150152    public static Color getGenericColor() {
    151         return Main.pref.getColor(marktr("gps point"), Color.gray);
     153        return Main.pref.getColor(marktr("gps point"), DEFAULT_COLOR);
    152154    }
    153155
    154156    /**
  • src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

    diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
    index 42f9b82..9d4ddaa 100644
    a b  
    7272    public GpxLayer fromLayer;
    7373    private Marker currentMarker;
    7474    public AudioMarker syncAudioMarker;
     75    private static final Color DEFAULT_COLOR = Color.magenta;
    7576
    7677    /**
    7778     * Constructs a new {@code MarkerLayer}.
    public Icon getIcon() {  
    189190    @Override
    190191    public Color getColor(boolean ignoreCustom) {
    191192        String name = getName();
    192         return Main.pref.getColor(marktr("gps marker"), name != null ? "layer "+name : null, Color.gray);
     193        return Main.pref.getColor(marktr("gps marker"), name != null ? "layer "+name : null, DEFAULT_COLOR);
    193194    }
    194195
    195196    /* for preferences */
    196197    public static Color getGenericColor() {
    197         return Main.pref.getColor(marktr("gps marker"), Color.gray);
     198        return Main.pref.getColor(marktr("gps marker"), DEFAULT_COLOR);
    198199    }
    199200
    200201    @Override