Author: lfryc(a)redhat.com Date: 2011-01-31 10:50:13 -0500 (Mon, 31 Jan 2011) New Revision: 21331 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml Log: a4j:queue/attachQueue - attributes review Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java 2011-01-31 15:34:52 UTC (rev 21330) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JAttachQueueBean.java 2011-01-31 15:50:13 UTC (rev 21331) @@ -69,16 +69,6 @@ private void initializeAttributes(Attributes attributes) { attributes.setAttribute("rendered", true); - - // hidden attributes - attributes.remove("queueId"); - - // not implemented yet - // TODO RFPL-734 - attributes.remove("name"); - attributes.remove("timeout"); - attributes.remove("requestGroupingId"); - attributes.remove("ignoreDupResponses"); } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java 2011-01-31 15:34:52 UTC (rev 21330) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/A4JQueueBean.java 2011-01-31 15:50:13 UTC (rev 21331) @@ -62,13 +62,6 @@ attributes = Attributes.getComponentAttributesFromFacesConfig(UIQueue.class, getClass()); attributes.setAttribute("rendered", true); attributes.setAttribute("requestDelay", 750); - - // hidden attributes - attributes.remove("status"); - - // TODO attributes not implemented yet - attributes.remove("timeout"); - attributes.remove("ignoreDupResponses"); } public Attributes getAttributes() { Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml 2011-01-31 15:34:52 UTC (rev 21330) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/extending.xhtml 2011-01-31 15:50:13 UTC (rev 21331) @@ -46,16 +46,19 @@ </ui:define> <ui:define name="component"> - <a4j:queue id="queue1" ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" + <a4j:queue id="queue1" + ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" name="#{a4jQueueBean.attributes['name'].value}" onbeforedomupdate="#{a4jQueueBean.attributes['onbeforedomupdate'].value}" oncomplete="#{a4jQueueBean.attributes['oncomplete'].value}" - onerror="#{a4jQueueBean.attributes['onerror'].value}" onevent="#{a4jQueueBean.attributes['event'].value}" + onerror="#{a4jQueueBean.attributes['onerror'].value}" + onevent="#{a4jQueueBean.attributes['onevent'].value}" onrequestdequeue="#{a4jQueueBean.attributes['onrequestdequeue'].value}" onrequestqueue="#{a4jQueueBean.attributes['onrequestqueue'].value}" onsubmit="#{a4jQueueBean.attributes['onsubmit'].value}" rendered="#{a4jQueueBean.attributes['rendered'].value}" - requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" status="status1" + requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" + status="#{a4jQueueBean.attributes['status'].value}" timeout="#{a4jQueueBean.attributes['timeout'].value}" /> <fieldset> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml 2011-01-31 15:34:52 UTC (rev 21330) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nested.xhtml 2011-01-31 15:50:13 UTC (rev 21331) @@ -46,16 +46,19 @@ </ui:define> <ui:define name="component"> - <a4j:queue id="queue1" ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" + <a4j:queue id="queue1" + ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" name="#{a4jQueueBean.attributes['name'].value}" onbeforedomupdate="#{a4jQueueBean.attributes['onbeforedomupdate'].value}" oncomplete="#{a4jQueueBean.attributes['oncomplete'].value}" - onerror="#{a4jQueueBean.attributes['onerror'].value}" onevent="#{a4jQueueBean.attributes['event'].value}" + onerror="#{a4jQueueBean.attributes['onerror'].value}" + onevent="#{a4jQueueBean.attributes['onevent'].value}" onrequestdequeue="#{a4jQueueBean.attributes['onrequestdequeue'].value}" onrequestqueue="#{a4jQueueBean.attributes['onrequestqueue'].value}" onsubmit="#{a4jQueueBean.attributes['onsubmit'].value}" rendered="#{a4jQueueBean.attributes['rendered'].value}" - requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" status="status1" + requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" + status="#{a4jQueueBean.attributes['status'].value}" timeout="#{a4jQueueBean.attributes['timeout'].value}" /> <h:inputText id="input1" value="#{a4jAttachQueueBean.text1}" onkeypress="add(#{rich:element('events1')}); #{rich:element('timeWatcher:grid')}.event(1); "> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml 2011-01-31 15:34:52 UTC (rev 21330) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jAttachQueue/nestedExtension.xhtml 2011-01-31 15:50:13 UTC (rev 21331) @@ -46,16 +46,19 @@ </ui:define> <ui:define name="component"> - <a4j:queue id="queue1" ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" + <a4j:queue id="queue1" + ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" name="#{a4jQueueBean.attributes['name'].value}" onbeforedomupdate="#{a4jQueueBean.attributes['onbeforedomupdate'].value}" oncomplete="#{a4jQueueBean.attributes['oncomplete'].value}" - onerror="#{a4jQueueBean.attributes['onerror'].value}" onevent="#{a4jQueueBean.attributes['event'].value}" + onerror="#{a4jQueueBean.attributes['onerror'].value}" + onevent="#{a4jQueueBean.attributes['onevent'].value}" onrequestdequeue="#{a4jQueueBean.attributes['onrequestdequeue'].value}" onrequestqueue="#{a4jQueueBean.attributes['onrequestqueue'].value}" onsubmit="#{a4jQueueBean.attributes['onsubmit'].value}" rendered="#{a4jQueueBean.attributes['rendered'].value}" - requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" status="status1" + requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" + status="#{a4jQueueBean.attributes['status'].value}" timeout="#{a4jQueueBean.attributes['timeout'].value}" /> <fieldset> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml 2011-01-31 15:34:52 UTC (rev 21330) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/formQueue.xhtml 2011-01-31 15:50:13 UTC (rev 21331) @@ -41,17 +41,19 @@ <ui:define name="outOfTemplateBefore"> - <a4j:queue id="globalQueue" ignoreDupResponses="#{a4jQueueBean.globalQueue.attributes['ignoreDupResponses'].value}" - name="#{a4jQueueBean.globalQueue.attributes['name'].value}" + <a4j:queue id="globalQueue" + ignoreDupResponses="#{a4jQueueBean.globalQueue.attributes['ignoreDupResponses'].value}" onbeforedomupdate="#{a4jQueueBean.globalQueue.attributes['onbeforedomupdate'].value}" oncomplete="#{a4jQueueBean.globalQueue.attributes['oncomplete'].value}" - onerror="#{a4jQueueBean.globalQueue.attributes['onerror'].value}" onevent="#{a4jQueueBean.globalQueue.attributes['event'].value}" + onerror="#{a4jQueueBean.globalQueue.attributes['onerror'].value}" + onevent="#{a4jQueueBean.globalQueue.attributes['onevent'].value}" onrequestdequeue="#{a4jQueueBean.globalQueue.attributes['onrequestdequeue'].value}" onrequestqueue="#{a4jQueueBean.globalQueue.attributes['onrequestqueue'].value}" onsubmit="#{a4jQueueBean.globalQueue.attributes['onsubmit'].value}" rendered="#{a4jQueueBean.globalQueue.attributes['rendered'].value}" requestDelay="#{a4jQueueBean.globalQueue.attributes['requestDelay'].value}" - timeout="#{a4jQueueBean.globalQueue.attributes['timeout'].value}" /> + timeout="#{a4jQueueBean.globalQueue.attributes['timeout'].value}" + status="#{a4jQueueBean.globalQueue.attributes['status'].value}" /> </ui:define> Modified: modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml =================================================================== --- modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2011-01-31 15:34:52 UTC (rev 21330) +++ modules/tests/metamer/trunk/application/src/main/webapp/components/a4jQueue/globalQueue.xhtml 2011-01-31 15:50:13 UTC (rev 21331) @@ -50,17 +50,21 @@ <ui:define name="component"> - <a4j:queue id="a4jQueue" ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" + <a4j:queue id="a4jQueue" + ignoreDupResponses="#{a4jQueueBean.attributes['ignoreDupResponses'].value}" name="#{a4jQueueBean.attributes['name'].value}" onbeforedomupdate="#{a4jQueueBean.attributes['onbeforedomupdate'].value}" oncomplete="#{a4jQueueBean.attributes['oncomplete'].value}" - onerror="#{a4jQueueBean.attributes['onerror'].value}" onevent="#{a4jQueueBean.attributes['event'].value}" + onerror="#{a4jQueueBean.attributes['onerror'].value}" + onevent="#{a4jQueueBean.attributes['onevent'].value}" onrequestdequeue="#{a4jQueueBean.attributes['onrequestdequeue'].value}" onrequestqueue="#{a4jQueueBean.attributes['onrequestqueue'].value}" onsubmit="#{a4jQueueBean.attributes['onsubmit'].value}" rendered="#{a4jQueueBean.attributes['rendered'].value}" - requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" status="status1" - timeout="#{a4jQueueBean.attributes['timeout'].value}" /> + requestDelay="#{a4jQueueBean.attributes['requestDelay'].value}" + timeout="#{a4jQueueBean.attributes['timeout'].value}" + status="#{a4jQueueBean.attributes['status'].value}" + /> <h:form id="form" name="queueTestForm"> <h:panelGrid columns="2"> @@ -69,7 +73,7 @@ disabled="#{not (facesContext.maximumSeverity==null)}"> <a4j:ajax event="keypress" onbegin="add(#{rich:element('requests')}); #{rich:element('timeWatcher:grid')}.begin(); " render="outtext" oncomplete="#{rich:element('timeWatcher:grid')}.complete(); #{rich:element('timeWatcher:grid')}.difference(); " onbeforedomupdate="add(#{rich:element('updates')});"/> - </h:inputText> + </h:inputText> <h:outputText value="Repeated text:" /> <h:outputText value="#{a4jQueueBean.text}" id="outtext" style="font-weight:bold;" />