Author: nbelaevski Date: 2010-05-24 13:58:15 -0400 (Mon, 24 May 2010) New Revision: 17210 Added: root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManager.java root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManagerPhaseCleaner.java Modified: root/core/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java root/core/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java root/core/trunk/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java root/core/trunk/impl/src/main/resources/META-INF/faces-config.xml root/ui-sandbox/componentcontrol/trunk/ui/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java root/ui/core/trunk/api/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java Log: Support for "org.richfaces.queue.enabled" parameter Modified: root/core/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java =================================================================== --- root/core/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/core/trunk/impl/src/main/java/org/ajax4jsf/context/ContextInitParameters.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -49,7 +49,7 @@ public static final String HANDLE_VIEW_EXPIRED_ON_CLIENT = "org.ajax4jsf.handleViewExpiredOnClient"; public static final String STD_CONTROLS_SKINNING_PARAM = "org.richfaces.ENABLE_CONTROL_SKINNING"; public static final String STD_CONTROLS_SKINNING_CLASSES_PARAM = "org.richfaces.ENABLE_CONTROL_SKINNING_CLASSES"; - public static final String[] GLOBAL_QUEUE_ENABLED = {"org.richfaces.queue.enabled"}; + public static final String[] QUEUE_ENABLED = {"org.richfaces.queue.enabled"}; private static final String INIT_PARAM_PREFIX = ContextInitParameters.class.getSimpleName() + ":"; private static final Object NULL = new Object() { @@ -80,14 +80,8 @@ return getBoolean(context, DATATABLE_USES_VIEW_LOCALE, false); } - /** - * Defines what the skinning level used - * - * @param context - * @return value of CONTROL_SKINNING_LEVEL parameter if present - */ - public static boolean isGlobalQueueEnabled(FacesContext context) { - return getBoolean(context, GLOBAL_QUEUE_ENABLED, true); + public static boolean isQueueEnabled(FacesContext context) { + return getBoolean(context, QUEUE_ENABLED, true); } /** Modified: root/core/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java =================================================================== --- root/core/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/core/trunk/impl/src/main/java/org/ajax4jsf/renderkit/RendererUtils.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -32,15 +32,18 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; +import java.util.List; import java.util.Map; import java.util.Set; import javax.faces.FacesException; +import javax.faces.application.Application; import javax.faces.application.ViewHandler; import javax.faces.component.EditableValueHolder; import javax.faces.component.NamingContainer; import javax.faces.component.UIComponent; import javax.faces.component.UIForm; +import javax.faces.component.UIOutput; import javax.faces.component.UIParameter; import javax.faces.component.UIViewRoot; import javax.faces.component.ValueHolder; @@ -57,6 +60,7 @@ import org.ajax4jsf.javascript.JSReference; import org.ajax4jsf.util.HtmlDimensions; import org.richfaces.context.ComponentIdResolver; +import org.richfaces.context.RequestStateManager; /** * Util class for common render operations - render passthru html attributes, @@ -1135,6 +1139,80 @@ } } + private UIComponent findInstalledResource(FacesContext context, String libraryName, String resourceName, + String target) { + + List<UIComponent> resourceComponents = context.getViewRoot().getComponentResources(context, target); + for (UIComponent component : resourceComponents) { + Map<String, Object> attributes = component.getAttributes(); + + if (resourceName.equals(attributes.get("name"))) { + Object library = attributes.get("library"); + + if ((libraryName == null && library == null) || libraryName.equals(library)) { + return component; + } + } + } + + return null; + } + + public UIComponent findInstalledResource(FacesContext context, String libraryName, String resourceName) { + UIComponent component; + + component = findInstalledResource(context, libraryName, resourceName, "head"); + + if (component == null) { + component = findInstalledResource(context, libraryName, resourceName, "body"); + } + + if (component == null) { + component = findInstalledResource(context, libraryName, resourceName, "form"); + } + + return component; + } + + public void addResource(FacesContext context, String libraryName, String resourceName) { + addResource(context, libraryName, resourceName, null); + } + + public void addResource(FacesContext context, String libraryName, String resourceName, String targetParam) { + String resourceKey; + + if (libraryName != null && libraryName.length() != 0) { + resourceKey = libraryName + '/' + resourceName; + } else { + resourceKey = resourceName; + } + + Set<String> processedResources = RequestStateManager.getProcessedResources(context); + if (processedResources.contains(resourceKey)) { + return ; + } + + UIComponent resourceComponent = findInstalledResource(context, libraryName, resourceName); + if (resourceComponent == null) { + Application application = context.getApplication(); + resourceComponent = application.createComponent(UIOutput.COMPONENT_TYPE); + + String rendererType = application.getResourceHandler().getRendererTypeForResourceName(resourceName); + resourceComponent.setRendererType(rendererType); + + if (libraryName != null && libraryName.length() != 0) { + resourceComponent.getAttributes().put("library", libraryName); + } + + resourceComponent.getAttributes().put("name", resourceName); + + String target = (targetParam != null ? targetParam : "head"); + context.getViewRoot().addComponentResource(context, resourceComponent, target); + } + + processedResources.add(resourceKey); + } + /** * Common HTML elements and attributes names. * Added: root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManager.java =================================================================== --- root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManager.java (rev 0) +++ root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManager.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -0,0 +1,78 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.context; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import javax.faces.context.FacesContext; +import javax.faces.event.PhaseId; + +/** + * @author Nick Belaevski + * + */ +public final class RequestStateManager { + + private static final String ATTRIBUTE_NAME_PREFIX = RequestStateManager.class.getName() + ":"; + + private enum Sets { + PROCESSED_RESOURCES("processedResources"); + + private final String attributeName; + + private Sets(String propertyName) { + this.attributeName = ATTRIBUTE_NAME_PREFIX + propertyName; + } + + void clear(FacesContext context) { + context.getAttributes().remove(attributeName); + } + + public Set<String> getValue(FacesContext context) { + Map<Object, Object> attributes = context.getAttributes(); + + Set<String> set = (Set<String>) attributes.get(attributeName); + if (set == null) { + set = new HashSet<String>(); + attributes.put(attributeName, set); + } + + return set; + } + }; + + private RequestStateManager() { + //only factory methods are allowed to be used + } + + static void clear(FacesContext context) { + if (context.getCurrentPhaseId() == PhaseId.RENDER_RESPONSE) { + RequestStateManager.Sets.PROCESSED_RESOURCES.clear(context); + } + } + + public static Set<String> getProcessedResources(FacesContext context) { + return Sets.PROCESSED_RESOURCES.getValue(context); + } +} Added: root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManagerPhaseCleaner.java =================================================================== --- root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManagerPhaseCleaner.java (rev 0) +++ root/core/trunk/impl/src/main/java/org/richfaces/context/RequestStateManagerPhaseCleaner.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.context; + +import javax.faces.event.PhaseEvent; +import javax.faces.event.PhaseId; +import javax.faces.event.PhaseListener; + +/** + * @author Nick Belaevski + * + */ +public class RequestStateManagerPhaseCleaner implements PhaseListener { + + /** + * + */ + private static final long serialVersionUID = -7736491845168435241L; + + public void afterPhase(PhaseEvent event) { + } + + public void beforePhase(PhaseEvent event) { + RequestStateManager.clear(event.getFacesContext()); + } + + public PhaseId getPhaseId() { + return PhaseId.ANY_PHASE; + } +} Modified: root/core/trunk/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java =================================================================== --- root/core/trunk/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/core/trunk/impl/src/main/java/org/richfaces/context/SkinningResourcesPhaseListener.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -24,6 +24,7 @@ import java.util.Map; import javax.el.ELContext; +import javax.faces.application.Application; import javax.faces.component.UIComponent; import javax.faces.component.UIOutput; import javax.faces.component.UIViewRoot; @@ -57,8 +58,6 @@ private static final String CLASSES_SKINNING; - private static final String STYLESHEET_RENDERER = "javax.faces.resource.Stylesheet"; - static { String skinningName = "skinning"; @@ -115,8 +114,10 @@ } private UIComponent createComponentResource(FacesContext context) { - UIComponent resourceComponent = context.getApplication().createComponent(UIOutput.COMPONENT_TYPE); - resourceComponent.setRendererType(STYLESHEET_RENDERER); + Application application = context.getApplication(); + UIComponent resourceComponent = application.createComponent(UIOutput.COMPONENT_TYPE); + resourceComponent.setRendererType( + application.getResourceHandler().getRendererTypeForResourceName(BOTH_SKINNING)); return resourceComponent; } @@ -133,9 +134,11 @@ assert viewRoot != null; - Map<String, Object> attributes = viewRoot.getAttributes(); - if (!Boolean.TRUE.equals(attributes.get(RESOURCES_PROCESSED_MARKER))) { - attributes.put(RESOURCES_PROCESSED_MARKER, Boolean.TRUE); + Map<String, Object> viewMap = viewRoot.getViewMap(); + + //TODO nick - is this check sufficient? + if (!Boolean.TRUE.equals(viewMap.get(RESOURCES_PROCESSED_MARKER))) { + viewMap.put(RESOURCES_PROCESSED_MARKER, Boolean.TRUE); UIComponent basic = createComponentResource(context); basic.setValueExpression("name", new SkinningResourceNameExpression()); Modified: root/core/trunk/impl/src/main/resources/META-INF/faces-config.xml =================================================================== --- root/core/trunk/impl/src/main/resources/META-INF/faces-config.xml 2010-05-24 16:00:14 UTC (rev 17209) +++ root/core/trunk/impl/src/main/resources/META-INF/faces-config.xml 2010-05-24 17:58:15 UTC (rev 17210) @@ -80,4 +80,8 @@ --> <!-- /render-kit --> + <lifecycle> + <phase-listener>org.richfaces.context.RequestStateManagerPhaseCleaner</phase-listener> + </lifecycle> + </faces-config> Modified: root/ui/core/trunk/api/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui/core/trunk/api/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -48,8 +48,9 @@ renderKitId = RenderKitFactory.HTML_BASIC_RENDER_KIT) @ResourceDependencies( - {@ResourceDependency(library = "javax.faces", name = "jsf.js") , - @ResourceDependency(name = "jquery.js", target = "head") , @ResourceDependency(name = "richfaces.js", target = "head"), @ResourceDependency(name="richfaces-queue.js") + {@ResourceDependency(library = "javax.faces", name = "jsf.js"), + @ResourceDependency(name = "jquery.js", target = "head"), + @ResourceDependency(name = "richfaces.js", target = "head") } ) Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/AjaxCommandRendererBase.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -48,7 +48,7 @@ * */ @ResourceDependencies({@ResourceDependency(library = "javax.faces", name = "jsf.js") , - @ResourceDependency(name = "jquery.js") , @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "richfaces-queue.js") }) + @ResourceDependency(name = "jquery.js") , @ResourceDependency(name = "richfaces.js")}) public abstract class AjaxCommandRendererBase extends RendererBase { private static final Logger LOG = RichfacesLogger.RENDERKIT.getLogger(); Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -21,6 +21,16 @@ package org.richfaces.renderkit.html; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import javax.faces.application.ResourceDependencies; +import javax.faces.application.ResourceDependency; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.renderkit.HandlersChain; import org.ajax4jsf.renderkit.RendererBase; @@ -30,23 +40,13 @@ import org.richfaces.component.AbstractAjaxStatus; import org.richfaces.component.util.HtmlUtil; -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - /** * @author Nick Belaevski */ @ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf.js"), @ResourceDependency(name = "jquery.js"), - @ResourceDependency(name = "richfaces.js"), - @ResourceDependency(name = "richfaces-queue.js")}) + @ResourceDependency(name = "richfaces.js")}) public class AjaxStatusRenderer extends RendererBase { private static final String START = "start"; Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -21,8 +21,6 @@ */ package org.richfaces.renderkit.html; -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.event.AbortProcessingException; @@ -34,6 +32,8 @@ import javax.faces.event.PreRemoveFromViewEvent; import javax.faces.render.Renderer; +import org.ajax4jsf.context.ContextInitParameters; +import org.ajax4jsf.renderkit.RendererUtils; import org.richfaces.component.QueueRegistry; import org.richfaces.log.RichfacesLogger; import org.slf4j.Logger; @@ -41,11 +41,10 @@ /** * @author Nick Belaevski Base class for rendering Queue */ -@ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf.js"), - @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), - @ResourceDependency(name = "richfaces-queue.js") }) -@ListenersFor( { @ListenerFor(systemEventClass = PostAddToViewEvent.class), - @ListenerFor(systemEventClass = PreRemoveFromViewEvent.class) }) +@ListenersFor({ + @ListenerFor(systemEventClass = PostAddToViewEvent.class), + @ListenerFor(systemEventClass = PreRemoveFromViewEvent.class) +}) public abstract class QueueRendererBase extends Renderer implements ComponentSystemEventListener { //TODO nick - handle ContextInitParameters.isGlobalQueueEnabled(FacesContext) @@ -54,6 +53,8 @@ protected static final String NAME_ATTRIBBUTE = "name"; protected static final Logger LOGGER = RichfacesLogger.COMPONENTS.getLogger(); + private final RendererUtils utils = RendererUtils.getInstance(); + public void processEvent(ComponentSystemEvent event) throws AbortProcessingException { UIComponent comp = event.getComponent(); FacesContext context = FacesContext.getCurrentInstance(); @@ -63,6 +64,19 @@ if (event instanceof PostAddToViewEvent) { queueRegistry.addQueue(queueName, comp); + + //@ResourceDependency(library = "javax.faces", name = "jsf.js"), + //@ResourceDependency(name = "jquery.js"), + //@ResourceDependency(name = "richfaces.js"), + //@ResourceDependency(name = "richfaces-queue.js") + utils.addResource(context, "javax.faces", "jsf.js"); + utils.addResource(context, null, "jquery.js"); + utils.addResource(context, null, "richfaces.js"); + + if (ContextInitParameters.isQueueEnabled(context)) { + utils.addResource(context, null, "richfaces-queue.js"); + //TODO nick - make queue resource transient? + } } else if (event instanceof PreRemoveFromViewEvent) { queueRegistry.removeQueue(queueName); } Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java =================================================================== --- root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueResourceComponentRenderer.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -32,6 +32,7 @@ import javax.faces.context.ResponseWriter; import javax.faces.render.Renderer; +import org.ajax4jsf.context.ContextInitParameters; import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.RendererUtils; import org.ajax4jsf.renderkit.RendererUtils.HTML; @@ -69,7 +70,7 @@ super.encodeEnd(context, component); QueueRegistry registry = QueueRegistry.getInstance(context); - if (registry != null && registry.hasQueuesToEncode()) { + if (ContextInitParameters.isQueueEnabled(context) && registry != null && registry.hasQueuesToEncode()) { ResponseWriter writer = context.getResponseWriter(); writer.startElement(HTML.SCRIPT_ELEM, component); Modified: root/ui-sandbox/componentcontrol/trunk/ui/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java =================================================================== --- root/ui-sandbox/componentcontrol/trunk/ui/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui-sandbox/componentcontrol/trunk/ui/src/main/java/org/richfaces/renderkit/ComponentControlBehaviorRenderer.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -51,7 +51,7 @@ @FacesBehaviorRenderer(rendererType = "org.richfaces.behavior.ComponentControlBehavior", renderKitId = RenderKitFactory.HTML_BASIC_RENDER_KIT) @ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf.js"), @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), - @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name = "richfaces-queue.js"), + @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name = "richfaces-base-component.js"), @ResourceDependency(name = "script/component-control.js") }) public class ComponentControlBehaviorRenderer extends ClientBehaviorRenderer { Modified: root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java =================================================================== --- root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui-sandbox/datascroller/trunk/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -46,7 +46,7 @@ @ResourceDependencies( { @ResourceDependency(library = "javax.faces", name = "jsf-uncompressed.js"), @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js"), - @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name = "richfaces-queue.js"), + @ResourceDependency(name = "richfaces-event.js"), @ResourceDependency(name = "richfaces-base-component.js"), @ResourceDependency(name = "script/datascroller.js"), @ResourceDependency(name = "css/datascroller.ecss") Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java =================================================================== --- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2010-05-24 16:00:14 UTC (rev 17209) +++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ToggleControlRendererBase.java 2010-05-24 17:58:15 UTC (rev 17210) @@ -43,7 +43,7 @@ * */ @ResourceDependencies( {@ResourceDependency(library = "javax.faces", name = "jsf-uncompressed.js"), - @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name="richfaces-queue.js"), @ResourceDependency(name = "toggler.js")}) + @ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "toggler.js")}) public abstract class ToggleControlRendererBase extends RendererBase {