Changeset 20908 for greenstone3/trunk/src/java/org/greenstone/server/BaseServerControl.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/BaseServerControl.java (modified) (3 diffs)

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);