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

Timestamp:

2017-11-19T19:07:47+01:00 (6 years ago)

Author:

Don-vip

Message:

see #15476 - fix checkstyle/pmd warnings, add some javadoc

File:

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

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

@@ -617 +617 @@
      * implementation, which adds support for HiDPI displays. The effect will be
      * that in HiDPI mode, when GUI elements are scaled by a factor 1.5, 2.0, etc.,
-     * the images are not just up-scaled, but a higher resolution version of the
-     * image is rendered instead.
+     * the images are not just up-scaled, but a higher resolution version of the image is rendered instead.
      * <p>
-     * Use {@link HiDPISupport#getBaseImage(java.awt.Image)} to extract the original
-     * image from a multi-resolution image.
+     * Use {@link HiDPISupport#getBaseImage(java.awt.Image)} to extract the original image from a multi-resolution image.
      * <p>
-     * See {@link HiDPISupport#processMRImage} for how to process the image without
-     * removing the multi-resolution magic.
+     * See {@link HiDPISupport#processMRImage} for how to process the image without removing the multi-resolution magic.
      * @param multiResolution true, if multi-resolution image is requested
      * @return the current object, for convenience
@@ -821 +818 @@
             // This method is called from different thread and modifying HashMap concurrently can result
             // for example in loops in map entries (ie freeze when such entry is retrieved)
-            // Yes, it did happen to me :-)
             if (name == null)
                 return null;
@@ -911 +907 @@
                         // and redundant when you have a whole ton of objects. So,
                         // index the cache by the name of the icon we're looking for
-                        // and don't bother to create a URL unless we're actually
-                        // creating the image.
+                        // and don't bother to create a URL unless we're actually creating the image.
                         URL path = getImageUrl(fullName);
                         if (path == null) {
@@ -1618 +1613 @@
      * has a transparency set to {@code TRANSLUCENT} and uses the correct transparent color.
      *
-     * @return a <code>BufferedImage</code> containing the decoded
-     * contents of the input, or <code>null</code>.
+     * @return a <code>BufferedImage</code> containing the decoded contents of the input, or <code>null</code>.
      *
      * @throws IllegalArgumentException if <code>input</code> is <code>null</code>.
@@ -1673 +1667 @@
      * has a transparency set to {@code TRANSLUCENT} and uses the correct transparent color.
      *
-     * @return a <code>BufferedImage</code> containing the decoded
-     * contents of the input, or <code>null</code>.
+     * @return a <code>BufferedImage</code> containing the decoded contents of the input, or <code>null</code>.
      *
      * @throws IllegalArgumentException if <code>input</code> is <code>null</code>.
@@ -1717 +1710 @@
      * has a transparency set to {@code TRANSLUCENT} and uses the correct transparent color.
      *
-     * @return a <code>BufferedImage</code> containing the decoded
-     * contents of the input, or <code>null</code>.
+     * @return a <code>BufferedImage</code> containing the decoded contents of the input, or <code>null</code>.
      *
      * @throws IllegalArgumentException if <code>input</code> is <code>null</code>.
@@ -1987 +1979 @@
     public static BufferedImage toBufferedImage(Image image, Rectangle crop_area) {
         BufferedImage buffImage = null;
-
         Rectangle r = new Rectangle(image.getWidth(null), image.getHeight(null));
         if (r.intersection(crop_area).equals(crop_area)) {
             buffImage = new BufferedImage(crop_area.width, crop_area.height, BufferedImage.TYPE_INT_ARGB);
             Graphics2D g2 = buffImage.createGraphics();
-            g2.drawImage(image,
-                0, 0, crop_area.width, crop_area.height,
-                crop_area.x, crop_area.y,
-                crop_area.x + crop_area.width, crop_area.y + crop_area.height,
-                null);
+            g2.drawImage(image, 0, 0, crop_area.width, crop_area.height,
+                crop_area.x, crop_area.y, crop_area.x + crop_area.width, crop_area.y + crop_area.height, null);
             g2.dispose();
         }