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

Timestamp:

2013-10-06T17:26:37+02:00 (13 years ago)

Author:

Don-vip

Message:

Improve feedback when clicking a web marker pointing to a local file fails

File:

• trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java (modified) (4 diffs)

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

@@ -29 +29 @@
 
     /**
+     * Displays an external URI using platform associated software. 
+     * A web resource will launch platform's browser, an audio file URI will launch audio player, etc. 
+     * @param uri The URI to display
      * @return <code>null</code> for success or a string in case of an error.
      * @throws IllegalStateException thrown if no platform is set to which opening the URL can be dispatched,
@@ -34 +37 @@
      */
     public static String displayUrl(URI uri) {
+        CheckParameterUtil.ensureParameterNotNull(uri, "uri");
         if (Main.applet) {
             try {
@@ -43 +47 @@
             }
         }
+        
+        Main.info(tr("Opening URL: {0}", uri));
 
         if (Desktop.isDesktopSupported()) {
             try {
-                try {
+                if (Main.platform instanceof PlatformHookWindows) {
+                    // Desktop API works fine under Windows, so we don't try any fallback in case of I/O exceptions because it's not API's fault
                     Desktop.getDesktop().browse(uri);
-                } catch (IOException e) {
-                    // Workaround for KDE (Desktop API is severely flawed)
-                    // see http://bugs.sun.com/view_bug.do?bug_id=6486393
-                    Main.warn("Desktop class failed. Platform dependent fall back for open url in browser.");
-                    displayUrlFallback(uri);
+                } else {
+                    // This is not the case with some Linux environments (see below), and not sure about Mac OS X, so we need to handle API failure
+                    try {
+                        Desktop.getDesktop().browse(uri);
+                    } catch (IOException e) {
+                        // Workaround for KDE (Desktop API is severely flawed)
+                        // see https://bugs.openjdk.java.net/browse/JDK-6486393
+                        Main.warn("Desktop class failed. Platform dependent fall back for open url in browser.");
+                        displayUrlFallback(uri);
+                    }
                 }
             } catch (Exception e) {
-                e.printStackTrace();
+                Main.warn(e);
                 return e.getMessage();
             }
@@ -69 +81 @@
     }
 
+    /**
+     * Displays an external URL using platform associated software. 
+     * A web resource will launch platform's browser, an audio file URL will launch audio player, etc. 
+     * @param url The URL to display
+     * @return <code>null</code> for success or a string in case of an error.
+     * @throws IllegalStateException thrown if no platform is set to which opening the URL can be dispatched,
+     * {@link Main#platform}
+     */
     public static String displayUrl(String url) {
         try {