Author: Alex.Kolonitsky Date: 2010-12-15 05:37:50 -0500 (Wed, 15 Dec 2010) New Revision: 20573 Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml trunk/core/api/src/main/java/org/ajax4jsf/context/AjaxContext.java trunk/core/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/AjaxChildrenRenderer.java trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/AjaxRendererUtils.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenu.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanel.java trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml Log: RF-10002: Rename attribute disableImplicitRender to limitRender Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2010-12-15 09:58:08 UTC (rev 20572) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richAccordion/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573) @@ -46,7 +46,7 @@ cycledSwitching="#{richAccordionBean.attributes['cycledSwitching'].value}" data="#{richAccordionBean.attributes['data'].value}" dir="#{richAccordionBean.attributes['dir'].value}" - disableImplicitRender="#{richAccordionBean.attributes['disableImplicitRender'].value}" + limitRender="#{richAccordionBean.attributes['limitRender'].value}" execute="#{richAccordionBean.attributes['execute'].value}" height="#{richAccordionBean.attributes['height'].value}" immediate="#{richAccordionBean.attributes['immediate'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2010-12-15 09:58:08 UTC (rev 20572) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richCollapsiblePanel/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573) @@ -46,7 +46,7 @@ bypassUpdates="#{richCollapsiblePanelBean.attributes['bypassUpdates'].value}" data="#{richCollapsiblePanelBean.attributes['data'].value}" dir="#{richCollapsiblePanelBean.attributes['dir'].value}" - disableImplicitRender="#{richCollapsiblePanelBean.attributes['disableImplicitRender'].value}" + limitRender="#{richCollapsiblePanelBean.attributes['limitRender'].value}" execute="#{richCollapsiblePanelBean.attributes['execute'].value}" expanded="#{richCollapsiblePanelBean.attributes['expanded'].value}" header="#{richCollapsiblePanelBean.attributes['header'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2010-12-15 09:58:08 UTC (rev 20572) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richPanelMenu/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573) @@ -49,7 +49,7 @@ collapseEvent="#{richPanelMenuBean.attributes['collapseEvent'].value}" data="#{richPanelMenuBean.attributes['data'].value}" disabled="#{richPanelMenuBean.attributes['disabled'].value}" - disableImplicitRender="#{richPanelMenuBean.attributes['disableImplicitRender'].value}" + limitRender="#{richPanelMenuBean.attributes['limitRender'].value}" execute="#{richPanelMenuBean.attributes['execute'].value}" expandEvent="#{richPanelMenuBean.attributes['expandEvent'].value}" expandSingle="#{richPanelMenuBean.attributes['expandSingle'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-12-15 09:58:08 UTC (rev 20572) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTabPanel/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573) @@ -46,7 +46,7 @@ cycledSwitching="#{richTabPanelBean.attributes['cycledSwitching'].value}" data="#{richTabPanelBean.attributes['data'].value}" dir="#{richTabPanelBean.attributes['dir'].value}" - disableImplicitRender="#{richTabPanelBean.attributes['disableImplicitRender'].value}" + limitRender="#{richTabPanelBean.attributes['limitRender'].value}" execute="#{richTabPanelBean.attributes['execute'].value}" headerAlignment="#{richTabPanelBean.attributes['headerAlignment'].value}" headerPosition="#{richTabPanelBean.attributes['headerPosition'].value}" Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2010-12-15 09:58:08 UTC (rev 20572) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/richTogglePanel/simple.xhtml 2010-12-15 10:37:50 UTC (rev 20573) @@ -84,7 +84,7 @@ cycledSwitching="#{richTogglePanelBean.attributes['cycledSwitching'].value}" data="#{richTogglePanelBean.attributes['data'].value}" dir="#{richTogglePanelBean.attributes['dir'].value}" - disableImplicitRender="#{richTogglePanelBean.attributes['disableImplicitRender'].value}" + limitRender="#{richTogglePanelBean.attributes['limitRender'].value}" execute="#{richTogglePanelBean.attributes['execute'].value}" immediate="#{richTogglePanelBean.attributes['immediate'].value}" itemChangeListener="#{richBean.itemChangeListener}" Modified: trunk/core/api/src/main/java/org/ajax4jsf/context/AjaxContext.java =================================================================== --- trunk/core/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/core/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2010-12-15 10:37:50 UTC (rev 20573) @@ -47,7 +47,7 @@ private static final String DEFAULT_CONTEXT_CLASS = "org.ajax4jsf.context.AjaxContextImpl"; private static Map<ClassLoader, Class<? extends AjaxContext>> ajaxContextClasses = new HashMap<ClassLoader, Class<? extends AjaxContext>>(); - private boolean disableImplicitRender; + private boolean limitRender; protected AjaxContext() { } @@ -125,12 +125,12 @@ public abstract void setSubmittedRegionClientId(String submittedClientId); - public boolean isDisableImplicitRender() { - return disableImplicitRender; + public boolean isLimitRender() { + return limitRender; } - public void setDisableImplicitRender(boolean disableImplicitRender) { - this.disableImplicitRender = disableImplicitRender; + public void setLimitRender(boolean limitRender) { + this.limitRender = limitRender; } /** Modified: trunk/core/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/core/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2010-12-15 10:37:50 UTC (rev 20573) @@ -302,8 +302,8 @@ } // Is that component limit to list ? - if (Boolean.TRUE.equals(component.getAttributes().get("disableImplicitRender"))) { - setDisableImplicitRender(true); + if (Boolean.TRUE.equals(component.getAttributes().get("limitRender"))) { + setLimitRender(true); } } Modified: trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/AjaxChildrenRenderer.java =================================================================== --- trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/AjaxChildrenRenderer.java 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/AjaxChildrenRenderer.java 2010-12-15 10:37:50 UTC (rev 20573) @@ -72,7 +72,7 @@ // Do not check children if we have no id to render under naming // container. - if (AjaxContext.getCurrentInstance(context).isDisableImplicitRender() && noIdUnderPath(path, ids)) { + if (AjaxContext.getCurrentInstance(context).isLimitRender() && noIdUnderPath(path, ids)) { return; } } @@ -113,7 +113,7 @@ if (component.isRendered()) { // skip not-rendered components. boolean found = false; - boolean disableImplicitRender = AjaxContext.getCurrentInstance(context).isDisableImplicitRender(); + boolean limitRender = AjaxContext.getCurrentInstance(context).isLimitRender(); String elementId = component.getId(); String absoluteId = currentPath + elementId; @@ -133,12 +133,12 @@ } // - if (!found && disableImplicitRender && (component instanceof NamingContainer) + if (!found && limitRender && (component instanceof NamingContainer) && noIdUnderPath(absoluteId + NamingContainer.SEPARATOR_CHAR, ids)) { return; } - if (!found && !disableImplicitRender && (component instanceof AjaxOutput)) { + if (!found && !limitRender && (component instanceof AjaxOutput)) { if (((AjaxOutput) component).isAjaxRendered()) { // renderChild(context, element); Modified: trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/AjaxRendererUtils.java =================================================================== --- trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/AjaxRendererUtils.java 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/ui/common/ui/src/main/java/org/richfaces/renderkit/util/AjaxRendererUtils.java 2010-12-15 10:37:50 UTC (rev 20573) @@ -359,7 +359,7 @@ // options.put("parameters", parameters); // } // // parameter to render only current list of areas. -//// if (isAjaxDisableImplicitRender(uiComponent)) { +//// if (isAjaxLimitRender(uiComponent)) { //// Set<? extends Object> ajaxAreas = getAjaxAreas(uiComponent); //// Set<String> areasIds = new HashSet<String>(); //// if (null != ajaxAreas) { @@ -507,7 +507,7 @@ // Set ajaxAreas = getAjaxAreas(uiComponent); // onClick.append(','); // // parameter to render only current list of areas. - // if (isAjaxDisableImplicitRender(uiComponent) && ajaxAreas != null && + // if (isAjaxLimitRender(uiComponent) && ajaxAreas != null && // ajaxAreas.size() > 0) // { // onClick.append('['); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenu.java 2010-12-15 10:37:50 UTC (rev 20573) @@ -200,7 +200,7 @@ public abstract boolean isBypassUpdates(); - public abstract boolean isDisableImplicitRender(); + public abstract boolean isLimitRender(); public abstract Object getData(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractPanelMenuItem.java 2010-12-15 10:37:50 UTC (rev 20573) @@ -119,7 +119,7 @@ public abstract boolean isBypassUpdates(); - public abstract boolean isDisableImplicitRender(); + public abstract boolean isLimitRender(); public abstract Object getData(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTogglePanel.java 2010-12-15 10:37:50 UTC (rev 20573) @@ -572,7 +572,7 @@ public abstract boolean isBypassUpdates(); - public abstract boolean isDisableImplicitRender(); + public abstract boolean isLimitRender(); public abstract boolean isCycledSwitching(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java 2010-12-15 10:37:50 UTC (rev 20573) @@ -88,7 +88,7 @@ public abstract boolean isBypassUpdates(); - public abstract boolean isDisableImplicitRender(); + public abstract boolean isLimitRender(); public abstract Object getData(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenu.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenu.java 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenu.java 2010-12-15 10:37:50 UTC (rev 20573) @@ -43,7 +43,7 @@ activeItem, itemChangeListener, bypassUpdates, - disableImplicitRender, + limitRender, data, status, execute, @@ -122,12 +122,12 @@ getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates); } - public boolean isDisableImplicitRender() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.disableImplicitRender))); + public boolean isLimitRender() { + return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.limitRender))); } - public void setDisableImplicitRender(boolean disableImplicitRender) { - getStateHelper().put(PropertyKeys.disableImplicitRender, disableImplicitRender); + public void setLimitRender(boolean limitRender) { + getStateHelper().put(PropertyKeys.limitRender, limitRender); } public Object getData() { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UIPanelMenuItem.java 2010-12-15 10:37:50 UTC (rev 20573) @@ -38,7 +38,7 @@ name, disabled, bypassUpdates, - disableImplicitRender, + limitRender, data, status, execute, @@ -85,12 +85,12 @@ getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates); } - public boolean isDisableImplicitRender() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.disableImplicitRender))); + public boolean isLimitRender() { + return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.limitRender))); } - public void setDisableImplicitRender(boolean disableImplicitRender) { - getStateHelper().put(PropertyKeys.disableImplicitRender, disableImplicitRender); + public void setLimitRender(boolean limitRender) { + getStateHelper().put(PropertyKeys.limitRender, limitRender); } public Object getData() { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanel.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanel.java 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UITogglePanel.java 2010-12-15 10:37:50 UTC (rev 20573) @@ -33,7 +33,7 @@ public enum PropertyKeys { switchType, bypassUpdates, - disableImplicitRender, + limitRender, cycledSwitching, data, status, @@ -59,12 +59,12 @@ getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates); } - public boolean isDisableImplicitRender() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.disableImplicitRender))); + public boolean isLimitRender() { + return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.limitRender))); } - public void setDisableImplicitRender(boolean disableImplicitRender) { - getStateHelper().put(PropertyKeys.disableImplicitRender, disableImplicitRender); + public void setLimitRender(boolean limitRender) { + getStateHelper().put(PropertyKeys.limitRender, limitRender); } public boolean isCycledSwitching() { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/UITooltip.java 2010-12-15 10:37:50 UTC (rev 20573) @@ -49,7 +49,7 @@ showEvent, verticalOffset, bypassUpdates, - disableImplicitRender, + limitRender, data, status, execute, @@ -176,12 +176,12 @@ getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates); } - public boolean isDisableImplicitRender() { - return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.disableImplicitRender))); + public boolean isLimitRender() { + return Boolean.valueOf(String.valueOf(getStateHelper().eval(PropertyKeys.limitRender))); } - public void setDisableImplicitRender(boolean disableImplicitRender) { - getStateHelper().put(PropertyKeys.disableImplicitRender, disableImplicitRender); + public void setLimitRender(boolean limitRender) { + getStateHelper().put(PropertyKeys.limitRender, limitRender); } public Object getData() { Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.faces-config.xml 2010-12-15 10:37:50 UTC (rev 20573) @@ -889,7 +889,7 @@ </property> <property> <description></description> - <property-name>disableImplicitRender</property-name> + <property-name>limitRender</property-name> <property-class>boolean</property-class> </property> <property> @@ -940,7 +940,7 @@ </property> <property> <description></description> - <property-name>disableImplicitRender</property-name> + <property-name>limitRender</property-name> <property-class>boolean</property-class> </property> <property> @@ -990,7 +990,7 @@ </property> <property> <description></description> - <property-name>disableImplicitRender</property-name> + <property-name>limitRender</property-name> <property-class>boolean</property-class> </property> <property> @@ -1235,7 +1235,7 @@ </property> <property> <description></description> - <property-name>disableImplicitRender</property-name> + <property-name>limitRender</property-name> <property-class>boolean</property-class> </property> <property> @@ -1579,7 +1579,7 @@ <property-class>boolean</property-class> </property> <property> - <property-name>disableImplicitRender</property-name> + <property-name>limitRender</property-name> <property-class>boolean</property-class> </property> <property> @@ -1943,7 +1943,7 @@ </property> <property> <description></description> - <property-name>disableImplicitRender</property-name> + <property-name>limitRender</property-name> <property-class>boolean</property-class> </property> <property> @@ -2087,7 +2087,7 @@ </property> <property> <description></description> - <property-name>disableImplicitRender</property-name> + <property-name>limitRender</property-name> <property-class>boolean</property-class> </property> <property> Modified: trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-15 09:58:08 UTC (rev 20572) +++ trunk/ui/output/ui/src/main/resources/META-INF/pn.taglib.xml 2010-12-15 10:37:50 UTC (rev 20573) @@ -26,7 +26,7 @@ <type>boolean</type> </attribute> <attribute> - <name>disableImplicitRender</name> + <name>limitRender</name> <type>boolean</type> </attribute> <attribute> @@ -362,7 +362,7 @@ <type>boolean</type> </attribute> <attribute> - <name>disableImplicitRender</name> + <name>limitRender</name> <type>boolean</type> </attribute> <attribute> @@ -557,7 +557,7 @@ <type>boolean</type> </attribute> <attribute> - <name>disableImplicitRender</name> + <name>limitRender</name> <type>boolean</type> </attribute> <attribute> @@ -627,12 +627,6 @@ <type>javax.faces.el.MethodBinding</type> </attribute> <attribute> - <description>MethodExpression representing the application action to invoke when this component is activated by the user. The expression must evaluate to a public method that takes no parameters, and returns an Object (the toString() of which is called to derive the logical outcome) which is passed to the NavigationHandler for this application.</description> - <display-name>Application Action</display-name> - <name>actionExpression</name> - <type>javax.el.MethodExpression</type> - </attribute> - <attribute> <description>&lt;p&gt; MethodExpression representing an action listener method that will be notified when this component is activated by the user. The expression must evaluate to a public method that takes an ActionEvent parameter, with a return type of void, &lt;span class="changed_added_2_0"&gt;or to a public method that takes no arguments with a return type of void. In the latter case, the method has no way of easily knowing where the event came from, but this can be useful in cases where a notification is needed that "some action happened".&lt;/span&gt; &lt;/p&gt;</description> <display-name>Action Listener</display-name> <name>actionListener</name> @@ -679,7 +673,7 @@ <type>boolean</type> </attribute> <attribute> - <name>disableImplicitRender</name> + <name>limitRender</name> <type>boolean</type> </attribute> <attribute> @@ -947,7 +941,7 @@ <type>boolean</type> </attribute> <attribute> - <name>disableImplicitRender</name> + <name>limitRender</name> <type>boolean</type> </attribute> <attribute> @@ -1047,7 +1041,7 @@ <type>boolean</type> </attribute> <attribute> - <name>disableImplicitRender</name> + <name>limitRender</name> <type>boolean</type> </attribute> <attribute> @@ -1223,7 +1217,7 @@ <type>boolean</type> </attribute> <attribute> - <name>disableImplicitRender</name> + <name>limitRender</name> <type>boolean</type> </attribute> <attribute> @@ -1468,7 +1462,7 @@ <type>boolean</type> </attribute> <attribute> - <name>disableImplicitRender</name> + <name>limitRender</name> <type>boolean</type> </attribute> <attribute>