Changeset 11587 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2017-02-19T23:52:08+01:00 (7 years ago)

Author:

Don-vip

Message:

checkstyle - enable BooleanExpressionComplexity / 6

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -268 +268 @@
         return ImageIO.getImageReadersByMIMEType(format).hasNext()
                 // handles image/tiff image/tiff8 image/geotiff image/geotiff8
-                || ((format.startsWith("image/tiff") || format.startsWith("image/geotiff"))
-                        && ImageIO.getImageReadersBySuffix("tiff").hasNext())
-                || (format.startsWith("image/png") && ImageIO.getImageReadersBySuffix("png").hasNext())
-                || (format.startsWith("image/svg") && ImageIO.getImageReadersBySuffix("svg").hasNext())
-                || (format.startsWith("image/bmp") && ImageIO.getImageReadersBySuffix("bmp").hasNext());
+                || isImageFormatSupported(format, "tiff", "geotiff")
+                || isImageFormatSupported(format, "png")
+                || isImageFormatSupported(format, "svg")
+                || isImageFormatSupported(format, "bmp");
+    }
+
+    static boolean isImageFormatSupported(String format, String ... mimeFormats) {
+        for (String mime : mimeFormats) {
+            if (format.startsWith("image/" + mime)) {
+                return ImageIO.getImageReadersBySuffix(mimeFormats[0]).hasNext();
+            }
+        }
+        return false;
     }