[Pocolap-cvscommit] pocolap/src/com/pocolap/servlets TestSavedReportHelper.java,NONE,1.1 SavedReportHelper.java,1.2,1.3

[Rashmi B. <ra...@us...>]

Update of /cvsroot/pocolap/pocolap/src/com/pocolap/servlets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19298

Modified Files:
	SavedReportHelper.java 
Added Files:
	TestSavedReportHelper.java 
Log Message:
changes for saved reports 

--- NEW FILE: TestSavedReportHelper.java ---
/*
 * TestSavedReportHelper.java 
 * Created on Mar 21, 2005
 *
 
 Copyright (c) 2005 Rashmi Banthia

Permission is hereby granted, free of charge, to any person obtaining a copy 
of this software and associated documentation files (the "Software"), to deal 
in the Software without restriction, including without limitation the rights to use, 
copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the 
Software, and to permit persons to whom the Software is furnished to do so, 
subject to the following conditions:

The above copyright notice and this permission notice shall be included in all 
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 
OTHER DEALINGS IN THE SOFTWARE. */

package com.pocolap.servlets;

import junit.framework.TestCase;
import junit.framework.TestSuite ;
import junit.framework.Test ;

import com.pocolap.schema.CrossTabDef ; 
import com.pocolap.selectors.Selector ;
import com.pocolap.xtab.filter.FilterList ;

/**
 * @author Rashmi Banthia
 *
 */
public class TestSavedReportHelper extends TestCase {
		
		private String crosstabdefAsXML = "<crosstab xmlns=\"http://www.pocolap.com\"> "+		
  	"<rept name=\"Sample SpreadSheet\" index=\"58\"> "+
    " <!-- This is the config file for the Sample database that "+
    "  comes with pocolap.  This should be placed in the  "+
    "  pocolapDB/crosstabdefs directory if you would like "+
    "  to use the sample database.  You may remove this "+
    "  file if you do not want to use the sample database."+
    " --> "+
    " <source classtype=\"com.pocolap.conn.PocOlapSampleDatabaseConnection\" driver=\"org.apache.derby.jdbc.EmbeddedDriver\" dbString=\"jdbc:derby:;databaseName=${}\"/> "+
    " <measure name=\"Sold Items\" table=\"SALES\" key=\"AMOUNT\" function=\"sum\" /> "+
    " <dimension name=\"Customers\" table=\"CUSTOMERS\" key=\"CUSTOMERID\" measureKey=\"CUSTOMERID\"> "+
    "   <group name=\"Customer\" defaultField=\"Customer Last Name\"> "+
    "     <field name=\"Customer Last Name\" key=\"LASTNAME\" /> "+
    "     <!-- other fields are to be used when formatting is implemented --> "+
    "     <field name=\"Customer Number\" key=\"CUSTOMERNUMBER\" /> "+
    "     <drilldown>Shoe Size</drilldown> "+
    "   </group> "+
    "   <group name=\"Customer Origin\" defaultField=\"Zip Code\"> "+
    "     <field name=\"Zip Code\" key=\"ZIP\" /> "+
    "     <field name=\"City\" key=\"CITY\" /> "+
    "     <drilldown>Customer</drilldown> "+
    "   </group> "+
    "   <group name=\"Shoe Size\"> "+
    "     <field name=\"Shoe Size\" key=\"SHOESIZE\" /> "+
    "     <field name=\"Size Type\" key=\"SIZINGGENDER\" /> "+
    "     <field name=\"Extra Width\" key=\"WIDESIZES\" /> "+
    "   </group> "+
    " </dimension>  "+
    " <dimension name=\"Items to Sell\" table=\"SALABLEITEMS\" key=\"SALABLEITEMSID\" measureKey=\"SALABLEITEMSID\">  "+
    "   <group name=\"Stock Keeping Unit\"> "+
    "     <field name=\"SKU Value\" key=\"SKU\" /> "+
    "     <field name=\"Product Desription\" key=\"DESCRIPTION\" /> "+
    "     <field name=\"Product or Service\" key=\"ISPRODUCT\" /> "+
    "     <drilldown>Vendor</drilldown> "+
    "   </group> "+
    "   <group name=\"Vendor\"> "+
    "     <field name=\"Vendor Name\" key=\"VENDOR\" /> "+
    "     <field name=\"Vendor Number\" key=\"VENDORNUMBER\" />  "+
    "     <drilldown>Stock Keeping Unit</drilldown> "+
    "   </group> "+
    " </dimension> "+
    " <dimension name=\"Dates\" table=\"CALENDAR\" key=\"CALENDARID\" measureKey=\"CALENDARID\"> "+
    "   <group name=\"Sale Date\"> "+
    "     <field name=\"Date\" key=\"DAYDATE\" /> "+
    "   </group> "+
    "   <group name=\"Month\" defaultField=\"MONTH\"> "+
    "     <field name=\"Number of Month\" key=\"MONTHOFYEAR\" />   "+
    "     <field name=\"Month\" key=\"MONTHNAME\" /> "+
    "     <field name=\"Abbreviated Month\" key=\"MONTHABBREV\" /> "+
    "     <drilldown>Sale Date</drilldown> "+
    "   </group> "+
    "   <group name=\"Year\"> "+
    "     <field name=\"Year\" key=\"&quot;year&quot;\" /> "+
    "     <drilldown>Month</drilldown> "+
    "     <drilldown>Sale Date</drilldown> "+
    "   </group> "+
    " </dimension> "+
    " <supplemental> "+
    "   <reporticon src=\"pocologo_tiny.jpg\" alt=\"The pocOLAP logo\"  "+
    "  	height=\"75\" width=\"75\" top=\"10\" left=\"10\" /> "+
    "   <description>This shows data stored in a Derby database</description> "+
    "   <link linktext=\"Learn more at the pocOLAP home page\" linkurl=\"http://pocolap.sourceforge.net\" /> "+
    " </supplemental> "+
    " </rept> " ;
		
