Changeset 37312 for main

Timestamp:

2023-02-13T12:11:19+13:00 (15 months ago)

Author:

kjdon

Message:

added dialog to display authentication error to user

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (5 diffs)

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

@@ -284 +284 @@
         webswingAuthenticator = new WebswingAuthenticator();
         if (!webswingAuthenticator.authenticate(library_url_string)) {
-            System.err.println("authentication error");
+            System.err.println("Authentication error, quitting GLI");
             System.exit(0);
         }
@@ -1968 +1968 @@
         static protected HashSet<String> groups;
 
+        protected void displayError(String error_message) {
+        WarningDialog dialog = new WarningDialog("warning.AuthenticationError", Dictionary.get("WebswingAuthenticationError.Title"), error_message, null, false, false); 
+
+        dialog.display();
+        dialog.dispose();
+        dialog = null;
+        }
+
         public boolean authenticate(String library_url_string) {
         PasswordAuthentication pa = getPasswordAuthentication();
         if (pa == null) {
-            // user cancelled - how do we show error?
-            System.err.println("Authentication cancelled. You cannot access webswing gli without Greenstone user account");
+            // user cancelled 
+            System.err.println("Authentication cancelled.");
+            displayError(Dictionary.get("WenswingAuthenticationError.Cancelled"));
             return false;
 
@@ -1993 +2002 @@
         } catch (Exception e) {
             System.err.println("There was an exception "+e.getMessage());
+            displayError("There was an exception "+e.getMessage());
             return false;
         }
@@ -2005 +2015 @@
         if (result.startsWith("Authentication failed:")) {
             System.err.println("Authentication Error: "+result);
+            displayError(result.replaceAll("&apos;", "'"));
             return false;
         }
@@ -2016 +2027 @@
         }
         if (groups.size()==0) {
+            System.err.println("User not in any collection editing groups");
+            displayError(Dictionary.get("WebswingAuthenticationError.NoPermissions"));
             return false; // user has no editing priveleges
         }