From 9c4703c49e157b7081a7cae0580f37c034c9cfa5 Mon Sep 17 00:00:00 2001
From: Keith Donald <kdonald@vmware.com>
Date: Thu, 24 Apr 2008 03:05:46 +0000
Subject: [PATCH] addDecoration method throughout

---
 .../WEB-INF/hotels/booking/enterBookingDetails.jsp | 14 +++++++-------
 .../src/main/webapp/WEB-INF/hotels/index.jsp       |  2 +-
 .../src/main/webapp/WEB-INF/hotels/views.xml       |  1 +
 .../booking-mvc/src/main/webapp/WEB-INF/login.jsp  |  6 +++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp
index 3eedcb1b..2225a220 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/booking/enterBookingDetails.jsp
@@ -43,7 +43,7 @@
 			<div class="input">
 				<form:input path="checkinDate"/>
 				<script type="text/javascript">
-					Spring.decorations.push(new Spring.ElementDecoration({
+					Spring.addDecoration(new Spring.ElementDecoration({
 						elementId : "checkinDate",
 						widgetType : "dijit.form.DateTextBox",
 						widgetAttrs : { value : dojo.date.locale.parse(dojo.byId("checkinDate").value, {selector : "date", datePattern : "yyyy-MM-dd"}), required : true }}));  
@@ -57,7 +57,7 @@
 			<div class="input">
 				<form:input path="checkoutDate"/>
 				<script type="text/javascript">
-					Spring.decorations.push(new Spring.ElementDecoration({
+					Spring.addDecoration(new Spring.ElementDecoration({
 						elementId : "checkoutDate",
 						widgetType : "dijit.form.DateTextBox",
 						widgetAttrs : { value : dojo.date.locale.parse(dojo.byId("checkoutDate").value, {selector : "date", datePattern : "yyyy-MM-dd"}), required : true }}));  
@@ -84,11 +84,11 @@
 				<form:radiobutton id="smoking" path="smoking" label="Smoking" value="true"/>
 				<form:radiobutton id="non-smoking" path="smoking" label="Non Smoking" value="false"/>
 				<script type="text/javascript">
-					Spring.decorations.push(new Spring.ElementDecoration({
+					Spring.addDecoration(new Spring.ElementDecoration({
 						elementId : 'smoking',
 						widgetType : "dijit.form.RadioButton",
 						widgetModule : "dijit.form.CheckBox" }));
-					Spring.decorations.push(new Spring.ElementDecoration({
+					Spring.addDecoration(new Spring.ElementDecoration({
 						elementId : 'non-smoking',
 						widgetType : "dijit.form.RadioButton",
 						widgetModule : "dijit.form.CheckBox" }));
@@ -103,7 +103,7 @@
 			<div class="input">
 				<form:input path="creditCard"/>
 				<script type="text/javascript">
-					Spring.decorations.push(new Spring.ElementDecoration({
+					Spring.addDecoration(new Spring.ElementDecoration({
 						elementId : "creditCard",
 						widgetType : "dijit.form.ValidationTextBox",
 						widgetAttrs : { required : true, invalidMessage : "A 16-digit credit card number is required.", 
@@ -118,7 +118,7 @@
 			<div class="input">
 				<form:input path="creditCardName" maxlength="40"/>
 				<script type="text/javascript">
-					Spring.decorations.push(new Spring.ElementDecoration({
+					Spring.addDecoration(new Spring.ElementDecoration({
 						elementId : "creditCardName",
 						widgetType : "dijit.form.ValidationTextBox",
 						widgetAttrs : { required : true }}));
@@ -157,7 +157,7 @@
 			<input type="submit" id="proceed" name="_eventId_proceed" value="Proceed"/>&#160;
 			<input type="submit" name="_eventId_cancel" value="Cancel"/>&#160;
 			<script type="text/javascript">
-				Spring.decorations.push(new Spring.ValidateAllDecoration({event : 'onclick', elementId : 'proceed'}));
+				Spring.addDecoration(new Spring.ValidateAllDecoration({event : 'onclick', elementId : 'proceed'}));
 			</script>
 		</div>
 	</fieldset>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/index.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/index.jsp
index d163a95b..673e2c80 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/index.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/index.jsp
@@ -11,7 +11,7 @@
 	<fieldset>
 		<form:input path="searchString"/>
 		<script type="text/javascript">
-			Spring.decorations.push(new Spring.ElementDecoration({
+			Spring.addDecoration(new Spring.ElementDecoration({
 				elementId : "searchString",
 				widgetType : "dijit.form.ValidationTextBox",
 				widgetAttrs : { promptMessage : "Search hotels by name, address, city, or zip." }}));
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
index 183f4a60..91d0ffa5 100644
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/hotels/views.xml
@@ -12,6 +12,7 @@
 	<definition name="hotels/search" extends="standard-layout">
 		<put-attribute name="body" value="search.body" />
 	</definition>
+	
     <definition name="search.body" template="/WEB-INF/hotels/search.jsp">
         <put-attribute name="hotelResults" value="/WEB-INF/hotels/hotelResults.jsp" />
     </definition>
diff --git a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
index f468e509..d91da35e 100755
--- a/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
+++ b/spring-webflow-samples/booking-mvc/src/main/webapp/WEB-INF/login.jsp
@@ -31,7 +31,7 @@
 				<div class="output">
 					<input type="text" name="j_username" id="j_username" <c:if test="${not empty param.login_error}">value="<%= session.getAttribute(AuthenticationProcessingFilter.SPRING_SECURITY_LAST_USERNAME_KEY) %>"</c:if> />
 					<script type="text/javascript">
-						Spring.decorations.push(new Spring.ElementDecoration({
+						Spring.addDecoratio(new Spring.ElementDecoration({
 							elementId : "j_username",
 							widgetType : "dijit.form.ValidationTextBox",
 							widgetAttrs : { promptMessage : "Your username", required : true }}));
@@ -43,7 +43,7 @@
 				<div class="output">
 					<input type="password" name="j_password" id="j_password" />
 					<script type="text/javascript">
-						Spring.decorations.push(new Spring.ElementDecoration({
+						Spring.addDecoration(new Spring.ElementDecoration({
 							elementId : "j_password",
 							widgetType : "dijit.form.ValidationTextBox",
 							widgetAttrs : { promptMessage : "Your password", required : true}}));
@@ -65,7 +65,7 @@
 		<div class="buttonGroup">
 			<input name="submit" id="submit" type="submit" value="Login" />
 			<script type="text/javascript">
-				Spring.decorations.push(new Spring.ValidateAllDecoration({event : 'onclick', elementId : 'submit'}));
+				Spring.addDecoration(new Spring.ValidateAllDecoration({event : 'onclick', elementId : 'submit'}));
 			</script>
 		</div>
 	</form>