Changeset 20899 for greenstone3/trunk/src/java/org/greenstone/server/BrowserLauncher.java

Timestamp:

2009-11-03T19:49:03+13:00 (14 years ago)

Author:

ak19

Message:

Updated so that the GSI dialog does not silently fail when it fails to launch the browser.

File:

• greenstone3/trunk/src/java/org/greenstone/server/BrowserLauncher.java (modified) (7 diffs)

greenstone3/trunk/src/java/org/greenstone/server/BrowserLauncher.java

@@ -1 +1 @@
 package org.greenstone.server;
 
+import javax.swing.JOptionPane;
 import java.io.BufferedReader;
 import java.io.InputStream;
@@ -10 +11 @@
 public class BrowserLauncher 
     extends Thread {
+    private String browserNotFound;
+    private String browserLaunchFailed;
     
     private String url = "about:blank" ;
@@ -20 +23 @@
     private String browserPath = ""; 
 
-    public BrowserLauncher(String browserPath, String url) {
+    public BrowserLauncher(String browserPath, String url, String browserNotFound, String browserLaunchFailed) {
     this.url = url;
+    this.browserNotFound = browserNotFound;
+    this.browserLaunchFailed = browserLaunchFailed;
         this.browserPath = browserPath;
         //use the default browser
@@ -86 +91 @@
     if(command.equals("")) {
         state = LAUNCHFAILED;
-            logger.error("launching command is empty");
+            logger.error("launching command is empty: no browser found.");
+        JOptionPane.showMessageDialog(null, browserNotFound, "Warning", JOptionPane.WARNING_MESSAGE);
         return;
     }
     
         try {
+        int exitCode = 0;
         String prog_name = this.command.substring(0,this.command.indexOf(" "));
         String lower_name = prog_name.toLowerCase();
@@ -101 +108 @@
         Process process = rt.exec(new_command);
                 state = LAUNCHSUCCESS;
-        int exitCode = process.waitFor();
+        exitCode = process.waitFor();
         logger.info("ExitCode:" + exitCode);              
         if (exitCode != 0) { // if Netscape or mozilla was not open
@@ -108 +115 @@
             process = rt.exec(this.command); // try the original command
                     state = LAUNCHSUCCESS;
-            //for some reseaons the following part is not executed somtimes.
+            //for some reason the following part is not executed sometimes.
                     exitCode = process.waitFor();
-                    logger.info("ExitCode:" + exitCode);
         }
         } else {
@@ -117 +123 @@
         Process process = rt.exec(this.command);
                 state = LAUNCHSUCCESS;
-                //for some reseaons the following part is not executed sometimes.
-                int exitCode = process.waitFor();
-        logger.info("ExitCode:" + exitCode);
-        
+                //for some reason the following part is not executed sometimes.
+                exitCode = process.waitFor();
+        }
+
+        logger.info("ExitCode:" + exitCode);
+        if (exitCode != 0) { // if trying to launch the browser above failed
+        logger.info(browserLaunchFailed);
+        JOptionPane.showMessageDialog(null, browserLaunchFailed, "Warning", JOptionPane.WARNING_MESSAGE);
         }
     }