[richfaces-svn-commits] JBoss Rich Faces SVN: r11375 - in trunk/ui/core/src: main/java/org/ajax4jsf/renderkit/html/scripts and 1 other directories.

Author: nbelaevski Date: 2008-11-25 13:20:10 -0500 (Tue, 25 Nov 2008) New Revision: 11375 Modified: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java Log: Queue code refactored: global name constant returned back to UIQueue Modified: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java 2008-11-25 18:19:16 UTC (rev 11374) +++ trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java 2008-11-25 18:20:10 UTC (rev 11375) @@ -33,6 +33,9 @@ */ public abstract class UIQueue extends UIComponentBase { + //TODO move to appropriate place + public static final String GLOBAL_QUEUE_NAME = "org.richfaces.queue.global"; + public static final String COMPONENT_TYPE = "org.ajax4jsf.Queue"; public static final String COMPONENT_FAMILY = "org.ajax4jsf.Queue"; @@ -104,7 +107,7 @@ } } else { if (name == null || name.length() == 0) { - name = QueueRegistry.GLOBAL_QUEUE_NAME; + name = GLOBAL_QUEUE_NAME; } clientName = context.getExternalContext().encodeNamespace(name); Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java 2008-11-25 18:19:16 UTC (rev 11374) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java 2008-11-25 18:20:10 UTC (rev 11375) @@ -33,6 +33,7 @@ import javax.faces.context.ResponseWriter; import org.ajax4jsf.component.QueueRegistry; +import org.ajax4jsf.component.UIQueue; import org.ajax4jsf.context.AjaxContext; import org.ajax4jsf.javascript.JSObject; import org.ajax4jsf.javascript.ScriptUtils; @@ -96,7 +97,16 @@ requestMap.put(resourceKey, Boolean.TRUE); QueueRegistry queueRegistry = QueueRegistry.getInstance(context); - if (queueRegistry.hasRegisteredQueues()) { + if (queueRegistry.isShouldCreateDefaultGlobalQueue()) { + String encodedGlobalQueueName = context.getExternalContext().encodeNamespace( + UIQueue.GLOBAL_QUEUE_NAME); + + if (!queueRegistry.containsQueue(encodedGlobalQueueName)) { + queueRegistry.registerQueue(context, encodedGlobalQueueName, null); + } + } + + if (queueRegistry.hasQueuesToEncode()) { super.encode(resource, context, queueRegistry.getRegisteredQueues(context), attributes); } } Modified: trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java =================================================================== --- trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2008-11-25 18:19:16 UTC (rev 11374) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2008-11-25 18:20:10 UTC (rev 11375) @@ -128,7 +128,7 @@ HtmlPage page = renderView(); String queueScript = getQueueScript(page); - assertEquals(createQueueInitString(QueueRegistry.GLOBAL_QUEUE_NAME, null, null), queueScript); + assertEquals(createQueueInitString(UIQueue.GLOBAL_QUEUE_NAME, null, null), queueScript); } public void testFormQueueName() throws Exception {