Changeset 4960 in josm for trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

Timestamp:

2012-02-16T20:58:54+01:00 (14 years ago)

Author:

stoecker

Message:

mv jump to action from G to key J

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (9 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -85 +85 @@
     }
 
-    public static enum SanitizeMode {
-        OFF,                // never sanitize the image
-        ALWAYS,             // always copy to a new BufferedImage
-        MAKE_BUFFEREDIMAGE  // make sure the returned image is instance of BufferedImage
-    }
-
     protected Collection<String> dirs;
     protected String id;
@@ -100 +94 @@
     protected int maxWidth = -1;
     protected int maxHeight = -1;
-    protected SanitizeMode sanitize;
     protected boolean optional;
 
@@ -204 +197 @@
     public ImageProvider setMaxHeight(int maxHeight) {
         this.maxHeight = maxHeight;
-        return this;
-    }
-
-    /**
-     * Set true, if the image should be repainted to a new BufferedImage in order to work around certain issues.
-     */
-    public ImageProvider setSanitize(SanitizeMode sanitize) {
-        this.sanitize = sanitize;
         return this;
     }
@@ -240 +225 @@
         }
         if (maxWidth != -1 || maxHeight != -1)
-            return ir.getImageIconBounded(new Dimension(maxWidth, maxHeight), sanitize);
+            return ir.getImageIconBounded(new Dimension(maxWidth, maxHeight));
         else
-            return ir.getImageIcon(new Dimension(width, height), sanitize);
+            return ir.getImageIcon(new Dimension(width, height));
     }
 
@@ -292 +277 @@
                     if (mediatype != null && mediatype.contains("image/svg+xml")) {
                         URI uri = getSvgUniverse().loadSVG(new StringReader(new String(bytes)), name);
-                        SVGDiagram svg = getSvgUniverse().getDiagram(uri);
-                        return new ImageResource(svg);
+                        return new ImageResource(getSvgUniverse().getDiagram(uri));
                     } else {
-                        return new ImageResource(new ImageIcon(bytes).getImage(), true);
+                        return new ImageResource(new ImageIcon(bytes).getImage());
                     }
                 }
@@ -406 +390 @@
                         img = ImageIO.read(is.getFile().toURI().toURL());
                     } catch (IOException e) {}
-                    return img == null ? null : new ImageResource(img, true);
+                    return img == null ? null : new ImageResource(img);
                 default:
                     throw new AssertionError();
@@ -475 +459 @@
                                 img = ImageIO.read(new ByteArrayInputStream(buf));
                             } catch (IOException e) {}
-                            return img == null ? null : new ImageResource(img, false);
+                            return img == null ? null : new ImageResource(img);
                         default:
                             throw new AssertionError();
@@ -509 +493 @@
                     img = ImageIO.read(path);
                 } catch (IOException e) {}
-                return img == null ? null : new ImageResource(img, true);
+                return img == null ? null : new ImageResource(img);
             default:
                 throw new AssertionError();
@@ -767 +751 @@
     }
 
-    public static BufferedImage sanitize(Image img) {
-        (new ImageIcon(img)).getImage(); // load competely
-        int width = img.getWidth(null);
-        int height = img.getHeight(null);
-        BufferedImage result = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
-        result.getGraphics().drawImage(img, 0, 0, null);
-        return result;
-    }
-
     public static Image createImageFromSvg(SVGDiagram svg, Dimension dim) {
         float realWidth = svg.getWidth();