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

[Peter Muir]

  User: pmuir   
  Date: 07/12/04 07:05:03

  Modified:    examples/nestedbooking/src/org/jboss/seam/example/booking   
                        Booking.java Hotel.java HotelBookingAction.java
  Log:
  ws
  
  Revision  Changes    Path
  1.2       +7 -5      jboss-seam/examples/nestedbooking/src/org/jboss/seam/example/booking/Booking.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Booking.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/nestedbooking/src/org/jboss/seam/example/booking/Booking.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Booking.java	25 Nov 2007 13:12:01 -0000	1.1
  +++ Booking.java	4 Dec 2007 12:05:03 -0000	1.2
  @@ -1,4 +1,4 @@
  -//$Id: Booking.java,v 1.1 2007/11/25 13:12:01 pmuir Exp $
  +//$Id: Booking.java,v 1.2 2007/12/04 12:05:03 pmuir Exp $
   package org.jboss.seam.example.booking;
   
   import java.io.Serializable;
  @@ -137,11 +137,13 @@
      }
   
      @ManyToOne @NotNull
  -   public Room getRoomPreference() {
  +   public Room getRoomPreference() 
  +   {
   	  return roomPreference;
      }
   	
  -   public void setRoomPreference(Room roomPreference) {
  +   public void setRoomPreference(Room roomPreference) 
  +   {
   	  this.roomPreference = roomPreference;
      }
      
  
  
  
  1.2       +36 -29    jboss-seam/examples/nestedbooking/src/org/jboss/seam/example/booking/Hotel.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Hotel.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/nestedbooking/src/org/jboss/seam/example/booking/Hotel.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Hotel.java	25 Nov 2007 13:12:01 -0000	1.1
  +++ Hotel.java	4 Dec 2007 12:05:03 -0000	1.2
  @@ -1,4 +1,4 @@
  -//$Id: Hotel.java,v 1.1 2007/11/25 13:12:01 pmuir Exp $
  +//$Id: Hotel.java,v 1.2 2007/12/04 12:05:03 pmuir Exp $
   package org.jboss.seam.example.booking;
   
   import java.io.Serializable;
  @@ -7,7 +7,6 @@
   import java.util.Date;
   import java.util.List;
   
  -import javax.persistence.Column;
   import javax.persistence.Entity;
   import javax.persistence.GeneratedValue;
   import javax.persistence.Id;
  @@ -117,10 +116,12 @@
      {
   	  BigDecimal maxPrice = this.getRooms().get(0).getPrice();
   	  
  -	  for(int i = 1; i < this.getRooms().size(); i++) {
  +      for(int i = 1; i < this.getRooms().size(); i++) 
  +      {
   		  Room room = this.getRooms().get(i);
   		  
  - 		  if(maxPrice.compareTo(room.getPrice()) < 0) {
  +         if(maxPrice.compareTo(room.getPrice()) < 0) 
  +         {
    			  maxPrice = room.getPrice();
    		  }
    	  }
  @@ -130,16 +131,19 @@
      
      @OneToMany
      @JoinColumn(name="HOTEL_ID")
  -   public List<Room> getRooms() {
  +   public List<Room> getRooms() 
  +   {
    	return rooms;
      }
      
  -   public void setRooms(List<Room> roomsSelections) {
  +   public void setRooms(List<Room> roomsSelections) 
  +   {
    	this.rooms = roomsSelections;
      }
      
      @Transient
  -   public List<Room> getAvailableRooms(Date checkinDate, Date checkoutDate) {
  +   public List<Room> getAvailableRooms(Date checkinDate, Date checkoutDate) 
  +   {
   	   // checking could be performed here to determine which
   	   // rooms are available for the provided dates. to simplify
   	   // the example, just return the list of rooms
  @@ -148,9 +152,12 @@
      }
      
      @Transient
  -   public Room getStandardRoom() {
  - 	  for(Room room : this.getRooms()) {
  - 		  if(room.isIncluded()) {
  +   public Room getStandardRoom() 
  +   {
  +      for(Room room : this.getRooms()) 
  +      {
  +         if(room.isIncluded()) 
  +         {
    			  return room;
    		  }
    	  }
  
  
  
  1.2       +58 -55    jboss-seam/examples/nestedbooking/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/nestedbooking/src/org/jboss/seam/example/booking/HotelBookingAction.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- HotelBookingAction.java	25 Nov 2007 13:12:01 -0000	1.1
  +++ HotelBookingAction.java	4 Dec 2007 12:05:03 -0000	1.2
  @@ -1,4 +1,4 @@
  -//$Id: HotelBookingAction.java,v 1.1 2007/11/25 13:12:01 pmuir Exp $
  +//$Id: HotelBookingAction.java,v 1.2 2007/12/04 12:05:03 pmuir Exp $
   package org.jboss.seam.example.booking;
   import static javax.persistence.PersistenceContextType.EXTENDED;
   import java.util.Calendar;
  @@ -106,7 +106,8 @@
         this.endRoot();
      }
      
  -   public void cancel() {
  +   public void cancel() 
  +   {
   	   this.endRootBeforeRedirect();
      }
      
  @@ -120,7 +121,8 @@
       * 
       *	http://jira.jboss.org/jira/browse/JBSEAM-1943
       */
  -   private void endRoot() {
  +   private void endRoot() 
  +   {
   	   Conversation conversation = Conversation.instance();
   	   
   	   if(conversation.isNested()) {
  @@ -137,7 +139,8 @@
   	 * 
   	 *	http://jira.jboss.org/jira/browse/JBSEAM-1943
   	 */
  -   private void endRootBeforeRedirect() {
  +   private void endRootBeforeRedirect() 
  +   {
   		Conversation conversation = Conversation.instance();
   	   
   		if(conversation.isNested()) {