Author: nbelaevski Date: 2009-08-24 13:21:04 -0400 (Mon, 24 Aug 2009) New Revision: 15286 Modified: root/examples/trunk/components/core-demo/src/main/webapp/function.xhtml root/framework/trunk/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java root/framework/trunk/api/src/main/java/org/ajax4jsf/javascript/AjaxSubmitFunction.java root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java root/framework/trunk/impl/src/main/java/org/richfaces/context/PartialViewContextImpl.java root/ui/trunk/components/core/src/main/java/org/richfaces/component/html/HtmlAjaxFunction.java Log: Renamed "limitToList" into "limitRender" Modified: root/examples/trunk/components/core-demo/src/main/webapp/function.xhtml =================================================================== --- root/examples/trunk/components/core-demo/src/main/webapp/function.xhtml 2009-08-24 17:02:49 UTC (rev 15285) +++ root/examples/trunk/components/core-demo/src/main/webapp/function.xhtml 2009-08-24 17:21:04 UTC (rev 15286) @@ -19,13 +19,13 @@ <a4j:jsFunction action="#{requestBean.setupIdsToRender}" name="testFunction1" execute="@all" render="#{requestBean.idsToRender}"> <f:param name="idsToRender" value="time1" /> </a4j:jsFunction> - <a4j:jsFunction action="#{requestBean.setupIdsToRender}" name="testFunction1Limited" execute="form" limitToList="true" render="#{requestBean.idsToRender}"> + <a4j:jsFunction action="#{requestBean.setupIdsToRender}" name="testFunction1Limited" execute="form" limitRender="true" render="#{requestBean.idsToRender}"> <f:param name="idsToRender" value="time1" /> </a4j:jsFunction> <a4j:jsFunction action="#{requestBean.setupIdsToRender}" name="testFunction2" execute="form" render="#{requestBean.idsToRender}"> <f:param name="idsToRender" value="time2" /> </a4j:jsFunction> - <a4j:jsFunction action="#{requestBean.setupIdsToRender}" name="testFunction2Limited" execute="form" limitToList="true" render="#{requestBean.idsToRender}"> + <a4j:jsFunction action="#{requestBean.setupIdsToRender}" name="testFunction2Limited" execute="form" limitRender="true" render="#{requestBean.idsToRender}"> <f:param name="idsToRender" value="time2" /> </a4j:jsFunction> @@ -36,9 +36,10 @@ </h:form> <a href="javascript:testFunction1()">Call test function1</a> - <a href="javascript:testFunction1Limited()">Call test function1 with limitToList=true</a> + <a href="javascript:testFunction1Limited()">Call test function1 with limitRender=true</a> <a href="javascript:testFunction2()">Call test function2</a> - <a href="javascript:testFunction2Limited()">Call test function2 with limitToList=true</a> + <a href="javascript:testFunction2Limited()">Call test function2 with limitRender=true</a> + <a4j:log /> </h:body> </f:view> </html> \ No newline at end of file Modified: root/framework/trunk/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java =================================================================== --- root/framework/trunk/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java 2009-08-24 17:02:49 UTC (rev 15285) +++ root/framework/trunk/api/src/main/java/org/ajax4jsf/component/AjaxComponent.java 2009-08-24 17:21:04 UTC (rev 15286) @@ -118,12 +118,12 @@ * setter method for property * @param new value of Submit ( or not ) full form on Ajax action. to set */ - public abstract void setLimitToList(boolean submitForm); + public abstract void setLimitRender(boolean submitForm); /** * @return value or result of valueBinding of Submit ( or not ) full form on Ajax action. */ - public abstract boolean isLimitToList(); + public abstract boolean isLimitRender(); /** * setter method for property Modified: root/framework/trunk/api/src/main/java/org/ajax4jsf/javascript/AjaxSubmitFunction.java =================================================================== --- root/framework/trunk/api/src/main/java/org/ajax4jsf/javascript/AjaxSubmitFunction.java 2009-08-24 17:02:49 UTC (rev 15285) +++ root/framework/trunk/api/src/main/java/org/ajax4jsf/javascript/AjaxSubmitFunction.java 2009-08-24 17:21:04 UTC (rev 15286) @@ -51,7 +51,7 @@ /** * Attribute to keep */ - public static final String LIMITTOLIST_ATTR_NAME = "limitToList"; + public static final String LIMITRENDER_ATTR_NAME = "limitRender"; //private static Log log = LogFactory.getLog(AjaxSubmitFunction.class); Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2009-08-24 17:02:49 UTC (rev 15285) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/AjaxRendererUtils.java 2009-08-24 17:21:04 UTC (rev 15286) @@ -103,7 +103,7 @@ /** * Attribute to keep */ - public static final String LIMITTOLIST_ATTR_NAME = "limitRender"; + public static final String LIMITRENDER_ATTR_NAME = "limitRender"; private static Log log = LogFactory.getLog(AjaxRendererUtils.class); @@ -735,15 +735,15 @@ * @param component * @return <code>true</code> if client must render ONLY given areas. */ - public static boolean isAjaxLimitToList(UIComponent component) { + public static boolean isAjaxLimitRender(UIComponent component) { boolean result = false; if (component instanceof AjaxComponent) { - result = ((AjaxComponent) component).isLimitToList(); + result = ((AjaxComponent) component).isLimitRender(); } else { try { result = ((Boolean) component.getAttributes().get( - LIMITTOLIST_ATTR_NAME)).booleanValue(); + LIMITRENDER_ATTR_NAME)).booleanValue(); } catch (NullPointerException e) { // NullPointer - ignore ... } catch (ClassCastException e1) { Modified: root/framework/trunk/impl/src/main/java/org/richfaces/context/PartialViewContextImpl.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/context/PartialViewContextImpl.java 2009-08-24 17:02:49 UTC (rev 15285) +++ root/framework/trunk/impl/src/main/java/org/richfaces/context/PartialViewContextImpl.java 2009-08-24 17:21:04 UTC (rev 15286) @@ -225,10 +225,10 @@ super(behaviorEvent, false, false); } - private boolean limitToList = false; + private boolean limitRender = false; - public boolean isLimitToList() { - return limitToList; + public boolean isLimitRender() { + return limitRender; } @Override @@ -236,9 +236,9 @@ AjaxClientBehavior behavior) { super.doVisit(context, target, behavior); - limitToList = AjaxRendererUtils.isAjaxLimitToList(target); - if(behavior != null) { - limitToList = behavior.isLimitRender(); + limitRender = AjaxRendererUtils.isAjaxLimitRender(target); + if (behavior != null) { + limitRender = behavior.isLimitRender(); } } @@ -325,7 +325,7 @@ if (!renderCallback.isHandleNone()) { renderIds.addAll(renderCallback.getComponentIds()); - if (!renderCallback.isLimitToList()) { + if (!renderCallback.isLimitRender()) { Collection<String> ajaxOutputComponentIds = getAjaxOutputComponentIds(facesContext); renderIds.addAll(ajaxOutputComponentIds); //TODO ids from wrapped object? Modified: root/ui/trunk/components/core/src/main/java/org/richfaces/component/html/HtmlAjaxFunction.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/component/html/HtmlAjaxFunction.java 2009-08-24 17:02:49 UTC (rev 15285) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/component/html/HtmlAjaxFunction.java 2009-08-24 17:21:04 UTC (rev 15286) @@ -59,9 +59,9 @@ which ID's are passed to the "reRender" attribute of the describable component. "false"-the default value-means that all components with ajaxRendered="true" will be updated. */ - private boolean _limitToList = false; + private boolean _limitRender = false; - private boolean _limitToListSet = false; + private boolean _limitRenderSet = false; /* * Name of generated JavaScript function definition @@ -281,11 +281,11 @@ this._ignoreDupResponsesSet = true; } - public boolean isLimitToList(){ - if (this._limitToListSet) { - return (this._limitToList); + public boolean isLimitRender(){ + if (this._limitRenderSet) { + return (this._limitRender); } - ValueExpression ve = getValueExpression("limitToList"); + ValueExpression ve = getValueExpression("limitRender"); if (ve != null) { Boolean value = null; @@ -296,19 +296,19 @@ } if (null == value) { - return (this._limitToList); + return (this._limitRender); } return value; } else { - return (this._limitToList); + return (this._limitRender); } } - public void setLimitToList(boolean _limitToList){ - this._limitToList = _limitToList; - this._limitToListSet = true; + public void setLimitRender(boolean _limitRender){ + this._limitRender = _limitRender; + this._limitRenderSet = true; } public String getName(){ @@ -570,8 +570,8 @@ state[7] = _focus; state[8] = Boolean.valueOf(_ignoreDupResponses); state[9] = Boolean.valueOf(_ignoreDupResponsesSet); - state[10] = Boolean.valueOf(_limitToList); - state[11] = Boolean.valueOf(_limitToListSet); + state[10] = Boolean.valueOf(_limitRender); + state[11] = Boolean.valueOf(_limitRenderSet); state[12] = _name; state[13] = _onbeforedomupdate; state[14] = _oncomplete; @@ -599,8 +599,8 @@ _focus = (String)states[7];; _ignoreDupResponses = ((Boolean)states[8]).booleanValue(); _ignoreDupResponsesSet = ((Boolean)states[9]).booleanValue(); - _limitToList = ((Boolean)states[10]).booleanValue(); - _limitToListSet = ((Boolean)states[11]).booleanValue(); + _limitRender = ((Boolean)states[10]).booleanValue(); + _limitRenderSet = ((Boolean)states[11]).booleanValue(); _name = (String)states[12];; _onbeforedomupdate = (String)states[13];; _oncomplete = (String)states[14];;