Changeset 10409 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-06-17T02:58:36+02:00 (9 years ago)

Author:

Don-vip

Message:

• remove duplicated code
• fix various sonar warnings
• add some javadoc and unit tests

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (2 diffs)
• ImageResource.java (modified) (5 diffs)

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

@@ -707 +707 @@
 
     /**
+     * Load an image with a given file name.
+     *
+     * @param name The icon name (base name with or without '.png' or '.svg' extension)
+     * @return the requested image or null if the request failed
+     * @see #get(String, String)
+     */
+    public static ImageIcon get(String name) {
+        return new ImageProvider(name).get();
+    }
+
+    /**
      * Load an empty image with a given size.
      *
@@ -717 +728 @@
         return new ImageIcon(new BufferedImage(iconRealSize.width, iconRealSize.height,
             BufferedImage.TYPE_INT_ARGB));
-    }
-
-    /**
-     * Load an image with a given file name.
-     *
-     * @param name The icon name (base name with or without '.png' or '.svg' extension)
-     * @return the requested image or null if the request failed
-     * @see #get(String, String)
-     */
-    public static ImageIcon get(String name) {
-        return new ImageProvider(name).get();
     }
 

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

@@ -13 +13 @@
 import javax.swing.ImageIcon;
 
+import org.openstreetmap.josm.gui.util.GuiSizesHelper;
+
 import com.kitfox.svg.SVGDiagram;
-import org.openstreetmap.josm.gui.util.GuiSizesHelper;
 
 /**
@@ -50 +51 @@
     public ImageResource(Image img) {
         CheckParameterUtil.ensureParameterNotNull(img);
-        this.baseImage = img;
-
-        img = scaleBaseImageIfNeeded(img);
-
-        imgCache.put(DEFAULT_DIMENSION, img);
+        baseImage = img;
+        imgCache.put(DEFAULT_DIMENSION, scaleBaseImageIfNeeded(img));
     }
 
@@ -71 +69 @@
             BufferedImage bimg = new BufferedImage(realWidth, realHeight, BufferedImage.TYPE_INT_ARGB);
             bimg.getGraphics().drawImage(realImage, 0, 0, null);
-            img = bimg;
+            return bimg;
         }
         return img;
@@ -98 +96 @@
 
     /**
-     * Returns the image icon at default dimension.
-     * @return the image icon at default dimension
-     */
-    public ImageIcon getImageIcon() {
-        return getImageIcon(DEFAULT_DIMENSION);
-    }
-
-    /**
      * Set both icons of an Action
      * @param a The action for the icons
@@ -135 +125 @@
 
     /**
+     * Returns the image icon at default dimension.
+     * @return the image icon at default dimension
+     */
+    public ImageIcon getImageIcon() {
+        return getImageIcon(DEFAULT_DIMENSION);
+    }
+
+    /**
      * Get an ImageIcon object for the image of this resource
-     * @param   dim The requested dimensions. Use (-1,-1) for the original size
-     *          and (width, -1) to set the width, but otherwise scale the image
-     *          proportionally.
+     * @param  dim The requested dimensions. Use (-1,-1) for the original size and (width, -1)
+     *         to set the width, but otherwise scale the image proportionally.
      * @return ImageIcon object for the image of this resource, scaled according to dim
      */