Changeset 13192 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2017-12-03T20:45:38+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15310 - remove support for draw.rawgps.layer.wpt property, kind-of deprecated 6 years ago in r4282

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java (modified) (3 diffs)

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

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.search.SearchCompiler.Match;
 import org.openstreetmap.josm.data.preferences.CachedProperty;
-import org.openstreetmap.josm.data.preferences.IntegerProperty;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
@@ -86 +85 @@
         private static final Map<String, TemplateEntryProperty> CACHE = new HashMap<>();
 
-        // Legacy code - convert label from int to template engine expression
-        private static final IntegerProperty PROP_LABEL = new IntegerProperty("draw.rawgps.layer.wpt", 0);
-
-        private static String getDefaultLabelPattern() {
-            switch (PROP_LABEL.get()) {
-            case 1:
-                return LABEL_PATTERN_NAME;
-            case 2:
-                return LABEL_PATTERN_DESC;
-            case 0:
-            case 3:
-                return LABEL_PATTERN_AUTO;
-            default:
-                return "";
-            }
-        }
-
         public static TemplateEntryProperty forMarker(String layerName) {
             String key = "draw.rawgps.layer.wpt.pattern";
@@ -110 +92 @@
             TemplateEntryProperty result = CACHE.get(key);
             if (result == null) {
-                String defaultValue = layerName == null ? getDefaultLabelPattern() : "";
+                String defaultValue = layerName == null ? LABEL_PATTERN_AUTO : "";
                 TemplateEntryProperty parent = layerName == null ? null : forMarker(null);
                 result = new TemplateEntryProperty(key, defaultValue, parent);