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

Timestamp:

2017-08-22T22:26:32+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - deprecate all Main logging methods and introduce suitable replacements in Logging for most of them

File:

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

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

@@ -642 +642 @@
             } else {
                 if (!suppressWarnings) {
-                    Main.error(tr("Failed to locate image ''{0}''", name));
+                    Logging.error(tr("Failed to locate image ''{0}''", name));
                 }
                 return null;
@@ -917 +917 @@
                     img = read(Utils.fileToURL(cf.getFile()), false, false);
                 } catch (IOException e) {
-                    Main.warn(e, "IOException while reading HTTP image:");
+                    Logging.log(Logging.LEVEL_WARN, "IOException while reading HTTP image:", e);
                 }
                 return img == null ? null : new ImageResource(img);
@@ -924 +924 @@
             }
         } catch (IOException e) {
-            Main.debug(e);
+            Logging.debug(e);
             return null;
         }
@@ -947 +947 @@
                     bytes = Utils.decodeUrl(data).getBytes(StandardCharsets.UTF_8);
                 } catch (IllegalArgumentException ex) {
-                    Main.warn(ex, "Unable to decode URL data part: "+ex.getMessage() + " (" + data + ')');
+                    Logging.log(Logging.LEVEL_WARN, "Unable to decode URL data part: "+ex.getMessage() + " (" + data + ')', ex);
                     return null;
                 }
@@ -960 +960 @@
                 }
                 if (svg == null) {
-                    Main.warn("Unable to process svg: "+s);
+                    Logging.warn("Unable to process svg: "+s);
                     return null;
                 }
@@ -974 +974 @@
                     return img == null ? null : new ImageResource(img);
                 } catch (IOException e) {
-                    Main.warn(e, "IOException while reading image:");
+                    Logging.log(Logging.LEVEL_WARN, "IOException while reading image:", e);
                 }
             }
@@ -1059 +1059 @@
                             img = read(new ByteArrayInputStream(buf), false, false);
                         } catch (IOException e) {
-                            Main.warn(e);
+                            Logging.warn(e);
                         }
                         return img == null ? null : new ImageResource(img);
@@ -1068 +1068 @@
             }
         } catch (IOException e) {
-            Main.warn(e, tr("Failed to handle zip file ''{0}''. Exception was: {1}", archive.getName(), e.toString()));
+            Logging.log(Logging.LEVEL_WARN, tr("Failed to handle zip file ''{0}''. Exception was: {1}", archive.getName(), e.toString()), e);
         }
         return null;
@@ -1096 +1096 @@
                 // hg.openjdk.java.net/jdk8u/jdk8u/jdk/file/dc4322602480/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656
                 img = read(path, false, true);
-                if (Main.isDebugEnabled() && isTransparencyForced(img)) {
-                    Main.debug("Transparency has been forced for image "+path.toExternalForm());
+                if (Logging.isDebugEnabled() && isTransparencyForced(img)) {
+                    Logging.debug("Transparency has been forced for image {0}", path);
                 }
             } catch (IOException e) {
-                Main.warn(e);
+                Logging.warn(e);
             }
             return img == null ? null : new ImageResource(img);
@@ -1139 +1139 @@
                         return u;
                 } catch (SecurityException e) {
-                    Main.warn(e, tr(
+                    Logging.log(Logging.LEVEL_WARN, tr(
                             "Failed to access directory ''{0}'' for security reasons. Exception was: {1}",
-                            name, e.toString()));
+                            name, e.toString()), e);
                 }
 
@@ -1154 +1154 @@
                     return u;
             } catch (SecurityException e) {
-                Main.warn(e, tr(
+                Logging.log(Logging.LEVEL_WARN, tr(
                         "Failed to access directory ''{0}'' for security reasons. Exception was: {1}", dir, e
-                        .toString()));
+                        .toString()), e);
             }
         }
@@ -1226 +1226 @@
             }
         } catch (SAXReturnException e) {
-            Main.trace(e);
+            Logging.trace(e);
             return e.getResult();
         } catch (IOException | SAXException | ParserConfigurationException e) {
-            Main.warn("Parsing " + base + fn + " failed:\n" + e);
+            Logging.warn("Parsing " + base + fn + " failed:\n" + e);
             return null;
         }
-        Main.warn("Parsing " + base + fn + " failed: Unexpected content.");
+        Logging.warn("Parsing " + base + fn + " failed: Unexpected content.");
         return null;
     }
@@ -1251 +1251 @@
         }
         if (GraphicsEnvironment.isHeadless()) {
-            if (Main.isDebugEnabled()) {
-                Main.debug("Cursors are not available in headless mode. Returning null for '"+name+'\'');
-            }
+            Logging.debug("Cursors are not available in headless mode. Returning null for '{0}'", name);
             return null;
         }
@@ -1465 +1463 @@
      */
     public static BufferedImage createImageFromSvg(SVGDiagram svg, Dimension dim) {
-        if (Main.isTraceEnabled()) {
-            Main.trace(String.format("createImageFromSvg: %s %s", svg.getXMLBase(), dim));
+        if (Logging.isTraceEnabled()) {
+            Logging.trace("createImageFromSvg: {0} {1}", svg.getXMLBase(), dim);
         }
         float sourceWidth = svg.getWidth();
@@ -1504 +1502 @@
             }
         } catch (SVGException ex) {
-            Main.error(ex, "Unable to load svg:");
+            Logging.log(Logging.LEVEL_ERROR, "Unable to load svg:", ex);
             return null;
         }
@@ -1724 +1722 @@
                     bi = new BufferedImage(bi.getColorModel(), bi.getRaster(), bi.isAlphaPremultiplied(), properties);
                     if (enforceTransparency) {
-                        if (Main.isTraceEnabled()) {
-                            Main.trace("Enforcing image transparency of "+stream+" for "+color);
-                        }
+                        Logging.trace("Enforcing image transparency of {0} for {1}", stream, color);
                         bi = makeImageTransparent(bi, color);
                     }
@@ -1734 +1730 @@
             // On Windows, ComponentColorModel.getRGBComponent can fail with "UnsatisfiedLinkError: no awt in java.library.path", see #13973
             // Then it can leads to "NoClassDefFoundError: Could not initialize class sun.awt.image.ShortInterleavedRaster", see #15079
-            Main.error(e);
+            Logging.error(e);
         } finally {
             reader.dispose();
@@ -1781 +1777 @@
                                                 return new Color(r, g, b);
                                             } else {
-                                                Main.warn("Unable to translate TransparentColor '"+value+"' with color model "+model);
+                                                Logging.warn("Unable to translate TransparentColor '"+value+"' with color model "+model);
                                             }
                                         }
@@ -1794 +1790 @@
         } catch (IIOException | NumberFormatException e) {
             // JAI doesn't like some JPEG files with error "Inconsistent metadata read from stream" (see #10267)
-            Main.warn(e);
+            Logging.warn(e);
         }
         return null;
@@ -1807 +1803 @@
             return new Color(rgb[0], rgb[1], rgb[2]);
         } catch (IllegalArgumentException e) {
-            Main.error(e);
+            Logging.error(e);
             return null;
         }