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

[Gavin King]

  User: gavin   
  Date: 06/09/27 21:16:06

  Modified:    examples/booking/src/org/jboss/seam/example/booking  
                        HotelBooking.java HotelBookingAction.java
  Log:
  this way is simpler
  
  Revision  Changes    Path
  1.11      +3 -3      jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelBooking.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HotelBooking.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelBooking.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- HotelBooking.java	9 Aug 2006 20:30:07 -0000	1.10
  +++ HotelBooking.java	28 Sep 2006 01:16:05 -0000	1.11
  @@ -1,4 +1,4 @@
  -//$Id: HotelBooking.java,v 1.10 2006/08/09 20:30:07 ssilvert Exp $
  +//$Id: HotelBooking.java,v 1.11 2006/09/28 01:16:05 gavin Exp $
   package org.jboss.seam.example.booking;
   
   import javax.ejb.Local;
  @@ -8,11 +8,11 @@
   {
      public String selectHotel(Hotel selectedHotel);
      
  -   public String bookHotel(User user);
  +   public String bookHotel();
      
      public String setBookingDetails();
      
  -   public String confirm(User user);
  +   public String confirm();
      public String cancel();
      
      public void destroy();
  
  
  
  1.38      +7 -4      jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelBookingAction.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HotelBookingAction.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/HotelBookingAction.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -b -r1.37 -r1.38
  --- HotelBookingAction.java	9 Aug 2006 20:30:07 -0000	1.37
  +++ HotelBookingAction.java	28 Sep 2006 01:16:05 -0000	1.38
  @@ -1,4 +1,4 @@
  -//$Id: HotelBookingAction.java,v 1.37 2006/08/09 20:30:07 ssilvert Exp $
  +//$Id: HotelBookingAction.java,v 1.38 2006/09/28 01:16:05 gavin Exp $
   package org.jboss.seam.example.booking;
   
   import static javax.persistence.PersistenceContextType.EXTENDED;
  @@ -30,6 +30,9 @@
      @PersistenceContext(type=EXTENDED)
      private EntityManager em;
      
  +   @In 
  +   private User user;
  +   
      @In(required=false) @Out
      private Hotel hotel;
      
  @@ -49,11 +52,11 @@
      @Begin
      public String selectHotel(Hotel selectedHotel)
      {
  -      hotel = em.merge( selectedHotel );
  +      hotel = em.merge(selectedHotel);
         return "hotel";
      }
      
  -   public String bookHotel(User user)
  +   public String bookHotel()
      {      
         booking = new Booking(hotel, user);
         Calendar calendar = Calendar.getInstance();
  @@ -79,7 +82,7 @@
      }
   
      @End
  -   public String confirm(User user)
  +   public String confirm()
      {
         if (booking==null || hotel==null) return "main";
         em.persist(booking);