Changeset 19243

Timestamp:

2009-04-23T19:04:51+12:00 (15 years ago)

Author:

ak19

Message:

The length of time to wait for the server to startup or stop is stored ina variable (better to keep this length somewhat similar to how long greenstone3's src code server/Server2.java waits).

Location:

gli/trunk

Files:

• classes/dictionary.properties (modified) (1 diff)
• src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java (modified) (3 diffs)

gli/trunk/classes/dictionary.properties

@@ -994 +994 @@
 #
 Server.QuitManual:The Librarian Interface was unable to close the local\nlibrary server automatically. Please exit the server\nmanually by clicking on the cross icon in its top\nright-hand corner, then click OK on this dialog.
-Server.QuitTimeOut:The greenstone local library has not responded to the\nautomatic close command for sixty seconds. Do you\nwish to wait for another minute?
+Server.QuitTimeOut:The greenstone local library has not responded to the\nautomatic close command for {0} seconds. Do you\nwish to wait for another {0} seconds?
+Server.StartUpTimeOut:The greenstone local library has not responded to the\nstart command for {0} seconds. Do you\nwish to wait for another {0} seconds?
 #
 #***** Sources *****

gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

@@ -43 +43 @@
 public class LocalLibraryServer
 {
+    static final private int WAITING_TIME = 60; // number of seconds to wait for the server to start and stop
+
     static final private String ADD_COMMAND = "?a=config&cmd=add-collection&c=";
     static final private String RELEASE_COMMAND = "?a=config&cmd=release-collection&c=";
@@ -258 +260 @@
         attempt_count++;
 
-        // After waiting a minute ask the user whether they want to wait another minute
-        if (attempt_count == 60) {
-        int try_again = JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("Server.QuitTimeOut"), Dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION);
+        // After waiting for the specified time, ask the user whether they want to wait for that long again
+        if (attempt_count == WAITING_TIME) {
+        int try_again = JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("Server.QuitTimeOut", Integer.toString(WAITING_TIME)),
+                                  Dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION);
         if (try_again == JOptionPane.NO_OPTION) {
             return;
@@ -310 +313 @@
         attempt_count++;
 
-        // After waiting a minute ask the user whether they want to wait another minute
-        if (attempt_count == 60) {
-        int try_again = JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("Server.QuitTimeOut"), Dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION);
+        // After waiting for the specified time, ask the user whether they want to wait for that long again
+        if (attempt_count == WAITING_TIME) {
+        int try_again = JOptionPane.showConfirmDialog(Gatherer.g_man, Dictionary.get("Server.StartUpTimeOut", Integer.toString(WAITING_TIME)),
+                                  Dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION);
         if (try_again == JOptionPane.NO_OPTION) {
             return;