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

Timestamp:

2011-11-05T23:28:16+01:00 (13 years ago)

Author:

Don-vip

Message:

see #5805 - Java Desktop API Fallback on unsupported-but-said-supported platforms such as KDE

File:

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

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

@@ -8 +8 @@
 import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URL;
 
 import javax.swing.JApplet;
@@ -23 +22 @@
 public class OpenBrowser {
 
+    private static void displayUrlFallback(URI uri) throws IOException {
+        if (Main.platform == null)
+            throw new IllegalStateException(tr("Failed to open URL. There is currently no platform set. Please set a platform first."));
+        Main.platform.openUrl(uri.toString());
+    }
+    
     /**
      * @return <code>null</code> for success or a string in case of an error.
@@ -41 +46 @@
         if (Desktop.isDesktopSupported()) {
             try {
-                Desktop.getDesktop().browse(uri);
+                try {
+                    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
+                    System.err.println("Warning: Desktop class failed. Platform dependent fall back for open url in browser.");
+                    displayUrlFallback(uri);
+                }
             } catch (Exception e) {
                 e.printStackTrace();
@@ -47 +59 @@
             }
         } else {
-            System.err.println("Warning: Desktop class is not supported. Platform dependent fall back for open url in browser.");
-
-            if (Main.platform == null)
-                throw new IllegalStateException(tr("Failed to open URL. There is currently no platform set. Please set a platform first."));
             try {
-                Main.platform.openUrl(uri.toString());
+                System.err.println("Warning: Desktop class is not supported. Platform dependent fall back for open url in browser.");
+                displayUrlFallback(uri);
             } catch (IOException e) {
                 return e.getMessage();