Version 11, August 2010

[GpsPrune.git] / tim / prune / function / browser / BrowserLauncher.java

diff --git a/tim/prune/function/browser/BrowserLauncher.java b/tim/prune/function/browser/BrowserLauncher.java
index ecfd83f9b7bea07814dbcff564dcb78b63c2af09..d23a2f72cee7920c3173ddebcab15401fceaae35 100644 (file)
--- a/tim/prune/function/browser/BrowserLauncher.java
+++ b/tim/prune/function/browser/BrowserLauncher.java
@@ -1,10 +1,12 @@
 package tim.prune.function.browser;
 
+import java.net.URI;
 import javax.swing.JOptionPane;
 
 
 /**
  * Class to launch a browser window to show an external map
+ * Some code and ideas taken from BareBonesBrowserLaunch at centerkey.com
  */
 public abstract class BrowserLauncher
 {
@@ -18,11 +20,13 @@ public abstract class BrowserLauncher
         */
        private static void init()
        {
+               _browserCommand = null;
                // First check if "which" command is available
                if (commandExists("which"))
                {
                        // which exists, so try browsers in turn
-                       String[] browsersToTry = {"firefox", "iceweasel", "konqueror", "opera", "epiphany", "mozilla", "safari", "lynx"};
+                       String[] browsersToTry = {"firefox", "iceweasel", "konqueror", "opera", "epiphany",
+                               "mozilla", "safari", "google-chrome", "lynx"};
                        String browserFound = null;
                        for (int i=0; i<browsersToTry.length && browserFound == null; i++)
                        {
@@ -33,12 +37,12 @@ public abstract class BrowserLauncher
                                _browserCommand = new String[] {browserFound, null};
                        }
                }
-               else
+
+               if (_browserCommand == null)
                {
-                       // no which command, so check if os name looks like a mac
+                       // no which command (or none of the browsers found), so check if os name looks like a mac
                        String osName = System.getProperty("os.name").toLowerCase();
-                       boolean isMacOsx = osName.indexOf("mac os") >= 0
-                        || osName.indexOf("darwin") >= 0;
+                       boolean isMacOsx = osName.indexOf("mac os") >= 0 || osName.indexOf("darwin") >= 0;
                        if (isMacOsx) {
                                // for Mac Osx just use "open" command
                                _browserCommand = new String[] {"open", null};
@@ -79,24 +83,35 @@ public abstract class BrowserLauncher
         */
        public static void launchBrowser(String inUrl)
        {
-               if (!_initialised) {init();}
-               if (_browserCommand == null) {
-                       JOptionPane.showMessageDialog(null, "Cannot show url: " + inUrl);
+               // First choice is to try the Desktop library from java 6, if available
+               try {
+                       Class<?> d = Class.forName("java.awt.Desktop");
+                       d.getDeclaredMethod("browse", new Class[] {URI.class}).invoke(
+                               d.getDeclaredMethod("getDesktop").invoke(null), new Object[] {URI.create(inUrl)});
+                       //above code mimics: Desktop.getDesktop().browse(URI.create(inUrl));
                }
-               else
+               catch (Exception ignore)
                {
-                       try
-                       {
-                               // enclose url in quotes if necessary
-                               String url = inUrl;
-                               if (_urlNeedsQuotes) {url = "\"" + url + "\"";}
-                               // Fill in url in last element of coommand array
-                               _browserCommand[_browserCommand.length - 1] = url;
-                               // execute command to launch browser
-                               Runtime.getRuntime().exec(_browserCommand);
+                       // The Desktop call failed, need to try backup methods
+                       if (!_initialised) {init();}
+                       if (_browserCommand == null) {
+                               JOptionPane.showMessageDialog(null, "Cannot show url: " + inUrl);
                        }
-                       catch (Exception e) {
-                               JOptionPane.showMessageDialog(null, "Failed to show url: " + inUrl);
+                       else
+                       {
+                               try
+                               {
+                                       // enclose url in quotes if necessary
+                                       String url = inUrl;
+                                       if (_urlNeedsQuotes) {url = "\"" + url + "\"";}
+                                       // Fill in url in last element of command array
+                                       _browserCommand[_browserCommand.length - 1] = url;
+                                       // execute command to launch browser
+                                       Runtime.getRuntime().exec(_browserCommand);
+                               }
+                               catch (Exception e) {
+                                       JOptionPane.showMessageDialog(null, "Failed to show url: " + inUrl);
+                               }
                        }
                }
        }