Changeset 8431 for trunk/gli/src/org/greenstone/gatherer/gui/metaaudit

Timestamp:

2004-11-03T11:30:47+13:00 (20 years ago)

Author:

mdewsnip

Message:

Some cosmetic improvements.

File:

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

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

@@ -84 +84 @@
     }
     }
+
+
     /** Determine if a certain row should be shown in the table by checking it against all the current filters.
      * @param model The <strong>TableModel</strong> the row is from.
@@ -89 +91 @@
      * @return <i>true</i> if the rows data matches all autofilters set and should be displayed, <i>false</i> otherwise.
      */
-    public boolean filter(TableModel model, int row) {
-    boolean result = true;
-    for(int i = 0; result && i < filters.length; i++) {
-        if(filters[i] != null && filters[i].active()) {
+    public boolean filter(TableModel model, int row)
+    {
+    for (int i = 0; i < filters.length; i++) {
+        if (filters[i] != null && filters[i].active()) {
         ArrayList values = (ArrayList) model.getValueAt(row, i);
-        result = result && filters[i].filter(values);
+        if (filters[i].filter(values) == false) {
+            return false;
+        }
         }
     }
-    return result;
+
+    return true;
     }
+
+
     /** Retrieve the autofilter associated with a certain column.
      * @param column The column number as an <i>int</i>.