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

Timestamp:

2014-01-03T19:32:18+01:00 (9 years ago)

Author:

Don-vip

Message:

fix compilation warnings + minor code refactorization

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (3 diffs)
• Utils.java (modified) (2 diffs)

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

@@ -517 +517 @@
             switch (type) {
             case SVG:
-                URI uri = getSvgUniverse().loadSVG(is, is.getFile().toURI().toURL().toString());
+                URI uri = getSvgUniverse().loadSVG(is, Utils.fileToURL(is.getFile()).toString());
                 SVGDiagram svg = getSvgUniverse().getDiagram(uri);
                 return svg == null ? null : new ImageResource(svg);
@@ -523 +523 @@
                 BufferedImage img = null;
                 try {
-                    img = ImageIO.read(is.getFile().toURI().toURL());
+                    img = ImageIO.read(Utils.fileToURL(is.getFile()));
                 } catch (IOException e) {
                     Main.warn("IOException while reading HTTP image: "+e.getMessage());
@@ -654 +654 @@
             }
         } else {
-            try {
-                File f = new File(path, name);
-                if ((path != null || f.isAbsolute()) && f.exists())
-                    return f.toURI().toURL();
-            } catch (MalformedURLException e) {
-                Main.warn(e);
-            }
+            File f = new File(path, name);
+            if ((path != null || f.isAbsolute()) && f.exists())
+                return Utils.fileToURL(f);
         }
         return null;

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

@@ -24 +24 @@
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
@@ -373 +374 @@
         }
     }
+    
+    /**
+     * Converts the given file to its URL.
+     * @param f The file to get URL from
+     * @return The URL of the given file, or {@code null} if not possible.
+     * @since 6615
+     */
+    public static URL fileToURL(File f) {
+        if (f != null) {
+            try {
+                return f.toURI().toURL();
+            } catch (MalformedURLException ex) {
+                Main.error("Unable to convert filename " + f.getAbsolutePath() + " to URL");
+            }
+        }
+        return null;
+    }
 
     private final static double EPSILON = 1e-11;