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

Timestamp:

2009-11-04T20:15:41+13:00 (14 years ago)

Author:

ak19

Message:

Updated to display the URL when the browser fails to launch (and also when it launches successfully). Most of the previous commit to BrowserLauncher.java have been reverted now, and some additional changes have been made to it.

File:

• greenstone3/trunk/src/java/org/greenstone/server/BrowserLauncher.java (modified) (5 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;
@@ -11 +10 @@
 public class BrowserLauncher 
     extends Thread {
-    private String browserNotFound;
-    private String browserLaunchFailed;
-    
     private String url = "about:blank" ;
     static Logger logger = Logger.getLogger(org.greenstone.server.BrowserLauncher.class.getName());
@@ -23 +19 @@
     private String browserPath = ""; 
 
-    public BrowserLauncher(String browserPath, String url, String browserNotFound, String browserLaunchFailed) {
+    public BrowserLauncher(String browserPath, String url) {
     this.url = url;
-    this.browserNotFound = browserNotFound;
-    this.browserLaunchFailed = browserLaunchFailed;
         this.browserPath = browserPath;
         //use the default browser
@@ -92 +86 @@
         state = LAUNCHFAILED;
             logger.error("launching command is empty: no browser found.");
-        JOptionPane.showMessageDialog(null, browserNotFound, "Warning", JOptionPane.WARNING_MESSAGE);
         return;
     }
@@ -129 +122 @@
         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);
+        state = LAUNCHFAILED;
+        logger.error("Failed to launch web browser.");      
         }
     }