Changeset 4820 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2012-01-19T12:49:55+01:00 (12 years ago)

Author:

bastiK

Message:

extend image sanitize options

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• AreaElemStyle.java (modified) (2 diffs)
• LinePatternElemStyle.java (modified) (1 diff)
• MapPaintStyles.java (modified) (4 diffs)
• NodeElemStyle.java (modified) (1 diff)
• StyleSource.java (modified) (1 diff)

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

@@ -16 +16 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles.IconReference;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.ImageProvider.SanitizeMode;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -45 +46 @@
         IconReference iconRef = c.get("fill-image", null, IconReference.class);
         if (iconRef != null) {
-            ImageIcon icon = MapPaintStyles.getIcon(iconRef, -1, -1, false);
+            ImageIcon icon = MapPaintStyles.getIcon(iconRef, -1, -1, SanitizeMode.MAKE_BUFFEREDIMAGE);
             if (icon != null) {
-                if (!(icon.getImage() instanceof BufferedImage)) {
-                    icon = MapPaintStyles.getIcon(iconRef, -1, -1, true);
-                }
                 if (!(icon.getImage() instanceof BufferedImage))
                     throw new RuntimeException();

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

@@ -28 +28 @@
         if (iconRef == null)
             return null;
-        ImageIcon icon = MapPaintStyles.getIcon(iconRef, -1, -1, false);
+        ImageIcon icon = MapPaintStyles.getIcon(iconRef, -1, -1);
         if (icon == null)
             return null;

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

@@ -27 +27 @@
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.ImageProvider.SanitizeMode;
 
 /**
@@ -87 +88 @@
     }
 
-    public static ImageIcon getIcon(IconReference ref, int width, int height, boolean sanitize) {
+    public static ImageIcon getIcon(IconReference ref, int width, int height) {
+        return getIcon(ref, width, height, SanitizeMode.OFF);
+    }
+
+    public static ImageIcon getIcon(IconReference ref, int width, int height, SanitizeMode sanitize) {
         final String namespace = ref.source.getPrefName();
         ImageIcon i = new ImageProvider(ref.iconName)
@@ -105 +110 @@
     }
 
+    public static ImageIcon getNoIcon_Icon(StyleSource source) {
+        return getNoIcon_Icon(source, SanitizeMode.OFF);
+    }
+
     /**
      * No icon with the given name was found, show a dummy icon instead
@@ -113 +122 @@
      *  can be null if the defaults are turned off by user
      */
-    public static ImageIcon getNoIcon_Icon(StyleSource source, boolean sanitize) {
+    public static ImageIcon getNoIcon_Icon(StyleSource source, SanitizeMode sanitize) {
         return new ImageProvider("misc/no_icon.png")
                 .setDirs(getIconSourceDirs(source))

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

@@ -150 +150 @@
         int height = heightF == null ? -1 : Math.round(heightF);
 
-        ImageIcon icon = MapPaintStyles.getIcon(iconRef, width, height, false);
+        ImageIcon icon = MapPaintStyles.getIcon(iconRef, width, height);
         if (icon == null)
-            return new Pair<ImageIcon, Integer>(MapPaintStyles.getNoIcon_Icon(iconRef.source, false), 255);
+            return new Pair<ImageIcon, Integer>(MapPaintStyles.getNoIcon_Icon(iconRef.source), 255);
         int iconAlpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.icon-image-alpha", 255))));
         Integer pAlpha = Utils.color_float2int(c.get("icon-opacity", null, float.class));

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

@@ -74 +74 @@
         if (imageIcon == null) {
             if (icon != null) {
-                imageIcon = MapPaintStyles.getIcon(new IconReference(icon, this), -1, -1, false);
+                imageIcon = MapPaintStyles.getIcon(new IconReference(icon, this), -1, -1);
             }
             if (imageIcon == null) {