Changeset 8605

Timestamp:

2004-11-19T15:12:39+13:00 (19 years ago)

Author:

mdewsnip

Message:

Removed some dead code.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (3 diffs)
• gui/WarningDialog.java (modified) (3 diffs)

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

@@ -98 +98 @@
     static public ServletConfiguration servlet_config;
     /** A public reference to the Dictionary. */
-    static public Dictionary dictionary;
+    // static public Dictionary dictionary;
     /** A public reference to the FileManager. */
     static public FileManager f_man;
@@ -198 +198 @@
         
         // Read Dictionary
-        dictionary = new Dictionary(Configuration.getLocale("general.locale", true), Configuration.getFont("general.font", true));
-
+        new Dictionary(Configuration.getLocale("general.locale", true), Configuration.getFont("general.font", true));
 
         if (gsdl_path == null) {
@@ -431 +430 @@
     g_man.destroy();
     g_man_built = false;
-
-
-    // Flush dictionary
-    // dictionary.destroy();
 
     // Flush debug

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

@@ -35 +35 @@
 import org.greenstone.gatherer.util.Utility;
 
-/** Warn a user that they are about to add folder level metadata. */
+
+/** A dialog that warns about something, and allows the user to turn off the warning in the future. */
 public class WarningDialog
     extends ModalDialog 
@@ -43 +44 @@
     static final private Dimension SETTING_SIZE = new Dimension(450, 200);
 
-    private Dictionary dictionary;
     private int result = JOptionPane.CANCEL_OPTION;
     private JButton cancel_button;
@@ -54 +54 @@
     private String warning_name;
 
-    public WarningDialog(String full_property) {
-    this(full_property, false, null, Gatherer.dictionary);
-    }
 
     public WarningDialog(String full_property, boolean can_cancel) {
-    this(full_property, can_cancel, null, Gatherer.dictionary);
+    this(full_property, can_cancel, null);
     }
 
     public WarningDialog(String full_property, String affected_property) {
-    this(full_property, false, affected_property, Gatherer.dictionary);
-    }
-
-    public WarningDialog(String full_property, boolean can_cancel, Dictionary dictionary) {
-    this(full_property, can_cancel, null, dictionary);
-    }
-
-    public WarningDialog(String full_property, String affected_feature, Dictionary dictionary) {
-    this(full_property, false, affected_feature, dictionary);
-    }
-
-    public WarningDialog(String full_property, boolean can_cancel, String affected_property) {
-    this(full_property, can_cancel, affected_property, Gatherer.dictionary);
-    }
-    
-    public WarningDialog(String full_property, boolean can_cancel, String affected_property, Dictionary dictionary) {
+    this(full_property, false, affected_property);
+    }
+
+
+    private WarningDialog(String full_property, boolean can_cancel, String affected_property) {
     super(Gatherer.g_man, "Warning", true);
 
     // Determine the name of this prompt.
     this.affected_property = affected_property;
-    this.dictionary = dictionary;
     this.full_property = full_property;
     warning_name = full_property.substring(full_property.indexOf(".") + 1);