Changeset 6221

Timestamp:

2003-12-10T17:21:45+13:00 (20 years ago)

Author:

jmt12

Message:

Cancelling the autofilter dialog no longer alternatively sets or clears a random filter

Location:

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit

Files:

• Autofilter.java (modified) (1 diff)
• AutofilterDialog.java (modified) (7 diffs)
• HeaderListener.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/Autofilter.java

@@ -329 +329 @@
             source = values.get(i).toString().toLowerCase();
         }
-        System.err.println("Testing " + source + " against pattern " + target);
+        ///ystem.err.println("Testing " + source + " against pattern " + target);
         // Perform the match, based on the selected method.
         switch(method) {

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/AutofilterDialog.java

@@ -59 +59 @@
     /** A reference to ourselves so our inner classes can reference us. */
     private AutofilterDialog self;
+
+    private boolean cancelled;
     /** The value returned from the filter dialog prompt. Used to determine if a prompt was set or unset, and what subsequent action to take. */
     private byte return_value = 0;
@@ -193 +195 @@
     none_radiobutton.addActionListener(new CheckListener(false));
     or_radiobutton.addActionListener(new CheckListener(true));
-    cancel_button.addActionListener(new ButtonListener(false));
+    cancel_button.addActionListener(new ButtonListener()); // It returns any currently set filter
     remove_button.addActionListener(new ButtonListener(false));
     set_button.addActionListener(new ButtonListener(true));
@@ -264 +266 @@
     setLocation((screen_size.width - SIZE.width) / 2, (screen_size.height - SIZE.height) / 2);
     screen_size = null;
+    }
+
+    public boolean cancelled() {
+    return cancelled;
     }
 
@@ -286 +292 @@
      */
     public Autofilter display(Autofilter filter, ArrayList raw_values, String column_name) {
+    this.cancelled = false;
     this.filter = filter;
     name.setText(column_name);
@@ -332 +339 @@
     private final class ButtonListener
     implements ActionListener {
+    private boolean cancel_button;
     private boolean return_filter;
+    
+    /** Default constructor. Returns any filter that was already set */
+    public ButtonListener() {
+        this.cancel_button = true;
+    }
+
     /** Does an action on this button cause a filter to be returned. */
     /** Constructor takes an associated return value as an argument.
@@ -338 +352 @@
      */
     public ButtonListener(boolean return_filter) {
+        this.cancel_button = false;
         this.return_filter = return_filter;
     }
@@ -345 +360 @@
      */
     public void actionPerformed(ActionEvent event) {
-        if(return_filter) {
+        if(cancel_button) {
+        cancelled = true;
+        }
+        else if(return_filter) {
         if(control.getSelectedIndex() == 0) {
             filter.setFilter(1, 0, (String)value.getSelectedItem(), true);

trunk/gli/src/org/greenstone/gatherer/gui/metaaudit/HeaderListener.java

@@ -73 +73 @@
     String column_name = model.getColumnName(clicked_column);
     filter = parent_frame.autofilter_dialog.display(filter, default_values, column_name);
-    if(filter == null) {
-        filter_model.clearFilter(clicked_column);
+    if(!parent_frame.autofilter_dialog.cancelled()) {
+        if(filter == null) {
+        filter_model.clearFilter(clicked_column);
+        }
+        else {
+        filter.setActive(true);
+        TableModelSorter sorter = table.getSorter();
+        sorter.setSortColumn(clicked_column);
+        sorter.setSortAscending(filter.sort);
+        }
+        filter_model.fireFilterChanged();
     }
-    else {
-        filter.setActive(true);
-        TableModelSorter sorter = table.getSorter();
-        sorter.setSortColumn(clicked_column);
-        sorter.setSortAscending(filter.sort);
-    }
-    filter_model.fireFilterChanged();
     }
 }