1.1 --- a/tasklist.core/src/org/netbeans/modules/tasklist/core/TaskListView.java	Sun Jul 04 11:17:16 2004 +0000
     1.2 +++ b/tasklist.core/src/org/netbeans/modules/tasklist/core/TaskListView.java	Sun Jul 04 15:45:23 2004 +0000
     1.3 @@ -1295,12 +1295,12 @@
     1.4       * @param filter The filter to be set, or null, to remove filtering.
     1.5       */
     1.6      public void setFilter(Filter filter) {         
     1.7 -      if (filter == null || getFilters().contains(filter)) {
     1.8 -        getFilters().setActive(filter);  
     1.9 -      } 
    1.10 +        if (filter == null || getFilters().contains(filter)) {
    1.11 +            getFilters().setActive(filter);  
    1.12 +        } 
    1.13  
    1.14 -      this.activeFilter = filter;
    1.15 -      setFiltered();
    1.16 +        this.activeFilter = filter;
    1.17 +        setFiltered();
    1.18      }
    1.19  
    1.20      /**

     2.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/UserTaskView.java	Sun Jul 04 11:17:16 2004 +0000
     2.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/UserTaskView.java	Sun Jul 04 15:45:23 2004 +0000
     2.3 @@ -572,6 +572,10 @@
     2.4      }    
     2.5  
     2.6      protected void setFiltered() {
     2.7 +        if (getFilter() != null) {
     2.8 +            ((RemoveFilterAction) SystemAction.get(RemoveFilterAction.class)).enable();
     2.9 +        }
    2.10 +
    2.11          TreeTableModel ttm = tt.getTreeTableModel();
    2.12          if (ttm instanceof UserTasksTreeTableModel) {
    2.13              ((UserTasksTreeTableModel) ttm).destroy();

     3.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/treetable/AdvancedTreeTableNode.java	Sun Jul 04 11:17:16 2004 +0000
     3.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/treetable/AdvancedTreeTableNode.java	Sun Jul 04 15:45:23 2004 +0000
     3.3 @@ -85,13 +85,15 @@
     3.4              loadUnfilteredChildren();
     3.5          }
     3.6          
     3.7 +        assert unfilteredChildren != null;
     3.8 +        
     3.9          // filtering
    3.10          FilterIntf filter = getFilter();
    3.11          if (filter != null) {
    3.12              ArrayList fc = new ArrayList();
    3.13 -            for (int j = 0; j < children.length; j++) {
    3.14 +            for (int j = 0; j < unfilteredChildren.length; j++) {
    3.15                  if (filter.accept(unfilteredChildren[j])) {
    3.16 -                    fc.add(children[j]);
    3.17 +                    fc.add(unfilteredChildren[j]);
    3.18                  }
    3.19              }
    3.20              children = (TreeTableNode[]) fc.toArray(

     4.1 --- a/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/treetable/NotComparator.java	Sun Jul 04 11:17:16 2004 +0000
     4.2 +++ b/tasklist.usertasks/src/org/netbeans/modules/tasklist/usertasks/treetable/NotComparator.java	Sun Jul 04 15:45:23 2004 +0000
     4.3 @@ -17,8 +17,6 @@
     4.4  
     4.5  /**
     4.6   * Inverts results of another Comparator
     4.7 - *
     4.8 - * @author  Tim Lebedkov
     4.9   */
    4.10  public class NotComparator implements Comparator {
    4.11      private Comparator c;