svn commit: r170811 - in /incubator/beehive/trunk/netui: src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java

[ek...@apache.org]

Author: ekoneil
Date: Wed May 18 13:20:37 2005
New Revision: 170811

URL: http://svn.apache.org/viewcvs?rev=170811&view=rev
Log:
NetUI bug fix.  Introduced an NPE when fixing an API for consistency last week.  Occurs when calling 
  filterModel.isFiltered("noSuchFilterExpr");

Fixed the NPE and added a verification test.

BB: self
DRT: NetUI pass
BVT: NetUI pass


Modified:
    incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java
    incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java?rev=170811&r1=170810&r2=170811&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java Wed May 18 13:20:37 2005
@@ -80,7 +80,8 @@
         if(_filters == null || filterExpression == null)
             return false;
 
-        if(lookupFilters(filterExpression).size() > 0)
+        ArrayList list = lookupFilters(filterExpression);
+        if(list != null && list.size() > 0)
             return true;
         else return false;
     }
@@ -91,7 +92,7 @@
      * @return <code>null</code> if no matching {@link Filter} objects are found; a {@link List} of {@link Filter}
      * objects otherwise.
      */
-    private List/*<Filter>*/ lookupFilters(String filterExpression) {
+    private ArrayList/*<Filter>*/ lookupFilters(String filterExpression) {
         assert filterExpression != null;
         assert !filterExpression.equals("");
 

Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java?rev=170811&r1=170810&r2=170811&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java (original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java Wed May 18 13:20:37 2005
@@ -55,6 +55,8 @@
         assertNotNull(fm.getFilters("ID"));
         assertTrue(fm.isFiltered("ID"));
         assertEquals(FilterOperationHint.NOT_EQUAL, ((Filter)fm.getFilters("ID").get(0)).getOperation().getOperationHint());
+
+        assertFalse(fm.isFiltered("QWERTY"));
     }
 
     protected void setUp() {