Changeset 8811

Timestamp:

2004-12-15T11:13:06+13:00 (19 years ago)

Author:

mdewsnip

Message:

Minor tidy ups.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Dictionary.java (modified) (1 diff)
• GAuthenticator.java (modified) (3 diffs)
• Gatherer.java (modified) (1 diff)
• collection/DownloadJob.java (modified) (2 diffs)

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

@@ -213 +213 @@
 
 
-    static public void registerTooltip(Component component, String tooltip_key) {
+    static public void registerTooltip(Component component, String tooltip_key)
+    {
     setTooltip(component, tooltip_key);
     }
 
 
-    static public void registerTooltipText(Component component, String tooltip) {
+    static public void registerTooltipText(Component component, String tooltip)
+    {
     setTooltipText(component, tooltip);
     }

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

@@ -40 +40 @@
 import java.awt.event.*;
 import java.net.*;
+import java.util.*;
 import javax.swing.*;
 import org.greenstone.gatherer.gui.GLIButton;
@@ -48 +49 @@
  */
 public class GAuthenticator
-    extends Authenticator {
+    extends Authenticator
+{
+    static public Hashtable authentications = new Hashtable();
+
     /** Indicates if this authentication prompt been cancelled, and if so rolls-back authentication. */
     private boolean authentication_cancelled = false;
@@ -129 +133 @@
     if(!authentication_cancelled) {
         // Store the authentication
-        Gatherer.authentications.put(getRequestingHost() + ":" + getRequestingPort(), username.getText() + "@" + new String(password.getPassword()));
+        authentications.put(getRequestingHost() + ":" + getRequestingPort(), username.getText() + "@" + new String(password.getPassword()));
         return new PasswordAuthentication(username.getText(), password.getPassword());
     } else {

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

@@ -64 +64 @@
 public class Gatherer
 {
-    static public Hashtable authentications = new Hashtable();
-
-    static final private String SKIN_DEFINITION_FILE = "lib/greenaqua/greenaqua.xml";
-
-    /** Has the exit flag been set? <i>true</i> if so, <i>false</i> otherwise. */
+    /** Has the exit flag been set? */
     public boolean exit = false;
-    /** The size of the Gatherer window. */
-    public Dimension frame_size = null;
 
     /** All of the external applications that must exit before we close the Gatherer. */

trunk/gli/src/org/greenstone/gatherer/collection/DownloadJob.java

@@ -46 +46 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.GAuthenticator;
 import org.greenstone.gatherer.WGet;
 import org.greenstone.gatherer.file.WorkspaceTree;
@@ -231 +232 @@
         String address = proxy_host + ":" + proxy_port;
         int count = 0;
-        while(count < 3 && (user_pass = (String) Gatherer.authentications.get(address)) == null) {
+        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++;