[jboss-cvs] jboss-seam/examples/booking/src/org/jboss/seam/example/booking ...

[Gavin King]

  User: gavin   
  Date: 07/02/25 14:09:39

  Modified:    examples/booking/src/org/jboss/seam/example/booking   
                        HotelSearching.java HotelSearchingAction.java
                        RegisterAction.java
  Log:
  use the new EL in QL support
  
  Revision  Changes    Path
  1.10      +3 -1      jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelSearching.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HotelSearching.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelSearching.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- HotelSearching.java	17 Dec 2006 01:04:51 -0000	1.9
  +++ HotelSearching.java	25 Feb 2007 19:09:39 -0000	1.10
  @@ -1,4 +1,4 @@
  -//$Id: HotelSearching.java,v 1.9 2006/12/17 01:04:51 gavin Exp $
  +//$Id: HotelSearching.java,v 1.10 2007/02/25 19:09:39 gavin Exp $
   package org.jboss.seam.example.booking;
   
   import javax.ejb.Local;
  @@ -12,6 +12,8 @@
      public String getSearchString();
      public void setSearchString(String searchString);
      
  +   public String getSearchPattern();
  +   
      public void find();
      public void nextPage();
      public boolean isNextPageAvailable();
  
  
  
  1.17      +13 -4     jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HotelSearchingAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelSearchingAction.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- HotelSearchingAction.java	13 Feb 2007 03:49:42 -0000	1.16
  +++ HotelSearchingAction.java	25 Feb 2007 19:09:39 -0000	1.17
  @@ -1,4 +1,4 @@
  -//$Id: HotelSearchingAction.java,v 1.16 2007/02/13 03:49:42 sbryzak2 Exp $
  +//$Id: HotelSearchingAction.java,v 1.17 2007/02/25 19:09:39 gavin Exp $
   package org.jboss.seam.example.booking;
   import java.util.List;
   import javax.ejb.Remove;
  @@ -7,6 +7,7 @@
   import javax.persistence.PersistenceContext;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Destroy;
  +import org.jboss.seam.annotations.Factory;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.datamodel.DataModel;
  @@ -41,9 +42,7 @@
         
      private void queryHotels()
      {
  -      String searchPattern = searchString==null ? "%" : '%' + searchString.toLowerCase().replace('*', '%') + '%';
  -      hotels = em.createQuery("select h from Hotel h where lower(h.name) like :search or lower(h.city) like :search or lower(h.zip) like :search or lower(h.address) like :search")
  -            .setParameter("search", searchPattern)
  +      hotels = em.createQuery("select h from Hotel h where lower(h.name) like #{pattern} or lower(h.city) like #{pattern} or lower(h.zip) like #{pattern} or lower(h.address) like #{pattern}")
               .setMaxResults(pageSize)
               .setFirstResult( page * pageSize )
               .getResultList();
  @@ -57,13 +56,23 @@
      public int getPageSize() {
         return pageSize;
      }
  +   
      public void setPageSize(int pageSize) {
         this.pageSize = pageSize;
      }
  +   
  +   @Factory(value="pattern", scope=ScopeType.EVENT)
  +   public String getSearchPattern()
  +   {
  +      return searchString==null ? 
  +            "%" : '%' + searchString.toLowerCase().replace('*', '%') + '%';
  +   }
  +   
      public String getSearchString()
      {
         return searchString;
      }
  +   
      public void setSearchString(String searchString)
      {
         this.searchString = searchString;
  
  
  
  1.20      +3 -4      jboss-seam/examples/booking/src/org/jboss/seam/example/booking/RegisterAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RegisterAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/RegisterAction.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- RegisterAction.java	13 Feb 2007 03:49:42 -0000	1.19
  +++ RegisterAction.java	25 Feb 2007 19:09:39 -0000	1.20
  @@ -1,4 +1,4 @@
  -//$Id: RegisterAction.java,v 1.19 2007/02/13 03:49:42 sbryzak2 Exp $
  +//$Id: RegisterAction.java,v 1.20 2007/02/25 19:09:39 gavin Exp $
   package org.jboss.seam.example.booking;
   import static org.jboss.seam.ScopeType.EVENT;
   import java.util.List;
  @@ -33,8 +33,7 @@
      {
         if ( user.getPassword().equals(verify) )
         {
  -         List existing = em.createQuery("select u.username from User u where u.username=:username")
  -            .setParameter("username", user.getUsername())
  +         List existing = em.createQuery("select u.username from User u where u.username=#{user.username}")
               .getResultList();
            if (existing.size()==0)
            {
  @@ -44,7 +43,7 @@
            }
            else
            {
  -            facesMessages.add("Username #{user.username} already exists");
  +            facesMessages.addToControl("username", "Username #{user.username} already exists");
            }
         }
         else