Changeset 10239

Timestamp:

2005-07-13T11:44:07+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added the "isApplet" variable to allow the GLI to use a remote Greenstone server running stand-alone as well as an applet.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (3 diffs)
• GathererApplet.java (modified) (1 diff)
• gui/ExplodeMetadataPrompt.java (modified) (1 diff)
• gui/GUIManager.java (modified) (1 diff)

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

@@ -87 +87 @@
     static public boolean GS3 = false;
 
+    static public boolean isApplet = false;
     static public boolean isGsdlRemote = false;
     static public String cgiBase = "";
@@ -222 +223 @@
         missingImageMagick();
         }
-        
+
         if (Gatherer.isGsdlRemote) {
         DebugStream.println("Not checking for perl path/exe");
@@ -433 +434 @@
     }
 
-    if(apps.size() == 0) {
-        if (!Gatherer.isGsdlRemote) {
+    // Make sure we haven't started up any processes that are still running
+    if (apps.size() == 0) {
+        if (Gatherer.isApplet) {
+        // If we're running as an applet we don't actually quit, just delete the main GLI window
+        g_man = null;
+        }
+        else {
+        // This is the end...
         System.exit(0);
-        }
-        else {
-        g_man = null;
         }
     }

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

@@ -137 +137 @@
         gatherer.feedback_dialog = dlg;
     }
-    
+
+    Gatherer.isApplet = true;
     Gatherer.isGsdlRemote = true;
     Gatherer.cgiBase = cgi_base;

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

@@ -228 +228 @@
     {
     if (Gatherer.isGsdlRemote) {
-        // what here??
+        // !! TO DO
         return -1;
     }

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

@@ -416 +416 @@
 
     if (!Gatherer.c_man.ready() || design_pane.canSave()) {
-        if (Gatherer.isGsdlRemote) {            
+        // If we're running as an applet we don't actually quit, just hide the main GLI window
+        if (Gatherer.isApplet) {
         // consider saving???
         setVisible(false);