Changeset 12225 for trunk/gli/src/org

Timestamp:

2006-07-14T10:03:04+12:00 (18 years ago)

Author:

davidb

Message:

Instead of GLI saying it needs to restart when the language interface has changed,
it now exits (having gone through the usual routine that saves the session etc)
with level 2. This is then used by gli.sh/gli.bat to loop around again and
relaunch GLI. Any other exit status, and gli.sh/gli.bat stops as before.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (3 diffs)
• gui/Preferences.java (modified) (1 diff)

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

@@ -496 +496 @@
      * @see org.greenstone.gatherer.gui.GUIManager
      */
-    static public void exit()
+    static public void exit(int exit_status)
     {
     DebugStream.println("In Gatherer.exit()...");
@@ -529 +529 @@
         if (!Gatherer.isApplet) {
         // This is the end...
-        System.exit(0);
+        System.exit(exit_status);
         }
     }
@@ -538 +538 @@
     }
 
+    static public void exit()
+    {
+    exit(0);
+    }
 
     /** Returns the path of the Greenstone "collect" directory. */

trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -792 +792 @@
         self.dispose();
         }
+
+        if (restart_required) {
+        Gatherer.exit(2);
+        }
     }
     }