		private String endtags =  " </savedreport> </crosstab> " ; 	
		private String savedreportname= "Sample Saved Report" ;
		
		

		public TestSavedReportHelper(final String name){
    	super(name);
  	}
  	
  	public void testSelectors(){
  			String savedreport1 = "<savedreport name=\"Sample Saved Report\"> "+ 
				" <selector>  "+ 
		    "      <selectordimension across=\"Customers\" down=\"Items to Sell\" />    "+ 
		    "      <across name=\"Customer Origin\" level=\"1\" />  "+ 
		    "      <across name=\"Customer\" level=\"2\" />   "+  
		    "      <across name=\"Shoe Size\" level=\"3\" /> "+          
		    "      <down name=\"Vendor\" level=\"1\" />  "+ 
		    "      <down name=\"Stock Keeping Unit\" level=\"2\" />  "+ 
		    " </selector>  	" ;
  			CrossTabDef crosstab = null ;
  			try{ 
  				crosstab = CrossTabDef.Factory.parse(crosstabdefAsXML+savedreport1+endtags);
  			}
  			catch (Exception e){
  				e.printStackTrace();
  			}
  			SavedReportHelper s = new SavedReportHelper();
  			s.actionLoadReport(crosstab,savedreportname);
  			Selector acrossselector = s.acrossselector ; 
  			assertNotNull(acrossselector);
  			assertEquals(acrossselector.getItemCount(),4);
  			
  			Selector downselector = s.downselector ; 
  			assertNotNull(downselector);
  			assertEquals(downselector.getItemCount(),3);  	
  			
  			//In this tag there is a down attribute but no down elements.
  			savedreport1 = "<savedreport name=\"Sample Saved Report\"> "+ 
				" <selector>  "+ 
		    "      <selectordimension across=\"Customers\" down=\"Items to Sell\" />    "+ 
		    "      <across name=\"Customer Origin\" level=\"1\" />  "+ 
		    "      <across name=\"Customer\" level=\"2\" />   "+  
		    "      <across name=\"Shoe Size\" level=\"3\" /> "+ 
		    " </selector>  	" ;
  			crosstab = null ;
  			try{ 
  				crosstab = CrossTabDef.Factory.parse(crosstabdefAsXML+savedreport1+endtags);
  			}
  			catch (Exception e){
  				e.printStackTrace();
  			}
  			s = new SavedReportHelper();
  			s.actionLoadReport(crosstab,savedreportname);
  			acrossselector = s.acrossselector ; 
  			assertNotNull(acrossselector);
  			assertEquals(acrossselector.getItemCount(),4);
  			downselector = s.downselector ; 
  			assertNull(downselector);		
  	}
  	
