Changeset 20908 for greenstone3

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.

Location:

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

Files:

• BaseServer.java (modified) (3 diffs)
• BaseServerControl.java (modified) (3 diffs)
• BrowserLauncher.java (modified) (5 diffs)

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

@@ -9 +9 @@
 import java.io.InputStreamReader;
 import java.util.Properties;
+import javax.swing.JOptionPane;
 
 import org.apache.log4j.*;
@@ -184 +185 @@
 
     public void launchBrowser() {
-        server_state_ = -1;
+    server_state_ = -1;
         server_control_.updateControl();   
+    String url = getBrowserURL();
         String message = dictionary.get("ServerControl.LaunchingBrowser");
         server_control_.displayMessage(message); 
-    String url = getBrowserURL();
     //recordError("**** browserURL: " + url);
-    BrowserLauncher launcher = new BrowserLauncher(config_properties.getProperty(BaseServer.Property.BROWSER_PATH, ""),
-                               url,
-                               dictionary.get("ServerSettings.NoBrowserFound"),
-                               dictionary.get("ServerSettings.BrowserLaunchFailed"));
+    BrowserLauncher launcher = new BrowserLauncher(config_properties.getProperty(BaseServer.Property.BROWSER_PATH, ""), url);
         logger_.info(message);
 
@@ -206 +204 @@
         logger_.error(e);
         }
-         } 
-
+    }
+    
     if (launcher.getBrowserState() != BrowserLauncher.LAUNCHSUCCESS ){
         recordError(dictionary.get("ServerControl.LaunchBrowser")); 
-        server_state_ = BROWSER_LAUNCH_FAILED; 
+        server_state_ = BROWSER_LAUNCH_FAILED;
     }
     else{

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

@@ -75 +75 @@
         info_label.setVerticalAlignment(SwingConstants.CENTER);
         info_label.setFont(new Font("SansSerif",Font.PLAIN,14));
-    info_label.setBorder(BorderFactory.createEmptyBorder(5,10,5,10));           
-        
+    info_label.setBorder(BorderFactory.createEmptyBorder(5,10,5,10));
+            
         JPanel button_panel = new JPanel(new FlowLayout(FlowLayout.CENTER));
     enter_button = new JButton();
@@ -159 +159 @@
     case BaseServer.BROWSER_LAUNCHED:
         {
-        info_label.setText(stringToHTML(BaseServer.dictionary.get("ServerControl.Help_RestartLibrary")));
+        info_label.setText(stringToHTML(BaseServer.dictionary.get("ServerControl.BrowserLaunched",new String[]{server.getBrowserURL()})
+                        + BaseServer.dictionary.get("ServerControl.Help_RestartLibrary")));
         enter_button.setText(stringToHTML(BaseServer.dictionary.get("ServerControl.RestartLibrary")));
         thisframe.setState(Frame.ICONIFIED);
@@ -168 +169 @@
     case BaseServer.BROWSER_LAUNCH_FAILED:
         {
-        enter_button.setText(stringToHTML(BaseServer.dictionary.get("ServerControl.EnterLibrary")
-                          + "(URL: " + server.getBrowserURL() + ")"));
+        info_label.setText(stringToHTML(BaseServer.dictionary.get("ServerControl.BrowserLaunchFailed",new String[]{server.getBrowserURL()})));
+        enter_button.setText(stringToHTML(BaseServer.dictionary.get("ServerControl.EnterLibrary")));
         enter_button.setEnabled(true);
         fMenu.setEnabled(true);

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.");      
         }
     }