Author: nbelaevski Date: 2009-08-27 13:12:07 -0400 (Thu, 27 Aug 2009) New Revision: 15361 Removed: root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/UIAjaxLog.java Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/HandlersChain.java root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java Log: https://jira.jboss.org/jira/browse/RF-7758 Modified: root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/HandlersChain.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/HandlersChain.java 2009-08-27 17:09:28 UTC (rev 15360) +++ root/framework/trunk/impl/src/main/java/org/ajax4jsf/renderkit/HandlersChain.java 2009-08-27 17:12:07 UTC (rev 15361) @@ -54,6 +54,8 @@ private Collection<Parameter> parameters; + private boolean includeClientId = false; + //TODO: review for optimization private List<String> handlers = new ArrayList<String>(2); @@ -61,16 +63,26 @@ return s != null && s.length() != 0; } - public HandlersChain(UIComponent component) { this.component = component; } + public HandlersChain(UIComponent component, boolean includeClientId) { + this.component = component; + this.includeClientId = includeClientId; + } + public HandlersChain(UIComponent component, Collection<Parameter> parameters) { this.component = component; this.parameters = parameters; } + public HandlersChain(UIComponent component, Collection<Parameter> parameters, boolean includeClientId) { + this.component = component; + this.parameters = parameters; + this.includeClientId = includeClientId; + } + private final List<ClientBehavior> getBehaviorsList(String behaviorName) { List<ClientBehavior> behaviors = null; if (component instanceof ClientBehaviorHolder) { @@ -121,7 +133,8 @@ } if (behaviorsList != null) { ClientBehaviorContext behaviorContext = ClientBehaviorContext.createClientBehaviorContext( - context, component, name, null, getParameters(context)); + context, component, name, includeClientId ? component.getClientId(context) : null, + getParameters(context)); for (ClientBehavior clientBehavior : behaviorsList) { String behaviorScript = clientBehavior.getScript(behaviorContext); Deleted: root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/UIAjaxLog.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/UIAjaxLog.java 2009-08-27 17:09:28 UTC (rev 15360) +++ root/ui/trunk/components/core/src/main/java/org/ajax4jsf/component/UIAjaxLog.java 2009-08-27 17:12:07 UTC (rev 15361) @@ -1,52 +0,0 @@ -/** - * 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.UIComponentBase; - -/** - * @author shura - * - */ -public abstract class UIAjaxLog extends UIComponentBase { - - public static final String COMPONENT_TYPE = "org.ajax4jsf.Log"; - - public abstract String getHotkey(); - - public abstract void setHotkey(String newvalue); - - public abstract String getName(); - public abstract void setName(String newvalue); - - public abstract String getWidth(); - public abstract void setWidth(String newvalue); - - public abstract String getHeight(); - public abstract void setHeight(String newvalue); - - public abstract String getLevel(); - public abstract void setLevel(String newvalue); - - public abstract boolean isPopup(); - public abstract void setPopup(boolean popup); -} Modified: root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java 2009-08-27 17:09:28 UTC (rev 15360) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/renderkit/html/AjaxStatusRenderer.java 2009-08-27 17:12:07 UTC (rev 15361) @@ -30,10 +30,10 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; -import javax.faces.render.Renderer; import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.renderkit.HandlersChain; +import org.ajax4jsf.renderkit.RendererBase; import org.ajax4jsf.renderkit.RendererUtils; import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.ajax4jsf.renderkit.RendererUtils.ScriptHashVariableWrapper; @@ -48,7 +48,7 @@ @ResourceDependency(library = "javax.faces", name = "jsf.js"), @ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "richfaces.js") }) -public class AjaxStatusRenderer extends Renderer { +public class AjaxStatusRenderer extends RendererBase { private static final String START = "start"; private static final String STOP = "stop"; @@ -201,7 +201,7 @@ Map<String, Object> attributes = ajaxStatus.getAttributes(); for (String eventName : EVENT_NAMES) { String eventAttribute = "on" + eventName; - HandlersChain handlersChain = new HandlersChain(component); + HandlersChain handlersChain = new HandlersChain(component, true); handlersChain.addInlineHandlerFromAttribute(context, eventAttribute); handlersChain.addBehaviors(context, eventName); rendererUtils.addToScriptHash(options, eventAttribute, @@ -220,4 +220,12 @@ writer.endElement(HTML.SPAN_ELEM); } + + /* (non-Javadoc) + * @see org.ajax4jsf.renderkit.RendererBase#getComponentClass() + */ + @Override + protected Class<? extends UIComponent> getComponentClass() { + return UIAjaxStatus.class; + } }