From 635fa3269e8ebfbbe3fca3fa535e5d7f22649174 Mon Sep 17 00:00:00 2001
From: jprocter <Jim Procter>
Date: Wed, 25 May 2005 16:09:55 +0000
Subject: [PATCH] added jalview.browser property so a linux user can choose
 which browser they want to open swissprot entries with.

---
 src/jalview/bin/Cache.java            |    2 +-
 src/jalview/gui/IdPanel.java          |    4 +++-
 src/jalview/util/BrowserLauncher.java |    8 +++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/jalview/bin/Cache.java b/src/jalview/bin/Cache.java
index 66518fa..226a925 100755
--- a/src/jalview/bin/Cache.java
+++ b/src/jalview/bin/Cache.java
@@ -27,7 +27,7 @@ public class Cache
   // FONT_STYLE
   // FONT_SIZE
   // logs.Axis.Level - one of the stringified Levels for log4j controlling the logging level for axis (used for web services)
-
+  // jalview.browser - used in the jalview.utils.browserLauncher class if it doesn't know what else to do.
   public static void loadProperties()
   {
     // get last build time.
diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java
index 0b5d956..5db5e2e 100755
--- a/src/jalview/gui/IdPanel.java
+++ b/src/jalview/gui/IdPanel.java
@@ -68,7 +68,9 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
          jalview.util.BrowserLauncher.openURL(
              "http://srs.ebi.ac.uk/srs7bin/cgi-bin/wgetz?-e+[swall-id:" + id +
              "]+-vn+2");
-       }catch(Exception ex){ex.printStackTrace();}
+       }catch(Exception ex){System.err.println(
+           "Try adding the jalview.browser property to your jalview.properties file:\n"
+                            +"jalview.browser=firefox"); ex.printStackTrace();}
     }
 
   }
diff --git a/src/jalview/util/BrowserLauncher.java b/src/jalview/util/BrowserLauncher.java
index b169dc4..bba5727 100755
--- a/src/jalview/util/BrowserLauncher.java
+++ b/src/jalview/util/BrowserLauncher.java
@@ -193,6 +193,7 @@ public class BrowserLauncher {
          */
         private static final String NETSCAPE_REMOTE_PARAMETER = "-remote";
         private static final String NETSCAPE_OPEN_PARAMETER_START = "openURL(";
+        private static final String NETSCAPE_OPEN_NEW_WINDOW = ", new-window";
         private static final String NETSCAPE_OPEN_PARAMETER_END = ")";
 
         /**
@@ -466,7 +467,11 @@ public class BrowserLauncher {
                                 break;
                         case OTHER:
                         default:
-                                browser = "netscape";
+                                browser = jalview.bin.Cache.applicationProperties.getProperty("jalview.browser");
+                                if (browser==null) {
+                                  // hope netscape exists :-/
+                                  browser = "netscape";
+                                }
                                 break;
                 }
                 return browser;
@@ -563,6 +568,7 @@ public class BrowserLauncher {
                                                                                                         NETSCAPE_REMOTE_PARAMETER,
                                                                                                         NETSCAPE_OPEN_PARAMETER_START +
                                                                                                         url +
+                                                                                                        NETSCAPE_OPEN_NEW_WINDOW +
                                                                                                         NETSCAPE_OPEN_PARAMETER_END });
                                 try {
                                         int exitCode = process.waitFor();
-- 
1.7.10.2