Changeset 3396 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/ButtonMarker.java

Timestamp:

31.07.2010 16:28:43 (22 months ago)

Author:

bastiK

Message:

applied #3617 (patch by reini122) - Would like to see waypoint descriptions in JOSM

File:

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

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

@@ -26 +26 @@
 
     public ButtonMarker(LatLon ll, String buttonImage, MarkerLayer parentLayer, double time, double offset) {
-        super(ll, null, buttonImage, parentLayer, time, offset);
+        super(ll, "", buttonImage, parentLayer, time, offset);
         buttonRectangle = new Rectangle(0, 0, symbol.getIconWidth(), symbol.getIconHeight());
     }
@@ -62 +62 @@
         r.grow((inset.top+inset.bottom)/2, (inset.left+inset.right)/2);
         b.paintBorder(mv, g, r.x, r.y, r.width, r.height);
-        if ((text != null) && showTextOrIcon && Main.pref.getBoolean("marker.buttonlabels", true)) {
-            g.drawString(text, screen.x+4, screen.y+2);
+
+        String labelText = getText();
+        if ((labelText != null) && showTextOrIcon && Main.pref.getBoolean("marker.buttonlabels", true)) {
+            g.drawString(labelText, screen.x+4, screen.y+2);
         }
     }