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
|
|
| 78 | 78 | /** Opacity for hdop points **/ |
| 79 | 79 | private int hdopAlpha; |
| 80 | 80 | |
| | 81 | private static final Color DEFAULT_COLOR = Color.magenta; |
| | 82 | |
| 81 | 83 | |
| 82 | 84 | // lookup array to draw arrows without doing any math |
| 83 | 85 | private static final int ll0 = 9; |
| … |
… |
private static String specName(String layerName) {
|
| 125 | 127 | * @return the color or null if the color is not constant |
| 126 | 128 | */ |
| 127 | 129 | 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); |
| 129 | 131 | return ignoreCustom || getColorMode(layerName) == ColorMode.NONE ? c : null; |
| 130 | 132 | } |
| 131 | 133 | |
| … |
… |
public ColorMode getColorMode(String layerName) {
|
| 148 | 150 | * @return the color |
| 149 | 151 | **/ |
| 150 | 152 | public static Color getGenericColor() { |
| 151 | | return Main.pref.getColor(marktr("gps point"), Color.gray); |
| | 153 | return Main.pref.getColor(marktr("gps point"), DEFAULT_COLOR); |
| 152 | 154 | } |
| 153 | 155 | |
| 154 | 156 | /** |
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
|
|
| 72 | 72 | public GpxLayer fromLayer; |
| 73 | 73 | private Marker currentMarker; |
| 74 | 74 | public AudioMarker syncAudioMarker; |
| | 75 | private static final Color DEFAULT_COLOR = Color.magenta; |
| 75 | 76 | |
| 76 | 77 | /** |
| 77 | 78 | * Constructs a new {@code MarkerLayer}. |
| … |
… |
public Icon getIcon() {
|
| 189 | 190 | @Override |
| 190 | 191 | public Color getColor(boolean ignoreCustom) { |
| 191 | 192 | 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); |
| 193 | 194 | } |
| 194 | 195 | |
| 195 | 196 | /* for preferences */ |
| 196 | 197 | public static Color getGenericColor() { |
| 197 | | return Main.pref.getColor(marktr("gps marker"), Color.gray); |
| | 198 | return Main.pref.getColor(marktr("gps marker"), DEFAULT_COLOR); |
| 198 | 199 | } |
| 199 | 200 | |
| 200 | 201 | @Override |