[Javamatch-cvs] javamatch/docs/website javamatch.xml,1.7,1.8

[Walter v. I. <it...@us...>]

Update of /cvsroot/javamatch/javamatch/docs/website
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30222/docs/website

Modified Files:
	javamatch.xml 
Log Message:
Replace MatchList, AndList, OrList with QuerySet

Index: javamatch.xml
===================================================================
RCS file: /cvsroot/javamatch/javamatch/docs/website/javamatch.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** javamatch.xml	13 Sep 2004 09:17:40 -0000	1.7
--- javamatch.xml	13 Sep 2004 11:32:58 -0000	1.8
***************
*** 37,44 ****
      The following code defines and executes this match query:
      </p>
! <pre class="source">OrList query = new OrList();
! query.addQuery(new LessThan("size", 100));
! query.addQuery(new NumberEquals("distanceToSwimmingPool", 0));
! query.addQuery(new Minimum("priceIndication"));
  
  List campSites = guide.getCampSites();
--- 37,44 ----
      The following code defines and executes this match query:
      </p>
! <pre class="source">QuerySet query = new QuerySet();
! query.addPreferredQuery(new LessThan("size", 100));
! query.addPreferredQuery(new NumberEquals("distanceToSwimmingPool", 0));
! query.addPreferredQuery(new Minimum("priceIndication"));
  
  List campSites = guide.getCampSites();
***************
*** 59,67 ****
      second-hand car, I can specify the following query:
      </p>
! <pre class="source">OrList query = new OrList();
! query.addQuery(new StringEquals("brand", "BMW"));
! query.addQuery(new Range("buildYear", 1997, 2002));
! query.addQuery(new LessThan("price", 10000));
! query.addQuery(new LessThan("mileage", 80000));
  
  List allCars = carData.getAllCars();
--- 59,67 ----
      second-hand car, I can specify the following query:
      </p>
! <pre class="source">QuerySet query = new QuerySet();
! query.addRequiredQuery(new StringEquals("brand", "BMW"));
! query.addPreferredQuery(new Range("buildYear", 1997, 2002));
! query.addPreferredQuery(new LessThan("price", 10000));
! query.addPreferredQuery(new LessThan("mileage", 80000));
  
  List allCars = carData.getAllCars();
***************
*** 111,118 ****
   <tr>
    <td>0.75</td>
!   <td><b><i>Alpha Romeo</i></b></td>
    <td>2000</td>
!   <td>$7,800.00</td>
!   <td>55,000</td>
   </tr>
   <tr>
--- 111,118 ----
   <tr>
    <td>0.75</td>
!   <td>BMW</td>
    <td>2000</td>
!   <td>$3,800.00</td>
!   <td><b><i>120,000</i></b></td>
   </tr>
   <tr>