Changeset 5564 for trunk/gli/src/org/greenstone/gatherer/gui/Filter.java

Timestamp:

2003-10-03T14:07:35+12:00 (21 years ago)

Author:

mdewsnip

Message:

Many more small improvements and tooltips added. Still more to come!

File:

• trunk/gli/src/org/greenstone/gatherer/gui/Filter.java (modified) (17 diffs)

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

@@ -1 @@
-package org.greenstone.gatherer.gui;
 /**
  *#########################################################################
@@ -36 +35 @@
  *########################################################################
  */
+package org.greenstone.gatherer.gui;
+
 import java.awt.*;
 import java.awt.event.*;
@@ -42 +43 @@
 import javax.swing.*;
 import javax.swing.tree.*;
+import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.file.FileSystemModel;
 import org.greenstone.gatherer.gui.tree.DragTree;
+
 /** <p>This object allows the user to set a filter on one of the workspace trees, specifying a preset type, or a regular expression that a files must match to be in the tree. Note that all directories are included. This class includes the controls for editing the filter. The trick is that several instances of the Filter class can share the same internal data (termed a 'run' of filters), so that the filter set on the CollectionPane and the MetaEditPane are virtually the same.</p>
- * <p>The regular expression typed can uses '*' as a wildcard character (equivelent to '.*'), and does not use '.' to match any single character (use '?' instead).</p>
+ * <p>The regular expression typed uses '*' as a wildcard character (equivalent to '.*'), and does not use '.' to match any single character (use '?' instead).</p>
  * @author John Thompson, Greenstone Digital Library, University of Waikato
  * @version 2.3
@@ -72 +75 @@
     /** Preprogrammed default filters. */
     static final private String DEFAULTS[] = {"^.*\\.html?$", "^.*\\.xml$", "^.*\\.txt$", "(^.*\\.jpe?g$)|(^.*\\.png$)|(^.\\.gif$)|(^.\\.bmp$)|(^.\\.tif$)"};
+
     /** Constructor.
      * @param tree A reference to the <strong>JTree</strong> being affected.
@@ -78 +82 @@
     this(tree, null);
     }
+
     /** Constructor.
      * @param tree A reference to the <strong>JTree</strong> being affected.
@@ -84 +89 @@
     public Filter(DragTree tree, ArrayList others) {
     super();
-    if(others == null) {
-        this.others = new ArrayList();
-    }
-    else {
-        this.others = others;
-    }
+    if (others == null) {
+        others = new ArrayList();
+    }
+    this.others = others;
     this.others.add(this);
     this.this_filter = this;
@@ -98 +101 @@
     for(int i = 0; i < DEFAULTS.length; i++) {
         try {
-        Entry entry = new Entry(get((new Integer(i)).toString(), null), Pattern.compile(DEFAULTS[i]));
+        Entry entry = new Entry(Dictionary.newget("Filter." + i), Pattern.compile(DEFAULTS[i]));
         combobox.add(entry);
         }
@@ -106 +109 @@
     }
     combobox.setEditable(true);
-    label = new JLabel(get("Filter.Filter_Tree"));
+    label = new JLabel();
     label.setPreferredSize(SIZE);
+    Dictionary.setText(label, "Filter.Filter_Tree");
     // Add listeners.
     combobox.addActionListener(new ComboBoxListener());
@@ -141 +145 @@
     ignore = false;
     }
+
     /** Set the combobox model for this filter.
      * @param model The new <strong>ComboBoxModel</strong> to use.
@@ -147 +152 @@
     combobox.setModel(model);
     }
+
     /** Ensure that a certain entry is selected from the combobox.
      * @param selection The <strong>Entry</strong> that should be selected.
@@ -155 +161 @@
     ignore = false;
     }
+
     /** Set to signify that this filter is the first in a new run of filters.
      * @param first <i>true</i> if this is the first filter in a run, <i>false</i> if it will just be added to the current run.
@@ -161 +168 @@
     this.first = first;
     }
-    /** Spawn produces a copy of this filter, which has new controls, but shares listeners wih this filter, and vice versa. Thus we can have two synchronized, but differing sets of controls.
+
+    /** Spawn produces a copy of this filter, which has new controls, but shares listeners with this filter, and vice versa. Thus we can have two synchronized, but differing sets of controls.
      * @param tree_spawn The <strong>JTree</strong> this filter will affect.
      * @return A new <strong>Filter</strong> which is in the same run as this filter.
@@ -172 +180 @@
     return filter;
     }
-    /** Retrieve a phrase from the dictionary.
-     * @param key The unique identification <strong>String</strong> of a phrase from the dictionary.
-     */
-    private String get(String key) {
-    return get(key, null);
-    }
-    /** Retrieve a phrase from the dictionary, augmenting with the given text fragments
-     * @param key The unique identification <strong>String</strong> of a phrase from the dictionary.
-     * @param args A <strong>String[]</strong> of arguments to be used to fill out parameter fields in the phrase returned.
-     * @see org.greenstone.gatherer.Dictionary
-     * @see org.greenstone.gatherer.Gatherer
-     */
-    private String get(String key, String args[]) {
-    if(key.indexOf(".") == -1) {
-        key = "Filter." + key;
-    }
-    return Gatherer.dictionary.get(key, args);
-    }
+
     /** Encode an expression in pseudo-regular expression into regular expression.
      * @param raw The pseudo-regular expression <strong>String</strong> which includes several characters which differ in meaning from regular expression queries.
@@ -231 +222 @@
     Gatherer.g_man.wait(false);
     }
+
     /** Listens for changes in the combobox as when one is detected attempts to compile a regular expression from whatever text was entered. If successful, or if the item chosen was a predefined filter, it then applies the filter to the target tree. */
     private class ComboBoxListener
@@ -246 +238 @@
             ///ystem.err.println("Filter = " + temp_str);
             // Ignore any string which matches a predefined filter, starting with All Files.
-            if(temp_str.equals(get("Filter.All_Files"))) {
+            if(temp_str.equals(Dictionary.newget("Filter.All_Files"))) {
             }
             // HTM & HTML
-            else if(temp_str.equals(get("Filter.0"))) {
+            else if(temp_str.equals(Dictionary.newget("Filter.0"))) {
             }
             // XML
-            else if(temp_str.equals(get("Filter.1"))) {
+            else if(temp_str.equals(Dictionary.newget("Filter.1"))) {
             }
             // Text files
-            else if(temp_str.equals(get("Filter.2"))) {
+            else if(temp_str.equals(Dictionary.newget("Filter.2"))) {
             }
             // Images
-            else if(temp_str.equals(get("Filter.3"))) {
+            else if(temp_str.equals(Dictionary.newget("Filter.3"))) {
             }
             else {
@@ -281 +273 @@
         catch (PatternSyntaxException error) {
         if(first) {
-            JOptionPane.showMessageDialog(Gatherer.g_man, get("Filter.Invalid_Pattern"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.newget("Filter.Invalid_Pattern"), Dictionary.newget("General.Error"), JOptionPane.ERROR_MESSAGE);
         }
         }
@@ -322 +314 @@
     public String toString() {
         String result = null;
-        if(name != null) {
+        if (name != null) {
         result = name;
         }
-        else if(pattern == null) {
-        result = get("Filter.All_Files");
+        else if (pattern == null) {
+        result = Dictionary.newget("Filter.All_Files");
         }
         else {