Generic Model Organism Database Project

Update of /cvsroot/gmod/apollo/src/java/edu/stanford/ejalbert
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv5442

Modified Files:
	BrowserLauncher.java 
Log Message:
+ The old code was only checking for the return value of the browser launch process, but in certain browsers, if the launch fails there is no error return code (just messages to stderr...a problem with the web browser launch script, but we can't change that...)  Now correctly checks for both error codes and error messages.



Index: BrowserLauncher.java
===================================================================
RCS file: /cvsroot/gmod/apollo/src/java/edu/stanford/ejalbert/BrowserLauncher.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BrowserLauncher.java	25 Oct 2005 23:17:43 -0000	1.6
--- BrowserLauncher.java	14 Dec 2007 01:49:03 -0000	1.7
***************
*** 640,648 ****
    private static boolean redirectOpenBrowser(String browser, String remote, String open, String url, String close) {
      try {
!       //      System.out.println("redirectOpenBrowser: calling " + browser + " " + open + url + close); // DEL
        Process process = Runtime.getRuntime().exec(new String[] { 
          browser,
          remote,
          open + url + close});
        int exitCode = process.waitFor();
        //      System.out.println("exitCode = " + exitCode); // DEL
--- 640,655 ----
    private static boolean redirectOpenBrowser(String browser, String remote, String open, String url, String close) {
      try {
!       //System.out.println("redirectOpenBrowser: calling " + browser + " " + open + url + close); // DEL
        Process process = Runtime.getRuntime().exec(new String[] { 
          browser,
          remote,
          open + url + close});
+       java.io.BufferedReader br = new java.io.BufferedReader(new java.io.InputStreamReader(process.getErrorStream()));
+       String error = br.readLine();
+ 
+       if (error != null && error.startsWith("Error")) {
+         return false;
+       }
+       
        int exitCode = process.waitFor();
        //      System.out.println("exitCode = " + exitCode); // DEL