Changeset 5054 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/LinePatternElemStyle.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/LinePatternElemStyle.java (modified) (4 diffs)

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.mappaint;
-
-import java.awt.Image;
-
-import javax.swing.ImageIcon;
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -17 +13 @@
 public class LinePatternElemStyle extends ElemStyle {
 
-    public MapImage<Image> pattern;
+    public MapImage pattern;
 
-    public LinePatternElemStyle(Cascade c, MapImage<Image> pattern) {
+    public LinePatternElemStyle(Cascade c, MapImage pattern) {
         super(c, -1f);
         this.pattern = pattern;
@@ -30 +26 @@
         if (iconRef == null)
             return null;
-        ImageIcon icon = MapPaintStyles.getIcon(iconRef, -1, -1);
-        if (icon == null)
-            return null;
-        MapImage<Image> pattern = new MapImage<Image>(iconRef.iconName, iconRef.source);
-        pattern.img = icon.getImage();
+        MapImage pattern = new MapImage(iconRef.iconName, iconRef.source);
         return new LinePatternElemStyle(c, pattern);
     }
@@ -41 +33 @@
     public void paintPrimitive(OsmPrimitive primitive, MapPaintSettings paintSettings, MapPainter painter, boolean selected, boolean member) {
         Way w = (Way)primitive;
-        painter.drawLinePattern(w, pattern.img);
+        painter.drawLinePattern(w, pattern.getImage());
     }