Author: nbelaevski Date: 2011-01-31 10:34:52 -0500 (Mon, 31 Jan 2011) New Revision: 21330 Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractAttachQueue.java trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractQueue.java trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java trunk/ui/core/ui/src/test/java/org/richfaces/component/QueueRendererTest.java trunk/ui/core/ui/src/test/resources/org/richfaces/component/queue.xhtml Log: https://issues.jboss.org/browse/RF-10362 https://issues.jboss.org/browse/RF-10363 Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractAttachQueue.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractAttachQueue.java 2011-01-31 15:24:37 UTC (rev 21329) +++ trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractAttachQueue.java 2011-01-31 15:34:52 UTC (rev 21330) @@ -68,9 +68,6 @@ public abstract int getRequestDelay(); @Attribute - public abstract int getTimeout(); - - @Attribute public abstract boolean isIgnoreDupResponses(); @Attribute Modified: trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractQueue.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractQueue.java 2011-01-31 15:24:37 UTC (rev 21329) +++ trunk/ui/core/ui/src/main/java/org/richfaces/component/AbstractQueue.java 2011-01-31 15:34:52 UTC (rev 21330) @@ -48,9 +48,6 @@ public abstract int getRequestDelay(); @Attribute - public abstract String getStatus(); - - @Attribute public abstract String getOnsubmit(); @Attribute @@ -72,9 +69,6 @@ public abstract String getOnrequestdequeue(); @Attribute - public abstract int getTimeout(); - - @Attribute public abstract boolean isIgnoreDupResponses(); @Attribute Modified: trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java =================================================================== --- trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2011-01-31 15:24:37 UTC (rev 21329) +++ trunk/ui/core/ui/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2011-01-31 15:34:52 UTC (rev 21330) @@ -54,7 +54,7 @@ private enum QueueOptions { onbeforedomupdate, oncomplete, onerror, onevent, onrequestdequeue, onrequestqueue, onsubmit, - requestDelay, timeout, status, queueId, ignoreDupResponses, requestGroupingId + requestDelay, queueId, ignoreDupResponses, requestGroupingId } private void appendOptions(UIComponent queue, Map<String, Object> optionsHash) { Modified: trunk/ui/core/ui/src/test/java/org/richfaces/component/QueueRendererTest.java =================================================================== --- trunk/ui/core/ui/src/test/java/org/richfaces/component/QueueRendererTest.java 2011-01-31 15:24:37 UTC (rev 21329) +++ trunk/ui/core/ui/src/test/java/org/richfaces/component/QueueRendererTest.java 2011-01-31 15:34:52 UTC (rev 21330) @@ -57,11 +57,11 @@ private @interface DisableQueue {} private static final String EXPECTED_QUEUE_SCRIPT = "RichFaces.queue.setQueueOptions({" + - "\"first\": {\"requestDelay\": 400, \"timeout\": 100, \"ignoreDupResponses\": true}," + + "\"first\": {\"requestDelay\": 400, \"ignoreDupResponses\": true}," + "\"form\": {\"requestDelay\": 400}," + - "\"form:firstAttach\": {\"timeout\": 300, \"requestGroupingId\": \"request\"}," + - "\"second\": {\"requestDelay\": 400, \"timeout\": 100, \"ignoreDupResponses\": true}," + - "\"form:linkAttach\": {\"timeout\": 500, \"queueId\": \"second\"}," + + "\"form:firstAttach\": {\"requestGroupingId\": \"request\"}," + + "\"second\": {\"requestDelay\": 400, \"ignoreDupResponses\": true}," + + "\"form:linkAttach\": {\"queueId\": \"second\"}," + "\"form:secondAttach\": {}" + "});"; Modified: trunk/ui/core/ui/src/test/resources/org/richfaces/component/queue.xhtml =================================================================== --- trunk/ui/core/ui/src/test/resources/org/richfaces/component/queue.xhtml 2011-01-31 15:24:37 UTC (rev 21329) +++ trunk/ui/core/ui/src/test/resources/org/richfaces/component/queue.xhtml 2011-01-31 15:34:52 UTC (rev 21330) @@ -7,22 +7,22 @@ <title>Test queue page</title> </h:head> <h:body> - <a4j:queue name="first" ignoreDupResponses="true" timeout="100" requestDelay="400"/> + <a4j:queue name="first" ignoreDupResponses="true" requestDelay="400"/> <h:form id="form"> <a4j:queue ignoreDupResponses="false" requestDelay="400"/> <a4j:ajax> <h:inputText /> - <a4j:attachQueue requestGroupingId="request" timeout="300" id="firstAttach" /> + <a4j:attachQueue requestGroupingId="request" id="firstAttach" /> </a4j:ajax> - <a4j:queue name="second" ignoreDupResponses="true" timeout="100" requestDelay="400"/> + <a4j:queue name="second" ignoreDupResponses="true" requestDelay="400"/> <a4j:ajax event="valueChange"> <h:panelGroup> <a4j:ajax event="valueChange"> <h:inputText /> <a4j:commandLink value="Link"> - <a4j:attachQueue name="second" timeout="500" id="linkAttach" /> + <a4j:attachQueue name="second" id="linkAttach" /> </a4j:commandLink> <a4j:attachQueue id="secondAttach" />