[richfaces-svn-commits] JBoss Rich Faces SVN: r15409 - in root/ui/trunk/components/core/src/main/java/org/ajax4jsf: facelets/tag and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: abelevich
Date: 2009-08-28 10:08:12 -0400 (Fri, 28 Aug 2009)
New Revision: 15409

Modified:
   root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java
   root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java
Log:
https://jira.jboss.org/jira/browse/RF-7782

Modified: root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java
===================================================================
--- root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java	2009-08-28 14:07:39 UTC (rev 15408)
+++ root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java	2009-08-28 14:08:12 UTC (rev 15409)
@@ -22,7 +22,7 @@
 	
 	private static enum Attributes {
 		
-		limitRender, queueId, statusId, render, execute, similarityGroupingId, oncomplete, onbegin, onbeforedomupdate, other;		
+		limitRender, queueId, status, render, execute, similarityGroupingId, oncomplete, onbegin, onbeforedomupdate, other;		
 		
 		public static Attributes toAttribute(String name) {
 			
@@ -76,12 +76,12 @@
 		return this.onbegin;
 	}
 	
-	public void setOnBeforeDomUpdate(String onbeforedomupdate) {
+	public void setOnbeforedomupdate(String onbeforedomupdate) {
 		this.onbeforedomupdate = onbeforedomupdate;
 		clearInitialState();
 	}
 	
-	public String getOnBeforeDomUpdate() {
+	public String getOnbeforedomupdate() {
 		if(this.onbeforedomupdate != null) {
 			return this.onbeforedomupdate;
 		}
@@ -170,12 +170,12 @@
 		clearInitialState();
 	}
 	
-	public String getStatusId() {
+	public String getStatus() {
 		if(this.statusId != null) {
 			return this.statusId;
 		}
 		
-		ValueExpression ve = getValueExpression(Attributes.statusId.toString());
+		ValueExpression ve = getValueExpression(Attributes.status.toString());
 		if(ve != null) {
 			ELContext elContext = FacesContext.getCurrentInstance().getELContext();
 			String value = ((String)ve.getValue(elContext));
@@ -185,7 +185,7 @@
 		return this.statusId;
 	}
 
-	public void setStatusId(String statusId) {
+	public void setStatus(String statusId) {
 		this.statusId = statusId;
 		clearInitialState();
 	}
@@ -256,7 +256,7 @@
 				case queueId : 
 					this.queueId =  value != null ? (String)value : null; break;
 					
-				case statusId :
+				case status :
 					this.statusId =  value != null ? (String)value : null; break;
 				
 				case similarityGroupingId : 

Modified: root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java
===================================================================
--- root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java	2009-08-28 14:07:39 UTC (rev 15408)
+++ root/ui/trunk/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java	2009-08-28 14:08:12 UTC (rev 15409)
@@ -54,13 +54,13 @@
 		this.listener = this.getAttribute("listener");
 		this.limitRender = this.getAttribute("limitRender");
 		this.queueId = this.getAttribute("queueId");
-		this.statusId = this.getAttribute("statusId");
+		this.statusId = this.getAttribute("status");
 		this.similarityGroupingId = this.getAttribute("similarityGroupingId");
 		this.onevent = this.getAttribute("onevent");
 		this.onerror = this.getAttribute("onerror");
 		this.onbegin = this.getAttribute("onbegin");
 		this.oncomplete = this.getAttribute("oncomplete");
-		this.onbeforedomupdate = this.getAttribute("onBeforeDomUpdate");
+		this.onbeforedomupdate = this.getAttribute("onbeforedomupdate");
 		this.wrapping = isWrapping();
 	}