Changeset 12987 in josm for trunk/src/org/openstreetmap/josm/gui/layer
- Timestamp:
- 2017-10-12T16:02:15+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/layer
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
r12671 r12987 26 26 import org.openstreetmap.josm.data.gpx.GpxTrack; 27 27 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 28 import org.openstreetmap.josm.data.preferences. ColorProperty;28 import org.openstreetmap.josm.data.preferences.NamedColorProperty; 29 29 import org.openstreetmap.josm.data.projection.Projection; 30 30 import org.openstreetmap.josm.gui.MapView; … … 100 100 101 101 @Override 102 protected ColorProperty getBaseColorProperty() {102 protected NamedColorProperty getBaseColorProperty() { 103 103 return GpxDrawHelper.DEFAULT_COLOR; 104 104 } -
trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
r12782 r12987 29 29 import org.openstreetmap.josm.data.preferences.AbstractProperty; 30 30 import org.openstreetmap.josm.data.preferences.AbstractProperty.ValueChangeListener; 31 import org.openstreetmap.josm.data.preferences. ColorProperty;31 import org.openstreetmap.josm.data.preferences.NamedColorProperty; 32 32 import org.openstreetmap.josm.data.projection.Projection; 33 33 import org.openstreetmap.josm.data.projection.ProjectionChangeListener; … … 204 204 */ 205 205 public AbstractProperty<Color> getColorProperty() { 206 ColorProperty base = getBaseColorProperty();206 NamedColorProperty base = getBaseColorProperty(); 207 207 if (base != null) { 208 // cannot cache this - name may change. 209 return base.getChildColor("layer " + getName()); 208 return base.getChildColor(NamedColorProperty.COLOR_CATEGORY_LAYER, getName(), base.getName()); 210 209 } else { 211 210 return null; … … 218 217 * @since 10824 219 218 */ 220 protected ColorProperty getBaseColorProperty() {219 protected NamedColorProperty getBaseColorProperty() { 221 220 return null; 222 221 } -
trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
r12846 r12987 81 81 import org.openstreetmap.josm.data.osm.visitor.paint.Rendering; 82 82 import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache; 83 import org.openstreetmap.josm.data.preferences.ColorProperty;84 83 import org.openstreetmap.josm.data.preferences.IntegerProperty; 84 import org.openstreetmap.josm.data.preferences.NamedColorProperty; 85 85 import org.openstreetmap.josm.data.preferences.StringProperty; 86 86 import org.openstreetmap.josm.data.projection.Projection; … … 153 153 public static final StringProperty PROPERTY_SAVE_EXTENSION = new StringProperty("save.extension.osm", "osm"); 154 154 155 private static final ColorProperty PROPERTY_BACKGROUND_COLOR = newColorProperty(marktr("background"), Color.BLACK);156 private static final ColorProperty PROPERTY_OUTSIDE_COLOR = newColorProperty(marktr("outside downloaded area"), Color.YELLOW);155 private static final NamedColorProperty PROPERTY_BACKGROUND_COLOR = new NamedColorProperty(marktr("background"), Color.BLACK); 156 private static final NamedColorProperty PROPERTY_OUTSIDE_COLOR = new NamedColorProperty(marktr("outside downloaded area"), Color.YELLOW); 157 157 158 158 /** List of recent relations */ -
trunk/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
r12891 r12987 43 43 import org.openstreetmap.josm.data.gpx.GpxData.GpxDataChangeListener; 44 44 import org.openstreetmap.josm.data.gpx.WayPoint; 45 import org.openstreetmap.josm.data.preferences. ColorProperty;45 import org.openstreetmap.josm.data.preferences.NamedColorProperty; 46 46 import org.openstreetmap.josm.gui.MapView; 47 47 import org.openstreetmap.josm.gui.MapViewState; … … 69 69 * @since 10824 70 70 */ 71 public static final ColorProperty DEFAULT_COLOR = newColorProperty(marktr("gps point"), Color.magenta);71 public static final NamedColorProperty DEFAULT_COLOR = new NamedColorProperty(marktr("gps point"), Color.magenta); 72 72 73 73 private final GpxData data; … … 266 266 public Color getColor(String layerName, boolean ignoreCustom) { 267 267 if (ignoreCustom || getColorMode(layerName) == ColorMode.NONE) { 268 return DEFAULT_COLOR.getChildColor(specName(layerName)).get(); 268 return DEFAULT_COLOR.getChildColor( 269 NamedColorProperty.COLOR_CATEGORY_LAYER, 270 layerName, 271 DEFAULT_COLOR.getName()).get(); 269 272 } else { 270 273 return null; -
trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
r12846 r12987 38 38 import org.openstreetmap.josm.data.gpx.WayPoint; 39 39 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor; 40 import org.openstreetmap.josm.data.preferences. ColorProperty;40 import org.openstreetmap.josm.data.preferences.NamedColorProperty; 41 41 import org.openstreetmap.josm.gui.MainApplication; 42 42 import org.openstreetmap.josm.gui.MapView; … … 79 79 80 80 private static final Color DEFAULT_COLOR = Color.magenta; 81 private static final ColorProperty COLOR_PROPERTY = newColorProperty(marktr("gps marker"), DEFAULT_COLOR);81 private static final NamedColorProperty COLOR_PROPERTY = new NamedColorProperty(marktr("gps marker"), DEFAULT_COLOR); 82 82 83 83 /** … … 163 163 164 164 @Override 165 protected ColorProperty getBaseColorProperty() {165 protected NamedColorProperty getBaseColorProperty() { 166 166 return COLOR_PROPERTY; 167 167 }
Note:
See TracChangeset
for help on using the changeset viewer.