Author: nbelaevski Date: 2008-11-24 17:45:49 -0500 (Mon, 24 Nov 2008) New Revision: 11340 Added: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/QueueRenderer.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 Copied: trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java (from rev 11305, trunk/framework/impl/src/main/java/org/ajax4jsf/component/UIQueue.java) =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java (rev 0) +++ trunk/ui/core/src/main/java/org/ajax4jsf/component/UIQueue.java 2008-11-24 22:45:49 UTC (rev 11340) @@ -0,0 +1,115 @@ +/** + * License Agreement. + * + * Rich Faces - Natural Ajax for Java Server Faces (JSF) + * + * Copyright (C) 2007 Exadel, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +package org.ajax4jsf.component; + +import javax.faces.component.NamingContainer; +import javax.faces.component.UIComponent; +import javax.faces.component.UIComponentBase; +import javax.faces.component.UIForm; +import javax.faces.context.FacesContext; + +/** + * @author Nick Belaevski + * @since 3.3.0 + */ +public abstract class UIQueue extends UIComponentBase { + + public static final String COMPONENT_TYPE = "org.ajax4jsf.Queue"; + + public static final String COMPONENT_FAMILY = "org.ajax4jsf.Queue"; + + public abstract String getName(); + public abstract void setName(String name); + + public abstract String getOnsubmit(); + public abstract void setOnsubmit(String onsubmit); + + public abstract String getOncomplete(); + public abstract void setOncomplete(String oncomplete); + + public abstract String getOnbeforedomupdate(); + public abstract void setOnbeforedomupdate(String onbeforedomupdate); + + public abstract String getOnerror(); + public abstract void setOnerror(String onerror); + + public abstract String getOnsizeexceeded(); + public abstract void setOnsizeexceeded(String onsizeexceeded); + + public abstract boolean isDisabled(); + public abstract void setDisabled(boolean disabled); + + public abstract int getSize(); + public abstract void setSize(int size); + + public abstract String getSizeExceededBehavior(); + public abstract void setSizeExceededBehavior(String behavior); + + public abstract int getTimeout(); + public abstract void setTimeout(int timeout); + + public abstract int getRequestDelay(); + public abstract void setRequestDelay(int requestDelay); + + public abstract boolean isIgnoreDupResponses(); + public abstract void setIgnoreDupResponses(boolean ignoreDupResponses); + + + + @Override + public String getFamily() { + return COMPONENT_FAMILY; + } + + private UIComponent findParentForm() { + UIComponent component = getParent(); + while (component != null && !(component instanceof UIForm)) { + component = component.getParent(); + } + + return component; + } + + public String getClientName(FacesContext context) { + UIComponent form = findParentForm(); + String name = getName(); + String clientName; + + if (form != null) { + String formClientId = form.getClientId(context); + + if (name != null && name.length() != 0) { + clientName = formClientId + NamingContainer.SEPARATOR_CHAR + name; + } else { + clientName = formClientId; + } + } else { + if (name == null || name.length() == 0) { + name = QueueRegistry.GLOBAL_QUEUE_NAME; + } + + clientName = context.getExternalContext().encodeNamespace(name); + } + + return clientName; + } +} Modified: trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/QueueRenderer.java =================================================================== --- trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/QueueRenderer.java 2008-11-24 20:46:10 UTC (rev 11339) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/QueueRenderer.java 2008-11-24 22:45:49 UTC (rev 11340) @@ -175,8 +175,9 @@ UIQueue queue = (UIQueue) component; if (!queue.isDisabled()) { - QueueRegistry.registerQueue(context, queue.getClientName(context), - createRendererData(context, queue)); + QueueRegistry.getInstance(context).registerQueue(context, + queue.getClientName(context), + createRendererData(context, queue)); } } } 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-24 20:46:10 UTC (rev 11339) +++ trunk/ui/core/src/main/java/org/ajax4jsf/renderkit/html/scripts/QueueScriptResourceRenderer.java 2008-11-24 22:45:49 UTC (rev 11340) @@ -95,9 +95,9 @@ if (requestMap.get(resourceKey) == null) { requestMap.put(resourceKey, Boolean.TRUE); - Map<String, Object> queues = QueueRegistry.getRegisteredQueues(context); - if (queues != null && !queues.isEmpty()) { - super.encode(resource, context, queues, attributes); + QueueRegistry queueRegistry = QueueRegistry.getInstance(context); + if (queueRegistry.hasRegisteredQueues()) { + 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-24 20:46:10 UTC (rev 11339) +++ trunk/ui/core/src/test/java/org/ajax4jsf/component/QueueRendererTest.java 2008-11-24 22:45:49 UTC (rev 11340) @@ -128,7 +128,7 @@ HtmlPage page = renderView(); String queueScript = getQueueScript(page); - assertEquals(createQueueInitString(UIQueue.GLOBAL_QUEUE_NAME, null, null), queueScript); + assertEquals(createQueueInitString(QueueRegistry.GLOBAL_QUEUE_NAME, null, null), queueScript); } public void testFormQueueName() throws Exception {