Changeset 5054 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java

Timestamp:

2012-03-08T12:11:38+01:00 (12 years ago)

Author:

bastiK

Message:

see #6797: load map images in background, in case they are loaded over a network. Show temporary image in the meantime.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/AreaElemStyle.java

@@ -5 +5 @@
 
 import java.awt.Color;
-import java.awt.image.BufferedImage;
-
-import javax.swing.ImageIcon;
 
 import org.openstreetmap.josm.Main;
@@ -27 +24 @@
      */
     public Color color;
-    public MapImage<BufferedImage> fillImage;
+    public MapImage fillImage;
     public TextElement text;
 
-    protected AreaElemStyle(Cascade c, Color color, MapImage<BufferedImage> fillImage, TextElement text) {
+    protected AreaElemStyle(Cascade c, Color color, MapImage fillImage, TextElement text) {
         super(c, -1000f);
         CheckParameterUtil.ensureParameterNotNull(color);
@@ -39 +36 @@
 
     public static AreaElemStyle create(Cascade c) {
-        MapImage<BufferedImage> fillImage = null;
+        MapImage fillImage = null;
         Color color = null;
 
         IconReference iconRef = c.get("fill-image", null, IconReference.class);
         if (iconRef != null) {
-            ImageIcon icon = MapPaintStyles.getIcon(iconRef, -1, -1);
-            if (icon != null) {
-                if (!(icon.getImage() instanceof BufferedImage))
-                    throw new RuntimeException();
-                fillImage = new MapImage<BufferedImage>(iconRef.iconName, iconRef.source);
-                fillImage.img = (BufferedImage) icon.getImage();
+            fillImage = new MapImage(iconRef.iconName, iconRef.source);
+            fillImage.getImage();
 
-                color = new Color(fillImage.img.getRGB(
-                        fillImage.img.getWidth() / 2, fillImage.img.getHeight() / 2)
-                );
+            color = new Color(fillImage.getImage().getRGB(
+                    fillImage.getWidth() / 2, fillImage.getHeight() / 2)
+            );
 
-                fillImage.alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fill-image-alpha", 255))));
-                Integer pAlpha = Utils.color_float2int(c.get("fill-opacity", null, float.class));
-                if (pAlpha != null) {
-                    fillImage.alpha = pAlpha;
-                }
+            fillImage.alpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fill-image-alpha", 255))));
+            Integer pAlpha = Utils.color_float2int(c.get("fill-opacity", null, float.class));
+            if (pAlpha != null) {
+                fillImage.alpha = pAlpha;
             }
         } else {
@@ -78 +70 @@
             text = TextElement.create(c, PaintColors.AREA_TEXT.get(), true);
         }
-        
+
         if (color != null)
             return new AreaElemStyle(c, color, fillImage, text);