  	public void testSelectorEmpty(){
  			String savedreport1 = "<savedreport name=\"Sample Saved Report\"> "+ 
				" <selector>  "+ 		
		    " </selector>  	" ;
		    
		    CrossTabDef crosstab = null ;
  			try{ 
  				crosstab = CrossTabDef.Factory.parse(crosstabdefAsXML+savedreport1+endtags);
  			}
  			catch (Exception e){
  				e.printStackTrace();
  			}
  			SavedReportHelper s = new SavedReportHelper();
  			s.actionLoadReport(crosstab,savedreportname);
  			Selector acrossselector = s.acrossselector ; 
  			Selector downselector = s.downselector ; 
  			assertNull(acrossselector);
  			assertNull(downselector);
  			
  			
  			//In the following case the across attribute is absent, so the following across
  			// elements will be ignored. 
  			savedreport1 = "<savedreport name=\"Sample Saved Report\"> "+ 
				" <selector>  "+ 
		    "      <selectordimension down=\"Items to Sell\" />    "+ 
		    "      <across name=\"Customer Origin\" level=\"1\" />  "+ 
		    "      <across name=\"Customer\" level=\"2\" />   "+  
		    "      <across name=\"Shoe Size\" level=\"3\" /> "+          
		    "      <down name=\"Vendor\" level=\"1\" />  "+ 
		    "      <down name=\"Stock Keeping Unit\" level=\"2\" />  "+ 
		    " </selector>  	" ;
		    crosstab = null ;
  			try{ 
  				crosstab = CrossTabDef.Factory.parse(crosstabdefAsXML+savedreport1+endtags);
  			}
  			catch (Exception e){
  				e.printStackTrace();
  			}
		    s = new SavedReportHelper();
  			s.actionLoadReport(crosstab,savedreportname);
  			acrossselector = s.acrossselector ; 
  			downselector = s.downselector ; 
  			assertNull(acrossselector);
  			assertNotNull(downselector);
  			assertEquals(downselector.getItemCount(),3); 
  	}
  	
  	public void testFilter(){
  			String savedreport1 = "<savedreport name=\"Sample Saved Report\"> "+ 
				" <filter>  "+ 
        "   <table name=\"Customers\"> "+ 
        "        <field name=\"Customer Last Name\" type=\"text\" > "+ 
        "           <matchlist>Hamm</matchlist> "+ 
        "           <matchlist>Weston</matchlist> "+ 
        "           <excludeMatchList/>     "+        
        "           <matchStrings/> "+ 
        "           <excludeMatchStrings/>     "+ 
        "           <greaterThan>Barkley</greaterThan> "+ 
        "           <lessThan>Weston</lessThan>  "+ 
        "           <combineWithAnd/>  "+ 
        "            <range startvalue=\"Barkley\" endvalue=\"Weston\"/> "+ 
        "       </field>  "+ 
        "   </table> "+ 
    		" </filter> " ;
    		CrossTabDef crosstab = null ;
  			try{ 
  				crosstab = CrossTabDef.Factory.parse(crosstabdefAsXML+savedreport1+endtags);
  			}
  			catch (Exception e){
  				e.printStackTrace();
  			}
  			SavedReportHelper s = new SavedReportHelper();
  			s.actionLoadReport(crosstab,savedreportname);
    		Selector acrossselector = s.acrossselector ; 
  			Selector downselector = s.downselector ; 
  			assertNull(acrossselector);
  			assertNull(downselector);
    		
    		FilterList[] filterlist = s.filterlist ; 
    		assertNotNull(filterlist);
    		assertEquals(filterlist.length,1);
    		assertEquals(filterlist[0].getName(),"Customers");
  	}
  	
