Changeset 24479 for main/trunk

Timestamp:

2011-08-25T22:04:29+12:00 (13 years ago)

Author:

ak19

Message:

When do not modify port is selected, it displays an error message and does nothing until you hit the restart button.

Location:

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

Files:

• BaseServer.java (modified) (2 diffs)
• BaseServerControl.java (modified) (1 diff)
• BaseServerSettings.java (modified) (2 diffs)
• Server2.java (modified) (3 diffs)

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

@@ -250 +250 @@
     }
     
-    public  void reloadConfigProperties(boolean port_has_changed) {
+    // returns true on success
+    public boolean reloadConfigProperties(boolean port_has_changed) {
     try {
         FileInputStream in = new FileInputStream(config_properties_file);
@@ -265 +266 @@
     }
     
+    return true;
     }
 

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

@@ -280 +280 @@
     }
     }
+    
+    public void errorMessage(String message) {
+        JOptionPane.showMessageDialog(null,message,"Error", JOptionPane.ERROR_MESSAGE);
+    }
 }

main/trunk/greenstone3/src/java/org/greenstone/server/BaseServerSettings.java

@@ -290 +290 @@
         
         String osName = System.getProperty("os.name");
-                if (osName.startsWith("Windows")){
+        if (osName.startsWith("Windows")){
             browserPath = browserPath.replaceAll("\\\\","/");
         }
@@ -297 +297 @@
         scriptReadWrite.writeOutFile(BaseServer.config_properties_file, newFileLines);
 
-        server.reloadConfigProperties(port_has_changed);
-        server.reload(); // work out the URL again in case it has changed
-        if (require_restart){
-            JOptionPane.showMessageDialog(null,server.dictionary.get("ServerSettings.SettingChanged"),"Info", JOptionPane.INFORMATION_MESSAGE);
-            if(autoStart) {
-            server.autoStart();
-            server.getServerControl().updateControl();
-            }
+        if(server.reloadConfigProperties(port_has_changed)) { // successful/valid configuration changes
+                                                              // if failure, it would have displayed an error message
+            server.reload(); // work out the URL again in case it has changed
+            if (require_restart){
+                JOptionPane.showMessageDialog(null,server.dictionary.get("ServerSettings.SettingChanged"),"Info", JOptionPane.INFORMATION_MESSAGE);
+                if(autoStart) {
+                    server.autoStart();
+                    server.getServerControl().updateControl();
+                }
+            }
         }
         } 

main/trunk/greenstone3/src/java/org/greenstone/server/Server2.java

@@ -301 +301 @@
     }
 
-    public void reloadConfigProperties(boolean port_has_changed) {
+    public boolean reloadConfigProperties(boolean port_has_changed) {
     super.reloadConfigProperties(port_has_changed);
 
@@ -318 +318 @@
         if(!PortFinder.isPortAvailable(portNum, verbose)) { // first time, print any Port Unavailable messages
         if(keepport.equals("1")) {
-            String errorMsg = "Unable to run the Greenstone server on port " + port + ". It may already be in use.";
+            server_control_.errorMessage(dictionary.get("ServerSettings.SettingsUnchangedPortOccupied", new String[]{port}));
+            String errorMsg = "Unable to run the Greenstone server on port " + port + ". It appears to already be in use.";
             System.err.println("\n******************");
-            logger_.error(errorMsg);
+            logger_.error(errorMsg);
             System.err.println("If you wish to try another port, go to File > Settings of the Greenstone Server interface and either change the port number or untick the \"Do Not Modify Port\" option there. Then press the \"Enter Library\" button.");
             System.err.println("******************\n");
+            
+            return false; // property change is unsuccessful
+            
         } else { // can modify port, try to find a new port
         
@@ -355 +359 @@
     }
     
+    return true;
     }