Changeset 5478 in josm

Timestamp:

2012-08-26T17:16:50+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7999 - Change r5464 broke display of texts for marker layer

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/preferences/CachedProperty.java (modified) (2 diffs)
• gui/layer/markerlayer/Marker.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/preferences/CachedProperty.java

@@ -12 +12 @@
     private int updateCount;
 
-    protected CachedProperty(String key, T defaultValue, String defaultValueAsString) {
-        super(key, defaultValue);
+    protected CachedProperty(String key, String defaultValueAsString) {
+        super(key, null);
         Main.pref.addPreferenceChangeListener(this);
         this.defaultValueAsString = defaultValueAsString;
@@ -50 +50 @@
         return updateCount;
     }
+    
+    @Override 
+    public T getDefaultValue() { 
+        return fromString(getDefaultValueAsString()); 
+    }
 
     public String getDefaultValueAsString() {

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

@@ -49 +49 @@
  * will create AudioMarkers for .wav files, ImageMarkers for .png/.jpg/.jpeg
  * files, and WebMarkers for everything else. (The creation of a WebMarker will
- * fail if there's no vaild URL in the <link> tag, so it might still make sense
+ * fail if there's no valid URL in the <link> tag, so it might still make sense
  * to add Makers for such waypoints at the end of the list.)
  *
@@ -77 +77 @@
         // will make gui for it so I'm keeping it here
 
-        private final static Map<String, TemplateEntryProperty> cache = new HashMap<String, Marker.TemplateEntryProperty>();
+        private final static Map<String, TemplateEntryProperty> cache = new HashMap<String, TemplateEntryProperty>();
 
         // Legacy code - convert label from int to template engine expression
@@ -137 +137 @@
 
         private TemplateEntryProperty(String key, String defaultValue, TemplateEntryProperty parent) throws ParseError {
-            super(key, new TemplateParser(defaultValue).parse(), defaultValue);
+            super(key, defaultValue);
             this.parent = parent;
             updateValue(); // Needs to be called because parent wasn't know in super constructor