  	public void testEmptyFilter(){ 
  			String savedreport1 = "<savedreport name=\"Sample Saved Report\"> "+ 
				" <filter>  "+        
    		" </filter> " ;
    		
    		CrossTabDef crosstab = null ;
  			try{ 
  				crosstab = CrossTabDef.Factory.parse(crosstabdefAsXML+savedreport1+endtags);
  			}
  			catch (Exception e){
  				e.printStackTrace();
  			}
    		SavedReportHelper s = new SavedReportHelper();
  			s.actionLoadReport(crosstab,savedreportname);
    		Selector acrossselector = s.acrossselector ; 
  			Selector downselector = s.downselector ; 
  			assertNull(acrossselector);
  			assertNull(downselector);
    		
    		FilterList[] filterlist = s.filterlist ; 
    		assertNull(filterlist);
    		
    		savedreport1 = "<savedreport name=\"Sample Saved Report\"> "+ 
				" <filter>  "+   
				"   <table name=\"Customers\"> "+ 
				 "  </table> "+     
    		" </filter> " ;
    		crosstab = null ;
  			try{ 
  				crosstab = CrossTabDef.Factory.parse(crosstabdefAsXML+savedreport1+endtags);
  			}
  			catch (Exception e){
  				e.printStackTrace();
  			}
  			s = new SavedReportHelper();
  			s.actionLoadReport(crosstab,savedreportname);
  			acrossselector = s.acrossselector ; 
  			downselector = s.downselector ; 
  			assertNull(acrossselector);
  			assertNull(downselector);    		
    		filterlist = s.filterlist ; 
    		assertNotNull(filterlist);
    		assertEquals(filterlist.length,1);
    		assertNotNull(filterlist[0]);
    		assertEquals(filterlist[0].getName(),"Customers");    
    		
    		
    		savedreport1 = "<savedreport name=\"Sample Saved Report\"> "+ 
				" <filter>  "+   
				"   <table name=\"Customers\"> "+
				"        <field name=\"Customer Last Name\" type=\"text\" > "+  
				 "       </field>  "+ 
				"  </table> "+     
    		" </filter> " ;
    		crosstab = null ;
  			try{ 
  				crosstab = CrossTabDef.Factory.parse(crosstabdefAsXML+savedreport1+endtags);
  			}
  			catch (Exception e){
  				e.printStackTrace();
  			}
  			s = new SavedReportHelper();
  			s.actionLoadReport(crosstab,savedreportname);
  			acrossselector = s.acrossselector ; 
  			downselector = s.downselector ; 
  			assertNull(acrossselector);
  			assertNull(downselector);    		
    		filterlist = s.filterlist ; 
    		assertNotNull(filterlist);
    		assertEquals(filterlist.length,1);
    		assertNull(filterlist[0]);     		 
    		
  	}
  	
  	public void testSelectorFilter(){
  		String savedreport1 = "<savedreport name=\"Sample Saved Report\"> "+ 
	    " <selector>  "+ 
	    "      <selectordimension across=\"Customers\" down=\"Items to Sell\" />   "+ 
	    "      <across name=\"Customer Origin\" level=\"1\" />  "+ 
	    "      <across name=\"Customer\" level=\"2\" />    "+ 
	    "      <across name=\"Shoe Size\" level=\"3\" /> "+          
	    "      <down name=\"Vendor\" level=\"1\" /> "+ 
	    "      <down name=\"Stock Keeping Unit\" level=\"2\" /> "+ 
	    " </selector> "+     
	    " <filter> "+ 
	    "       <table name=\"Customers\"> "+ 
	    "            <field name=\"Customer Last Name\" type=\"text\" > "+ 
	    "               <matchlist>Hamm</matchlist> "+ 
	    "               <matchlist>Weston</matchlist> "+ 
	    "               <excludeMatchList/>  "+  
	    "               <matchStrings/> "+ 
	    "               <excludeMatchStrings/> "+  
	    "               <greaterThan>Barkley</greaterThan> "+ 
	    "               <lessThan>Weston</lessThan> "+  
	    "               <combineWithAnd/> "+  
	    "                <range startvalue=\"Barkley\" endvalue=\"Weston\"/> "+ 
	    "           </field> "+  
      "  </table> "+     
    	" </filter> " ;      
      
      CrossTabDef crosstab = null ;
			try{ 
				crosstab = CrossTabDef.Factory.parse(crosstabdefAsXML+savedreport1+endtags);
			}
			catch (Exception e){
				e.printStackTrace();
			}
  		SavedReportHelper s = new SavedReportHelper();
			s.actionLoadReport(crosstab,savedreportname);
  		Selector acrossselector = s.acrossselector ; 
			Selector downselector = s.downselector ; 
			assertNotNull(acrossselector);
			assertNotNull(downselector);
  		
  		FilterList[] filterlist = s.filterlist ; 
  		assertNotNull(filterlist); 
  		assertEquals(filterlist.length,1);      
  		assertEquals(filterlist[0].getName(),"Customers");       
  	}
  	
