From 90f4d19aa470111e4910ba347a449f082f32625b Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Tue, 21 Aug 2007 05:55:31 +0000
Subject: [PATCH] more polish

---
 .../WEB-INF/config/web-application-config.xml |  2 --
 .../src/main/webapp/flow/booking/booking.xml  | 10 +++-------
 .../webapp/flow/booking/bookingForm.xhtml     | 20 ++++++++++---------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/config/web-application-config.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/config/web-application-config.xml
index 98b05813..43bf06a7 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/config/web-application-config.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/WEB-INF/config/web-application-config.xml
@@ -10,8 +10,6 @@
 
 	<import resource="application-layer-config.xml"/>
 	
-	<flow:enable-scopes/>
-
 	<!-- Launches new flow executions and resumes existing executions -->
 	<flow:executor id="flowExecutor" registry-ref="flowRegistry">
 		<flow:execution-attributes>
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking.xml b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking.xml
index 644f27fe..47a54127 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking.xml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/booking.xml
@@ -31,16 +31,12 @@
 	</action-state>
 	
 	<view-state id="enterBookingDetails" view="/flow/booking/bookingForm.xhtml">
-		<transition on="reviewDetails" to="validateBooking" />
+		<transition on="proceed" to="confirmBooking">
+			<action method="validateBooking" bean="bookingActions" />
+		</transition>
 		<transition on="cancel" to="cancel" />
 	</view-state>
 	
-	<action-state id="validateBooking">
-		<action method="validateBooking" bean="bookingActions" />
-		<transition on="success" to="confirmBooking" />
-		<transition on="error" to="enterBookingDetails" />
-	</action-state>
-	
 	<view-state id="confirmBooking" view="/flow/booking/confirmBooking.xhtml">
 		<transition on="confirm" to="bookingAuthorized" />
 		<transition on="revise" to="enterBookingDetails" />
diff --git a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/bookingForm.xhtml b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/bookingForm.xhtml
index be9129c8..bbd0103c 100755
--- a/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/bookingForm.xhtml
+++ b/spring-webflow-samples/booking-jsf/src/main/webapp/flow/booking/bookingForm.xhtml
@@ -20,22 +20,27 @@
 			<div class="label">Name:</div>
 			<div class="output">#{hotel.name}</div>
 		</div>
+		
 		<div class="entry">
 			<div class="label">Address:</div>
 			<div class="output">#{hotel.address}</div>
 		</div>
+		
 		<div class="entry">
 			<div class="label">City, State:</div>
 			<div class="output">#{hotel.city}, #{hotel.state}</div>
 		</div>
+		
 		<div class="entry">
 			<div class="label">Zip:</div>
 			<div class="output">#{hotel.zip}</div>
 		</div>
+		
 		<div class="entry">
 			<div class="label">Country:</div>
 			<div class="output">#{hotel.country}</div>
 		</div>
+		
         <div class="entry">
             <div class="label">Nightly rate:</div>
             <div class="output">
@@ -89,12 +94,10 @@
 				<h:outputLabel for="smoking">Smoking Preference:</h:outputLabel>
 			</div>
 			<div id="radio" class="input">
-		
-			<h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection">
-				<f:selectItem itemLabel="Smoking" itemValue="true"/>
-				<f:selectItem itemLabel="Non Smoking" itemValue="false"/>
-			</h:selectOneRadio>
-	
+				<h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection">
+					<f:selectItem itemLabel="Smoking" itemValue="true"/>
+					<f:selectItem itemLabel="Non Smoking" itemValue="false"/>
+				</h:selectOneRadio>
 			</div>
 		</div>
 			
@@ -146,7 +149,6 @@
 					<f:selectItem itemLabel="2008" itemValue="2008"/>
 					<f:selectItem itemLabel="2009" itemValue="2009"/>
 				</h:selectOneMenu>
-
 			</div>
 		</div>
 		
@@ -158,7 +160,7 @@
 			<div class="label">&#160;</div>
 			<div class="input">
 				<sf:validateAllOnClick>
-					<h:commandButton id="proceed" value="Proceed" action="reviewDetails"/>
+					<h:commandButton id="proceed" action="proceed" value="Proceed"/>
 				</sf:validateAllOnClick>&#160;
 				<h:commandButton id="cancel" immediate="true" value="Cancel" action="cancel"/>
 			</div>
@@ -166,6 +168,6 @@
 	</fieldset>
 	</h:form>
 </div>
-</ui:define>
 
+</ui:define>
 </ui:composition>
\ No newline at end of file