Changeset 17621 for gli/trunk/src/org/greenstone/gatherer/gui

Timestamp:

2008-10-28T19:04:39+13:00 (16 years ago)

Author:

ak19

Message:

Correction to previous changes I made to GAuthenticator: it now only uses any previously stored values for username and password when the GAuthenticator operates in the new DOWNLOAD mode, which is set (and soon thereafter restored to the default REGULAR mode) in DownloadPane.java for (wget) downloads.

File:

• gli/trunk/src/org/greenstone/gatherer/gui/DownloadPane.java (modified) (1 diff)

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

@@ -634 +634 @@
         
             int count = 0;
+        // Only for wget, need to avoid a second automatic authentication popup (first asks
+        // the proxy authentication for wget, and the second will ask the same for the realm)
+        GAuthenticator.setMode(GAuthenticator.DOWNLOAD);
         while(count < 3 && (user_pass = (String) GAuthenticator.authentications.get(address)) == null) {
         Authenticator.requestPasswordAuthentication(proxy_host, null, Integer.parseInt(proxy_port), "http://", Dictionary.get("WGet.Prompt"), "HTTP");
         count++;
         }
-
+        GAuthenticator.setMode(GAuthenticator.REGULAR); // reset the state to default (of how the authentication popup functions)
         if(count >= 3) {
         return false;