  	public void testFilterNumber(){
  		String savedreport1 = "<savedreport name=\"Sample Saved Report\"> "+ 
  		" <filter> "+ 
      "     <table name=\"Customers\"> "+ 
	    "       <field name=\"Shoe Size\" type=\"number\" >	   "+                               
	    "               <greaterThan>2.0</greaterThan> "+ 
	    "               <lessThan>10.0</lessThan> 	    "+                
	    "        </field> "+ 
	    "      </table> "+ 
	    " </filter> " ;
	    CrossTabDef crosstab = null ;
			try{ 
				crosstab = CrossTabDef.Factory.parse(crosstabdefAsXML+savedreport1+endtags);
			}
			catch (Exception e){
				e.printStackTrace();
			}
			SavedReportHelper s = new SavedReportHelper();
			s.actionLoadReport(crosstab,savedreportname);
  		Selector acrossselector = s.acrossselector ; 
			Selector downselector = s.downselector ; 
			assertNull(acrossselector);
			assertNull(downselector);
  		
  		FilterList[] filterlist = s.filterlist ; 
  		assertNotNull(filterlist);              
	    assertEquals(filterlist.length,1);
  		assertEquals(filterlist[0].getName(),"Customers");
  	}
  	
  	public void testFilterDate(){
  		String savedreport1 = "<savedreport name=\"Sample Saved Report\"> "+ 
  		" <filter> "+ 
  		" <table name=\"Dates\"> "+ 
      "       <field name=\"Date\" type=\"date\" > "+      
      "             <range startvalue=\"2000-01-16\" endvalue=\"2005-03-16\" /> "+ 
      "         </field> "+ 
      "     </table> "+ 
     	" </filter> "; 
    	
    	CrossTabDef crosstab = null ;
			try{ 
				crosstab = CrossTabDef.Factory.parse(crosstabdefAsXML+savedreport1+endtags);
			}
			catch (Exception e){
				e.printStackTrace();
			}
			SavedReportHelper s = new SavedReportHelper();
			s.actionLoadReport(crosstab,savedreportname);
  		Selector acrossselector = s.acrossselector ; 
			Selector downselector = s.downselector ; 
			assertNull(acrossselector);
			assertNull(downselector);
  		
  		FilterList[] filterlist = s.filterlist ; 
  		assertNotNull(filterlist);              
	    assertEquals(filterlist.length,1);
    	assertEquals(filterlist[0].getName(),"Dates");
  	}
}
Index: SavedReportHelper.java
===================================================================
RCS file: /cvsroot/pocolap/pocolap/src/com/pocolap/servlets/SavedReportHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SavedReportHelper.java	17 Mar 2005 20:04:48 -0000	1.2
--- SavedReportHelper.java	21 Mar 2005 20:13:15 -0000	1.3
***************
*** 111,127 ****
           if (sel!=null){
                //Retrieving across dimension name
!               dim = sel.getSelectordimension().getAcross() ;
!               if (dim!=null){
!                   AcrossItem[] acrossarr = sel.getAcrossArray();                  
!                   if (acrossarr!=null && acrossarr.length > 0){                  
!                       //Creating selector object            
!                       selector = new Selector(currDefinition,DefinitionHelper.getDimension(currDefinition,dim));               
!                       
!                       for (int i = 0;i<acrossarr.length;i++){                        
!                               GroupItem defgroup1 = DefinitionHelper.getGroup(DefinitionHelper.getDimension(currDefinition,dim),acrossarr[i].getName());
!                               selector.addGroup(defgroup1);                        
!                       }
!                   } 
!               }            
           } 
           else {
--- 111,129 ----
           if (sel!=null){
                //Retrieving across dimension name
!               if (sel.getSelectordimension()!=null) {
! 	              dim = sel.getSelectordimension().getAcross() ;
! 	              if (dim!=null){
! 	                  AcrossItem[] acrossarr = sel.getAcrossArray();                  
! 	                  if (acrossarr!=null && acrossarr.length > 0){                  
! 	                      //Creating selector object            
! 	                      selector = new Selector(currDefinition,DefinitionHelper.getDimension(currDefinition,dim));               
! 	                      
! 	                      for (int i = 0;i<acrossarr.length;i++){                        
! 	                              GroupItem defgroup1 = DefinitionHelper.getGroup(DefinitionHelper.getDimension(currDefinition,dim),acrossarr[i].getName());
! 	                              selector.addGroup(defgroup1);                        
! 	                      }
! 	                  } 
! 	              }            
!          			}
           } 
           else {
***************
*** 141,155 ****
          if (sel!=null){ 
              //Retrieving down dimension name
!             dim = sel.getSelectordimension().getDown() ;
!             if (dim!=null){
!                 DownItem[] downarr = sel.getDownArray();
!                 if (downarr!=null && downarr.length > 0 ){                   
!                     dnselector = new Selector(currDefinition,DefinitionHelper.getDimension(currDefinition,dim));               
!                     for (int i = 0;i<downarr.length;i++){                     
!                             GroupItem defgroup1 = DefinitionHelper.getGroup(DefinitionHelper.getDimension(currDefinition,dim),downarr[i].getName());
!                             dnselector.addGroup(defgroup1);                    
!                     }
!                 }
!             } 
          }
          else {
--- 143,159 ----
          if (sel!=null){ 
              //Retrieving down dimension name
!             if (sel.getSelectordimension()!=null) {
! 	            dim = sel.getSelectordimension().getDown() ;
! 	            if (dim!=null){
! 	                DownItem[] downarr = sel.getDownArray();
! 	                if (downarr!=null && downarr.length > 0 ){                   
! 	                    dnselector = new Selector(currDefinition,DefinitionHelper.getDimension(currDefinition,dim));               
! 	                    for (int i = 0;i<downarr.length;i++){                     
! 	                            GroupItem defgroup1 = DefinitionHelper.getGroup(DefinitionHelper.getDimension(currDefinition,dim),downarr[i].getName());
! 	                            dnselector.addGroup(defgroup1);                    
! 	                    }
! 	                }
! 	            } 
!           	}
          }
          else {
***************
*** 169,177 ****
              TableItem[] tablearr = filter.getTableArray();
              if (tablearr!=null && tablearr.length > 0) {              
!                 flist = new FilterList[tablearr.length];    
!                 for (int i=0;i<tablearr.length;i++){
                      String tablename = tablearr[i].getName();
                      FilterFieldItem[] filterfieldarr = tablearr[i].getFieldArray();
!                     FilterList list=new FilterList(tablename);      
                      for (int j=0;j<filterfieldarr.length;j++){
                          String fieldname = filterfieldarr[j].getName();
--- 173,181 ----
              TableItem[] tablearr = filter.getTableArray();
              if (tablearr!=null && tablearr.length > 0) {              
!                flist = new FilterList[tablearr.length];    
!                 for (int i=0;i<tablearr.length;i++){                		
                      String tablename = tablearr[i].getName();
                      FilterFieldItem[] filterfieldarr = tablearr[i].getFieldArray();
!                     FilterList list= new FilterList(tablename);     
                      for (int j=0;j<filterfieldarr.length;j++){
                          String fieldname = filterfieldarr[j].getName();
***************
*** 212,215 ****
--- 216,221 ----
                          if (!FilterUtilities.isFieldFilterEmpty(filter1))
                            list.add(filter1);
+                         if (list.isEmpty())
+                         	list=null;
                      }
                      flist[i] = list ;
***************
*** 220,224 ****
          else {
                logger.debug(errclass+" No saved filters found! ");
!         }  
          return flist ; 
       }
--- 226,248 ----
          else {
                logger.debug(errclass+" No saved filters found! ");
!         }
!         
!         /*int count = 0;
!         for (int i = 0 ; i<flist.length;i++){
!         	if (flist[i]!=null) { 
!         			count++;
!         	}
!         }
!         FilterList[] tmp = null;
!         if (count>0){
! 		        tmp = new FilterList[count+1];
! 		        for (int i=0,j=0;i<flist.length;i++){
! 		        	if (flist[i]!=null) { 
! 		        			tmp[j++]=flist[i];
! 		        	}
! 		        }
!       	}
!         flist = tmp ;  
!         */
          return flist ; 
       }