Changeset 38259 for main/trunk/gli/src

Timestamp:

2023-09-30T21:56:11+13:00 (9 months ago)

Author:

anupama

Message:

1. Removed some code that was unnecessary after all (it merely *seemed* to help things back when the actual problem was that the minus-webswing parameterwasn't being passed in to GLI because of the += in the webswing xsl's javascript code that appended to the args). 2. Removed or commented out debugging code. 3. I noticed that before adding my own actionName into the webswing xsl's javascript, emacs already reported mismatched braces. This may need further investigation. But counting them, they seem to me to match.

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (2 diffs)
• GathererProg.java (modified) (2 diffs)

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

@@ -250 +250 @@
         }
         else if (isWebswing) {
-
             
             Configuration.template_config_xml = Configuration.TEMPLATE_CONFIG_PREFIX +  Configuration.CONFIG_WEBSWING_XML; 
             Configuration.config_xml = Configuration.CONFIG_WEBSWING_XML;
-
-            String webswing_msg = "username: " + go.username +
-            "\ngroups: " + go.usergroups +
-            "\nuid: " + go.userJSessionID;
-            
-            JOptionPane.showMessageDialog(null, webswing_msg, "webswing info", JOptionPane.INFORMATION_MESSAGE);
-            /*
-              try {
-              Thread.sleep(5000);
-              } catch(Exception e) {
-              System.err.println("Couldn't sleep for 5000 ms");
-              }*/
             
             if(go.username != null && !go.username.equals("")
                && go.userJSessionID != null && !go.userJSessionID.equals("")) {
             
-            
             webswingAuthenticator = new WebswingAuthenticator(go.username, go.usergroups, go.userJSessionID);
-            } else { //if(webswingAuthenticator != null) {
-            WebswingAuthenticator.clear();
-            if(webswingAuthenticator != null) {
-                webswingAuthenticator = null;
-            }
             }
-            
         }
         else {      
@@ -2148 +2128 @@
         static protected String rawgroups;
 
-        static public void clear() {
-        username = null;
-        groups = null;
-        userJSessionID = null;
-        rawgroups = null;
-        }
-
         protected void displayError(String error_message) {
         WarningDialog dialog = new WarningDialog("warning.AuthenticationError", Dictionary.get("WebswingAuthenticationError.Title"), error_message, null, false, false); 

main/trunk/gli/src/org/greenstone/gatherer/GathererProg.java

@@ -31 +31 @@
 import javax.swing.*;
 import org.greenstone.gatherer.util.Utility;
-import org.webswing.toolkit.api.WebswingUtil;
-import java.util.Arrays;
 
 /**
@@ -69 +67 @@
     String gli_user_directory_path = null;
     if (go.webswing) {
-        WebswingUtil.getWebswingApi().sendActionEvent("jsConsoleLog", "args are: " + Arrays.toString(args), null);
+        //org.webswing.toolkit.api.WebswingUtil.getWebswingApi().sendActionEvent("javaToWebswingJSConsoleLog", "args are: " + java.util.Arrays.toString(args), null);
         
         if (go.gsdl3_src_path != null) {