Changeset 4284 in josm for trunk/src

Timestamp:

2011-08-07T12:09:40+02:00 (13 years ago)

Author:

jttt

Message:

Fix "constructor ... is ambiguous" compilation error

Location:

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer

Files:

• ButtonMarker.java (modified) (1 diff)
• PlayHeadMarker.java (modified) (1 diff)

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

@@ -27 +27 @@
 
     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());
     }

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

@@ -59 +59 @@
 
     private PlayHeadMarker() {
-        super(new LatLon(0.0,0.0), null,
+        super(new LatLon(0.0,0.0), "",
                 Main.pref.get("marker.audiotracericon", "audio-tracer"),
                 null, -1.0, 0.0);