Changeset 16054 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-03-07T13:08:06+01:00 (4 years ago)

Author:

simon04

Message:

ImageResource: use CheckParameterUtil

File:

• trunk/src/org/openstreetmap/josm/tools/ImageResource.java (modified) (2 diffs)

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

@@ -155 +155 @@
      */
     public ImageIcon getImageIcon(Dimension dim, boolean multiResolution) {
-        if (dim.width < -1 || dim.width == 0 || dim.height < -1 || dim.height == 0)
-            throw new IllegalArgumentException(dim+" is invalid");
+        CheckParameterUtil.ensureThat((dim.width > 0 || dim.width == -1) && (dim.height > 0 || dim.height == -1),
+                () -> dim + " is invalid");
         BufferedImage img = imgCache.get(dim);
         if (img == null) {
@@ -243 +243 @@
      */
     public ImageIcon getImageIconBounded(Dimension maxSize, boolean multiResolution) {
-        if (maxSize.width < -1 || maxSize.width == 0 || maxSize.height < -1 || maxSize.height == 0)
-            throw new IllegalArgumentException(maxSize+" is invalid");
+        CheckParameterUtil.ensureThat((maxSize.width > 0 || maxSize.width == -1) && (maxSize.height > 0 || maxSize.height == -1),
+                () -> maxSize + " is invalid");
         float sourceWidth;
         float sourceHeight;