Changeset 5772

Timestamp:

2003-11-03T14:23:28+13:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed bug 229: the same file tree filter can be added multiple times to the drop-down list.

File:

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

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

@@ -129 +129 @@
     }
 
-    /** Change the background color of the filter. 
-     * @param color The new background <strong>Color</strong>.
-     */
-    public void setBackground(Color color) {
-    super.setBackground(color);
-    }
-
     /** Used to restore the filter state to enabled, the normal state during collection editing. 
      * @param state The new state for the filter. <i>true</i> for enabled, <i>false</i> otherwise.
@@ -237 +230 @@
             String temp_str = (String) temp;
             ///ystem.err.println("Filter = " + temp_str);
-            // Ignore any string which matches a predefined filter, starting with All Files.
+
+            // Ignore any string which matches a predefined filter
             if(temp_str.equals(Dictionary.get("Filter.All_Files"))) {
             }
@@ -253 +247 @@
             }
             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.");
+            // Make sure the filter isn't already in the list
+            boolean already_exists = false;
+            for (int i = 0; i < combobox.getItemCount(); i++) {
+                if (temp_str.equals(combobox.getItemAt(i).toString())) {
+                already_exists = true;
+                entry = (Entry) combobox.getItemAt(i);
+                break;
+                }
+            }
+
+            if (already_exists == false) {
+                entry = new Entry(temp_str, Pattern.compile(encode(temp_str)));
+                int position = combobox.getItemCount();
+                combobox.insertItemAt(entry, position);
+                combobox.setSelectedIndex(position);
+            }
             }
         }