Author: nbelaevski Date: 2009-08-28 15:19:58 -0400 (Fri, 28 Aug 2009) New Revision: 15411 Modified: root/framework/tags/4.0.0.ALPHA1/api/src/main/java/org/ajax4jsf/component/AjaxClientBehavior.java root/framework/tags/4.0.0.ALPHA1/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java root/ui/tags/4.0.0.ALPHA1/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java root/ui/tags/4.0.0.ALPHA1/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java Log: https://jira.jboss.org/jira/browse/RF-7782 Modified: root/framework/tags/4.0.0.ALPHA1/api/src/main/java/org/ajax4jsf/component/AjaxClientBehavior.java =================================================================== --- root/framework/tags/4.0.0.ALPHA1/api/src/main/java/org/ajax4jsf/component/AjaxClientBehavior.java 2009-08-28 17:59:39 UTC (rev 15410) +++ root/framework/tags/4.0.0.ALPHA1/api/src/main/java/org/ajax4jsf/component/AjaxClientBehavior.java 2009-08-28 19:19:58 UTC (rev 15411) @@ -31,9 +31,9 @@ public String getQueueId(); - public void setStatusId(String queueId); + public void setStatus(String statusId); - public String getStatusId(); + public String getStatus(); public String getSimilarityGroupingId(); @@ -55,8 +55,8 @@ public void setOnbegin(String onbegin); - public String getOnBeforeDomUpdate(); + public String getOnbeforedomupdate(); - public void setOnBeforeDomUpdate(String onbeforedomupdate); + public void setOnbeforedomupdate(String onbeforedomupdate); } Modified: root/framework/tags/4.0.0.ALPHA1/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java =================================================================== --- root/framework/tags/4.0.0.ALPHA1/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2009-08-28 17:59:39 UTC (rev 15410) +++ root/framework/tags/4.0.0.ALPHA1/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2009-08-28 19:19:58 UTC (rev 15411) @@ -279,7 +279,7 @@ beforedomupdate { @Override public String getAttributeValue(AjaxClientBehavior behavior) { - return behavior.getOnBeforeDomUpdate(); + return behavior.getOnbeforedomupdate(); } }, @@ -318,7 +318,7 @@ String ajaxStatusName = getAjaxStatus(component); if(ajaxBehavior != null) { - ajaxStatusName = ajaxBehavior.getStatusId() != null ? ajaxBehavior.getStatusId() : ajaxStatusName; + ajaxStatusName = ajaxBehavior.getStatus() != null ? ajaxBehavior.getStatus() : ajaxStatusName; appenAjaxBehaviorOptions(facesContext, ajaxBehavior, ajaxEventOptions); } else { appendComponentOptions(facesContext, component, ajaxEventOptions, parametersMap); Modified: root/ui/tags/4.0.0.ALPHA1/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java =================================================================== --- root/ui/tags/4.0.0.ALPHA1/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2009-08-28 17:59:39 UTC (rev 15410) +++ root/ui/tags/4.0.0.ALPHA1/components/core/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2009-08-28 19:19:58 UTC (rev 15411) @@ -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/tags/4.0.0.ALPHA1/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java =================================================================== --- root/ui/tags/4.0.0.ALPHA1/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java 2009-08-28 17:59:39 UTC (rev 15410) +++ root/ui/tags/4.0.0.ALPHA1/components/core/src/main/java/org/ajax4jsf/facelets/tag/AjaxHandler.java 2009-08-28 19:19:58 UTC (rev 15411) @@ -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(); }