Author: nbelaevski Date: 2008-11-25 13:19:16 -0500 (Tue, 25 Nov 2008) New Revision: 11374 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/QueueRegistry.java trunk/framework/impl/src/main/java/org/ajax4jsf/context/ViewResources.java Log: Queue code refactored: global name constant returned back to UIQueue Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/component/QueueRegistry.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/component/QueueRegistry.java 2008-11-25 18:08:10 UTC (rev 11373) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/component/QueueRegistry.java 2008-11-25 18:19:16 UTC (rev 11374) @@ -34,11 +34,10 @@ */ public class QueueRegistry { - //TODO move to appropriate place - public static final String GLOBAL_QUEUE_NAME = "org.richfaces.queue.global"; - private static final String REGISTRY_ATTRIBUTE_NAME = QueueRegistry.class.getName(); + private boolean shouldCreateDefaultGlobalQueue = false; + private Map<String, Object> queuesData = new LinkedHashMap<String, Object>(); private QueueRegistry() { @@ -60,25 +59,30 @@ } public void registerQueue(FacesContext context, String clientName, Object data) { - if (!queuesData.containsKey(clientName)) { + if (!containsQueue(clientName)) { queuesData.put(clientName, data); } else { context.getExternalContext().log("Queue with name '" + clientName + "' has already been registered"); } } + public boolean containsQueue(String name) { + return queuesData.containsKey(name); + } + public Map<String, Object> getRegisteredQueues(FacesContext context) { return queuesData; } + + public void setShouldCreateDefaultGlobalQueue() { + this.shouldCreateDefaultGlobalQueue = true; + } - public void createGlobalDefaultQueue(FacesContext context) { - String encodedGlobalQueueName = context.getExternalContext().encodeNamespace(GLOBAL_QUEUE_NAME); - if (!queuesData.containsKey(encodedGlobalQueueName)) { - queuesData.put(encodedGlobalQueueName, null); - } + public boolean isShouldCreateDefaultGlobalQueue() { + return shouldCreateDefaultGlobalQueue; } - public boolean hasRegisteredQueues() { - return !queuesData.isEmpty(); + public boolean hasQueuesToEncode() { + return shouldCreateDefaultGlobalQueue || !queuesData.isEmpty(); } } Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/ViewResources.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/context/ViewResources.java 2008-11-25 18:08:10 UTC (rev 11373) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/ViewResources.java 2008-11-25 18:19:16 UTC (rev 11374) @@ -457,10 +457,10 @@ QueueRegistry queueRegistry = QueueRegistry.getInstance(context); if (Boolean.valueOf(getInitParameterValue(context, "org.richfaces.queue.global.enabled"))) { - queueRegistry.createGlobalDefaultQueue(context); + queueRegistry.setShouldCreateDefaultGlobalQueue(); } - if (queueRegistry.hasRegisteredQueues()) { + if (queueRegistry.hasQueuesToEncode()) { InternetResource queueScriptResource = resourceBuilder.getResource(QUEUE_SCRIPT_RESOURCE); queueScriptResource.encode(context, null); }