Changeset 8323 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2015-05-04T20:19:32+02:00 (11 years ago)

Author:

stoecker

Message:

see #10684 - remove remaining overlay() calls

File:

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

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -90 +90 @@
 import org.openstreetmap.josm.tools.FilteredCollection;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.ImageOverlay;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -286 +288 @@
     }
 
-    protected Icon getBaseIcon() {
-        return ImageProvider.get("layer", "osmdata_small");
-    }
-
-    /**
-     * TODO: @return Return a dynamic drawn icon of the map data. The icon is
-     *         updated by a background thread to not disturb the running programm.
-     */
-    @Override public Icon getIcon() {
-        Icon baseIcon = getBaseIcon();
+    /**
+     * Return the image provider to get the base icon
+     * @return image provider class which can be modified
+     * @since 8323
+     */
+    protected ImageProvider getBaseIconProvider() {
+        return new ImageProvider("layer", "osmdata_small");
+    }
+
+    @Override
+    public Icon getIcon() {
+        ImageProvider base = getBaseIconProvider().setMaxSize(ImageSizes.LAYER);
         if (isUploadDiscouraged()) {
-            return ImageProvider.overlay(baseIcon,
-                    new ImageIcon(ImageProvider.get("warning-small").getImage().getScaledInstance(8, 8, Image.SCALE_SMOOTH)),
-                    ImageProvider.OverlayPosition.SOUTHEAST);
-        } else {
-            return baseIcon;
-        }
+            base.addOverlay(new ImageOverlay(new ImageProvider("warning-small"), 0.5, 0.5, 1.0, 1.0));
+        }
+        return base.get();
     }