mpoeschl    2002/07/16 03:32:31

  Modified:    xdocs    criteria-howto.xml peers-howto.xml
  Log:
  use List in code samples
  
  Revision  Changes    Path
  1.2       +13 -13    jakarta-turbine-torque/xdocs/criteria-howto.xml
  
  Index: criteria-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/xdocs/criteria-howto.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- criteria-howto.xml        6 Nov 2001 21:19:37 -0000       1.1
  +++ criteria-howto.xml        16 Jul 2002 10:32:31 -0000      1.2
  @@ -45,7 +45,7 @@
   criteria.addJoin(PermissionPeer.PERMISSION_ID,RolePermissionPeer.PERMISSION_ID);
   criteria.addJoin(RolePermissionPeer.ROLE_ID, RolePeer.ROLE_ID);
   
  -Vector v = RolePeer.doSelect(criteria);
  +List roles = RolePeer.doSelect(criteria);
   </source>
   
      <p>
  @@ -66,7 +66,7 @@
   criteria.addJoin(RolePeer.ROLE_ID,RolePermissionPeer.ROLE_ID);
   criteria.addJoin(RolePermissionPeer.PERMISSION_ID, PermissionPeer.PERMISSION_ID);
   
  -Vector v = PermissionPeer.doSelect(criteria);
  +List permissions = PermissionPeer.doSelect(criteria);
   </source>
   
     </section>
  @@ -89,7 +89,7 @@
   criteria.addJoin(RolePermissionPeer.ROLE_ID, RolePeer.ROLE_ID);
   criteria.setDistinct();
   
  -Vector v = RolePeer.doSelect(criteria);
  +List roles = RolePeer.doSelect(criteria);
   </source>
   
     </section>
  @@ -113,7 +113,7 @@
   criteria.setDistinct();
   criteria.addOrderByColumn(RolePeer.NAME);
   
  -Vector v = RolePeer.doSelect(criteria);
  +List roles = RolePeer.doSelect(criteria);
   </source>
   
     </section>
  @@ -129,9 +129,9 @@
       </p>
   
   <source>
  -public Vector allUsersGroups(RunData data) throws Exception
  +public List allUsersGroups(RunData data) throws Exception
   {
  -    Vector v = new Vector(10);
  +    List groups = new ArrayList(10);
   
       //get the User from RunData
       User user = data.getUser();
  @@ -140,13 +140,13 @@
       if (user.hasLoggedIn())
       {
           Criteria criteria = new Criteria();
  -        criteria.addJoin(GroupPeer.GROUP_ID,UserGroupRolePeer.GROUP_ID);
  -        criteria.addJoin(UserGroupRolePeer.USER_ID,TurbineUserPeer.USER_ID);
  +        criteria.addJoin(GroupPeer.GROUP_ID, UserGroupRolePeer.GROUP_ID);
  +        criteria.addJoin(UserGroupRolePeer.USER_ID, TurbineUserPeer.USER_ID);
           criteria.add(TurbineUserPeer.USERNAME, user.getUserName());
           criteria.addOrderByColumn(GroupPeer.NAME);
           criteria.setDistinct();
   
  -        v = GroupPeer.doSelect(criteria);
  +        groups = GroupPeer.doSelect(criteria);
       }
       return v;
   }
  @@ -199,7 +199,7 @@
   Criteria criteria = new Criteria();
   criteria.add(InvoicePeer.COST, 1000, Criteria.GREATER_THAN);
   
  -Vector v = InvoicePeer.doSelect(criteria);
  +List invoices = InvoicePeer.doSelect(criteria);
   </source>
   
      <p>
  @@ -224,7 +224,7 @@
   Criteria criteria = new Criteria();
   criteria.add(InvoicePeer.DESCRIPTION, (Object)"DESCRIPTION is NULL", 
Criteria.CUSTOM);
   
  -Vector v = InvoicePeer.doSelect(criteria);
  +List invoices = InvoicePeer.doSelect(criteria);
   </source>
   
     </section>
  @@ -251,7 +251,7 @@
   
   <source>
   Criteria criteria = new Criteria();
  -criteria.add(InvoicePeer.COST,1000, Criteria.GREATER_EQUAL);
  +criteria.add(InvoicePeer.COST, 1000, Criteria.GREATER_EQUAL);
   
   Criteria.Criterion criterion = criteria.getCriterion(InvoicePeer.COST);
   criterion.and(
  @@ -362,7 +362,7 @@
   SimpleCriteria criteria = new SimpleCriteria();
   criteria.isBetween(InvoicePeer.COST, 1000, 5000);
   
  -Vector v = InvoicePeer.doSelect(criteria);
  +List invoices = InvoicePeer.doSelect(criteria);
   </source>
   
     </section>
  
  
  
  1.3       +24 -28    jakarta-turbine-torque/xdocs/peers-howto.xml
  
  Index: peers-howto.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/xdocs/peers-howto.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- peers-howto.xml   7 Nov 2001 11:48:52 -0000       1.2
  +++ peers-howto.xml   16 Jul 2002 10:32:31 -0000      1.3
  @@ -338,8 +338,8 @@
   
   <source>
   Criteria crit = new Criteria();
  -crit.add (ItemPeer.CATEGORY_ID,2);
  -Vector v = ItemPeer.doSelect (crit);
  +crit.add(ItemPeer.CATEGORY_ID,2);
  +List items = ItemPeer.doSelect(crit);
   </source>
   
   <p>
  @@ -361,8 +361,8 @@
   
   <source>
   Criteria crit = new Criteria();
  -crit.add (CategoryPeer.NAME,"New Category");
  -Object o = CategoryPeer.doInsert (crit);
  +crit.add(CategoryPeer.NAME,"New Category");
  +Object o = CategoryPeer.doInsert(crit);
   </source>
   
   <p>
  @@ -372,10 +372,10 @@
   
   <source>
   Item itm = new Item();
  -itm.setName ("New Item");
  -itm.setPrice (100);
  -itm.setCategoryId (1);
  -Object o = ItemPeer.doInsert (itm);
  +itm.setName("New Item");
  +itm.setPrice(100);
  +itm.setCategoryId(1);
  +Object o = ItemPeer.doInsert(itm);
   </source>
   
   <p>
  @@ -393,7 +393,7 @@
   <source>
   Item itm =  new Item()
   data.getParameters().setProperties(itm);
  -Object o = ItemPeer.doInsert (itm);
  +Object o = ItemPeer.doInsert(itm);
   </source>
   
   <p>
  @@ -412,8 +412,8 @@
   
   <source>
   Criteria crit = new Criteria();
  -crit.add (ItemPeer.ITEM_ID,3);
  -ItemPeer.doDelete (crit);
  +crit.add(ItemPeer.ITEM_ID,3);
  +ItemPeer.doDelete(crit);
   </source>
   </section>
   
  @@ -456,7 +456,7 @@
   <source>
   public class CategoryPeer extends BaseCategoryPeer
   {
  -    static public Vector doSelectAll() throws Exception
  +    static public List doSelectAll() throws Exception
       {
           Criteria crit = new Criteria();
           return = doSelect(crit);
  @@ -473,11 +473,11 @@
   <source>
   public class ItemPeer extends BaseItemPeer
   {
  -    static public Vector doSelectForCategory(int categoryid) throws Exception
  +    static public List doSelectForCategory(int categoryid) throws Exception
       {
           Criteria crit = new Criteria();
  -        crit.add (CATEGORY_ID,categoryid);
  -        return doSelect (crit);
  +        crit.add(CATEGORY_ID,categoryid);
  +        return doSelect(crit);
       }
   }
   </source>
  @@ -504,9 +504,9 @@
   <source>
   // select all Items with their associated Category
   Criteria crit = new Criteria();
  -Vector v = ItemPeer.doSelectJoinCategory(crit);
  +List items = ItemPeer.doSelectJoinCategory(crit);
   // access the Category associated with the first Item in the vector
  -Item itm = (Item)v.elementAt(0);
  +Item itm = (Item)items.get(0);
   Category cat = itm.getCategory();
   </source>
      <p>
  @@ -517,9 +517,9 @@
   // select only Items with a category of 2
   Criteria crit = new Criteria();
   crit.add(Item.CATEGORY_ID, 2);
  -Vector v = ItemPeer.doSelectJoinCategory(crit);
  +List items = ItemPeer.doSelectJoinCategory(crit);
   // get the name of category 2
  -Item itm = (Item)v.elementAt(0);
  +Item itm = (Item)items.get(0);
   Category cat = itm.getCategory();
   String name = cat.getName();
   </source>
  @@ -537,16 +537,12 @@
   
   <source><![CDATA[
   Criteria crit = new Criteria();
  -Criteria.Criterion a1 = crit.getNewCriterion(ABC.A, 1,
  -Criteria.LESS_THAN);
  -Criteria.Criterion b2 = crit.getNewCriterion(ABC.B, 2,
  -Criteria.GREATER_THAN);
  -Criteria.Criterion a5 = crit.getNewCriterion(ABC.A, 5,
  -Criteria.GREATER_THAN);
  -Criteria.Criterion b3 = crit.getNewCriterion(ABC.B, 3,
  -Criteria.LESS_THAN);
  +Criteria.Criterion a1 = crit.getNewCriterion(ABC.A, 1, Criteria.LESS_THAN);
  +Criteria.Criterion b2 = crit.getNewCriterion(ABC.B, 2, Criteria.GREATER_THAN);
  +Criteria.Criterion a5 = crit.getNewCriterion(ABC.A, 5, Criteria.GREATER_THAN);
  +Criteria.Criterion b3 = crit.getNewCriterion(ABC.B, 3, Criteria.LESS_THAN);
   
  -crit.add( a1.and(b2).or(a5.and(b3)) );
  +crit.add(a1.and(b2).or(a5.and(b3)));
   ]]></source>
   
     <p>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to