Changeset 4283 in josm

Timestamp:

Aug 7, 2011 12:06:49 PM (22 months ago)

Author:

jttt

Message:

Put back Marker constructor with static text (needed by surveyor plugin)

File:

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

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

@@ -248 +248 @@
 
     private final TemplateEngineDataProvider dataProvider;
+    private final String text;
+
     public final Icon symbol;
     public final MarkerLayer parentLayer;
@@ -269 +271 @@
 
         this.dataProvider = dataProvider;
+        this.text = null;
+    }
+
+    public Marker(LatLon ll, String text, String iconName, MarkerLayer parentLayer, double time, double offset) {
+        setCoor(ll);
+
+        this.offset = offset;
+        this.time = time;
+        // /* ICON(markers/) */"Bridge"
+        // /* ICON(markers/) */"Crossing"
+        this.symbol = ImageProvider.getIfAvailable("markers",iconName);
+        this.parentLayer = parentLayer;
+
+        this.dataProvider = null;
+        this.text = text;
     }
 
@@ -344 +361 @@
      */
     public String getText() {
-        TemplateEntryProperty property = getTextTemplate();
-        if (property.getUpdateCount() != textVersion) {
-            TemplateEntry templateEntry = property.get();
-            StringBuilder sb = new StringBuilder();
-            templateEntry.appendText(sb, this);
-
-            cachedText = sb.toString();
-            textVersion = property.getUpdateCount();
-        }
-        return cachedText;
+        if (text != null)
+            return text;
+        else {
+            TemplateEntryProperty property = getTextTemplate();
+            if (property.getUpdateCount() != textVersion) {
+                TemplateEntry templateEntry = property.get();
+                StringBuilder sb = new StringBuilder();
+                templateEntry.appendText(sb, this);
+
+                cachedText = sb.toString();
+                textVersion = property.getUpdateCount();
+            }
+            return cachedText;
+        }
     }