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

Timestamp:

2003-08-27T15:12:03+12:00 (21 years ago)

Author:

jmt12

Message:

Fixed 203B113 - custom filters now persistant throughout session

File:

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

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

@@ -109 +109 @@
     label.setPreferredSize(SIZE);
     // Add listeners.
-    combobox.addItemListener(new ComboBoxListener());
+    combobox.addActionListener(new ComboBoxListener());
     // Layout.
     label.setBorder(BorderFactory.createEmptyBorder(0,0,0,5));
@@ -233 +233 @@
     /** 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
-    implements ItemListener {
-    /** Called when a new item is selected from the filter combobox, we treat the new entry as a pseudo-regular expression, compile it and then apply it to the tree.
-     * @param event An <strong>ItemEvent</strong> containing more information about the change performed.
+    implements ActionListener {
+/** Called when a new item is selected from the filter combobox, we treat the new entry as a pseudo-regular expression, compile it and then apply it to the tree.
+     * @param event An <strong>ActionEvent</strong> containing more information about the change performed.
      * @see org.greenstone.gatherer.gui.Filter.Entry
      */
-    public void itemStateChanged(ItemEvent event) {
-        if(!ignore) {
-        ignore = true;
-        if(event.getStateChange() == ItemEvent.SELECTED) {
-            try {
-            Object temp = combobox.getSelectedItem();
-            Entry entry = null;
-            if(temp instanceof String) {
-                String temp_str = (String) temp;
-                ///ystem.err.println("Filter = " + temp_str);
-                // Ignore any string which matches a predefined filter, starting with All Files.
-                if(temp_str.equals(get("All_Files"))) {
-                }
-                // HTM & HTML
-                else if(temp_str.equals(get("0"))) {
-                }
-                // XML
-                else if(temp_str.equals(get("1"))) {
-                }
-                // Text files
-                else if(temp_str.equals(get("2"))) {
-                }
-                // Images
-                else if(temp_str.equals(get("3"))) {
-                }
-                else {
-                entry = new Entry((String)temp, Pattern.compile(encode((String)temp)));
-                //combobox.removeItem(temp);
-                //int position = combobox.add(entry);
-                //combobox.setSelectedIndex(position);
-                }
-            }
-            else {
-                entry = (Entry) temp;
-            }
-            if(entry != null) {
-                setFilter(entry.getPattern());
-                // Synchronize other controls.
-                /*
-                  for(int i = 0; i < others.size(); i++) {
-                  Filter sibling = (Filter) others.get(i);
-                  if(sibling != this_filter) {
-                  sibling.setComboBoxSelection((Entry)entry);
-                  }
-                  }
-                */
-            }
-            // Else we ignore this event as being one of the painfully erroneous events we receive because we've been silly enough to have an editable combobox.
-            }
-            catch (PatternSyntaxException error) {
-            if(first) {
-                JOptionPane.showMessageDialog(Gatherer.g_man, get("Invalid_Pattern"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
-            }
+    public void actionPerformed(ActionEvent event) {
+        try {
+        Object temp = combobox.getSelectedItem();
+        Entry entry = null;
+        if(temp instanceof String) {
+            String temp_str = (String) temp;
+            ///ystem.err.println("Filter = " + temp_str);
+            // Ignore any string which matches a predefined filter, starting with All Files.
+            if(temp_str.equals(get("All_Files"))) {
+            }
+            // HTM & HTML
+            else if(temp_str.equals(get("0"))) {
+            }
+            // XML
+            else if(temp_str.equals(get("1"))) {
+            }
+            // Text files
+            else if(temp_str.equals(get("2"))) {
+            }
+            // Images
+            else if(temp_str.equals(get("3"))) {
+            }
+            else {
+            ///ystem.err.println("Temporary Custom Filter");
+            entry = new Entry((String)temp, Pattern.compile(encode((String)temp)));
+            combobox.removeItem(temp);
+            int position = combobox.getItemCount();
+            combobox.insertItemAt(entry, position);
+                combobox.setSelectedIndex(position);
+            ///ystem.err.println("Inserting permanent custom filter.");
             }
         }
-        ignore = false;
+        else {
+            ///ystem.err.println("Custom Filter");
+            entry = (Entry) temp;
+        }
+        if(entry != null) {
+            setFilter(entry.getPattern());
+        }
+        // Else we ignore this event as being one of the painfully erroneous events we receive because we've been silly enough to have an editable combobox.
+        }
+        catch (PatternSyntaxException error) {
+        if(first) {
+            JOptionPane.showMessageDialog(Gatherer.g_man, get("Invalid_Pattern"), get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        }
         }
     }