[richfaces-svn-commits] JBoss Rich Faces SVN: r16777 - in root: ui/trunk/components/core/src/main/java/org/richfaces and 4 other directories.

Author: Alex.Kolonitsky Date: 2010-04-20 11:48:45 -0400 (Tue, 20 Apr 2010) New Revision: 16777 Added: root/ui/trunk/components/core/src/main/java/org/richfaces/view/ root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/ root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/ root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxPushHandler_.java root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/BehaviorStack.java root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/BehaviorsAddingComponentHandlerWrapper.java root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/MediaOutputHandler.java Removed: root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxHandler.java root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxPushHandler.java root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorStack.java root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsAddingComponentHandlerWrapper.java root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsTagHandlerDelegateFactoryImpl.java root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/MediaOutputHandler.java Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TagType.java Log: RF-7826 Migrate A1 components to new CDK Modified: root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TagType.java =================================================================== --- root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TagType.java 2010-04-20 15:42:52 UTC (rev 16776) +++ root/cdk/trunk/plugins/annotations/src/main/java/org/richfaces/cdk/annotations/TagType.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -27,5 +27,5 @@ * @since Feb 11, 2010 */ public enum TagType { - None, Jsp, Facelets, All + Jsp, Facelets, All } Deleted: root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxHandler.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxHandler.java 2010-04-20 15:42:52 UTC (rev 16776) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxHandler.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -1,272 +0,0 @@ -package org.richfaces.taglib.html.facelets; - -import java.beans.BeanDescriptor; -import java.beans.BeanInfo; -import java.io.IOException; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import javax.el.ELContext; -import javax.el.MethodExpression; -import javax.faces.application.Application; -import javax.faces.component.UIComponent; -import javax.faces.component.behavior.ClientBehaviorHolder; -import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.AjaxBehaviorEvent; -import javax.faces.event.AjaxBehaviorListener; -import javax.faces.view.AttachedObjectHandler; -import javax.faces.view.AttachedObjectTarget; -import javax.faces.view.BehaviorHolderAttachedObjectHandler; -import javax.faces.view.BehaviorHolderAttachedObjectTarget; -import javax.faces.view.facelets.BehaviorConfig; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.CompositeFaceletHandler; -import javax.faces.view.facelets.FaceletContext; -import javax.faces.view.facelets.TagAttribute; -import javax.faces.view.facelets.TagException; -import javax.faces.view.facelets.TagHandler; - -import org.ajax4jsf.component.behavior.AjaxBehavior; - -public class AjaxHandler extends TagHandler implements BehaviorHolderAttachedObjectHandler { - - // TODO - is that implementation dependency? - private static final String JAVAX_FACES_RETARGETABLE_HANDLERS = "javax.faces.RetargetableHandlers"; - private final TagAttribute disabled; - private final TagAttribute event; - private final TagAttribute execute; - private final TagAttribute immediate; - private final TagAttribute limitRender; - private final TagAttribute listener; - private final TagAttribute onbeforedomupdate; - private final TagAttribute onbegin; - private final TagAttribute oncomplete; - private final TagAttribute onerror; - private final TagAttribute onevent; - private final TagAttribute queueId; - private final TagAttribute render; - private final TagAttribute similarityGroupingId; - private final TagAttribute statusId; - private final boolean wrapping; - - public AjaxHandler(BehaviorConfig config) { - super(config); - this.event = this.getAttribute("event"); - this.execute = this.getAttribute("execute"); - this.render = this.getAttribute("render"); - this.disabled = this.getAttribute("disabled"); - this.immediate = this.getAttribute("immediate"); - this.listener = this.getAttribute("listener"); - this.limitRender = this.getAttribute("limitRender"); - this.queueId = this.getAttribute("queueId"); - this.statusId = this.getAttribute("status"); - this.similarityGroupingId = this.getAttribute("similarityGroupingId"); - this.onevent = this.getAttribute("onevent"); - this.onerror = this.getAttribute("onerror"); - this.onbegin = this.getAttribute("onbegin"); - this.oncomplete = this.getAttribute("oncomplete"); - this.onbeforedomupdate = this.getAttribute("onbeforedomupdate"); - this.wrapping = isWrapping(); - } - - public void apply(FaceletContext fContext, UIComponent parent) throws IOException { - String eventName = getEventName(); - - if (this.wrapping) { - applyWrapping(fContext, parent, eventName); - } else { - applyNested(fContext, parent, eventName); - } - } - - private static List<AttachedObjectHandler> getOrCreateRetargetableHandlersList(UIComponent component) { - Map<String, Object> attrs = component.getAttributes(); - @SuppressWarnings({ - "unchecked"}) List<AttachedObjectHandler> list = - (List<AttachedObjectHandler>) attrs.get(JAVAX_FACES_RETARGETABLE_HANDLERS); - - if (list == null) { - list = new ArrayList<AttachedObjectHandler>(); - attrs.put(JAVAX_FACES_RETARGETABLE_HANDLERS, list); - } - - return list; - } - - private void applyNested(FaceletContext ctx, UIComponent parent, String eventName) { - if (!ComponentHandler.isNew(parent)) { - return; - } - - if (UIComponent.isCompositeComponent(parent)) { - BeanInfo componentBeanInfo = (BeanInfo) parent.getAttributes().get(UIComponent.BEANINFO_KEY); - - if (null == componentBeanInfo) { - throw new TagException(tag, "Error: enclosing composite component does not have BeanInfo attribute"); - } - - BeanDescriptor componentDescriptor = componentBeanInfo.getBeanDescriptor(); - - if (null == componentDescriptor) { - throw new TagException(tag, - "Error: enclosing composite component BeanInfo does not have BeanDescriptor"); - } - - @SuppressWarnings( - "unchecked") List<AttachedObjectTarget> targetList = - (List<AttachedObjectTarget>) componentDescriptor.getValue( - AttachedObjectTarget.ATTACHED_OBJECT_TARGETS_KEY); - - if (null == targetList) { - throw new TagException(tag, "Error: enclosing composite component does not support behavior events"); - } - - boolean supportedEvent = false; - - for (AttachedObjectTarget target : targetList) { - if (target instanceof BehaviorHolderAttachedObjectTarget) { - BehaviorHolderAttachedObjectTarget behaviorTarget = (BehaviorHolderAttachedObjectTarget) target; - - if ((null != eventName && eventName.equals(behaviorTarget.getName())) - || (null == eventName && behaviorTarget.isDefaultEvent())) { - supportedEvent = true; - - break; - } - } - } - - if (supportedEvent) { - getOrCreateRetargetableHandlersList(parent).add(this); - } else { - throw new TagException(tag, "Error: enclosing composite component does not support event " + eventName); - } - } else if (parent instanceof ClientBehaviorHolder) { - applyAttachedObject(ctx, parent, eventName); - } else { - throw new TagException(this.tag, "Unable to attach <a4j:ajax> to non-ClientBehaviorHolder parent"); - } - } - - private void applyWrapping(FaceletContext ctx, UIComponent parent, String eventName) throws IOException { - AjaxBehavior ajaxBehavior = createAjaxBehavior(ctx, eventName); - FacesContext context = ctx.getFacesContext(); - BehaviorStack ajaxBehaviors = BehaviorStack.getBehaviorStack(context, true); - - ajaxBehaviors.pushBehavior(context, ajaxBehavior, AjaxBehavior.BEHAVIOR_ID, eventName); - nextHandler.apply(ctx, parent); - ajaxBehaviors.popBehavior(); - } - - public void applyAttachedObject(FaceletContext fContext, UIComponent parent, String eventName) { - ClientBehaviorHolder bHolder = (ClientBehaviorHolder) parent; - - if (null == eventName) { - eventName = bHolder.getDefaultEventName(); - - if (null == eventName) { - throw new TagException(this.tag, "Event attribute could not be determined: " + eventName); - } - } else { - Collection<String> eventNames = bHolder.getEventNames(); - - if (!eventNames.contains(eventName)) { - throw new TagException(this.tag, - eventName + "event is not supported for the " - + parent.getClass().getSimpleName()); - } - } - - AjaxBehavior ajaxBehavior = createAjaxBehavior(fContext, eventName); - - bHolder.addClientBehavior(eventName, ajaxBehavior); - } - - public AjaxBehavior createAjaxBehavior(FaceletContext fContext, String eventName) { - Application application = fContext.getFacesContext().getApplication(); - AjaxBehavior ajaxBehavior = (AjaxBehavior) application.createBehavior(AjaxBehavior.BEHAVIOR_ID); - - setBehaviorAttribute(fContext, ajaxBehavior, this.disabled, Boolean.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.immediate, Boolean.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.execute, Object.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.render, Object.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.limitRender, Boolean.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.queueId, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.statusId, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.similarityGroupingId, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.onevent, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.onerror, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.onbegin, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.oncomplete, String.class); - setBehaviorAttribute(fContext, ajaxBehavior, this.onbeforedomupdate, String.class); - registerBehaviorListener(fContext, ajaxBehavior, listener); - - return ajaxBehavior; - } - - public void applyAttachedObject(FacesContext context, UIComponent parent) { - FaceletContext ctx = (FaceletContext) context.getAttributes().get(FaceletContext.FACELET_CONTEXT_KEY); - - applyAttachedObject(ctx, parent, getEventName()); - } - - private void setBehaviorAttribute(FaceletContext ctx, AjaxBehavior behavior, TagAttribute attr, Class<?> type) { - if (attr != null) { - behavior.setValueExpression(attr.getLocalName(), attr.getValueExpression(ctx, type)); - } - } - - public String getEventName() { - return (this.event != null) ? this.event.getValue() : null; - } - - public String getFor() { - return null; - } - - private boolean isWrapping() { - return (this.nextHandler instanceof TagHandler) || (this.nextHandler instanceof CompositeFaceletHandler); - } - - public void registerBehaviorListener(FaceletContext fContext, AjaxBehavior behavior, TagAttribute listenerAttr) { - if (listenerAttr != null) { - MethodExpression mExpression = listenerAttr.getMethodExpression(fContext, Object.class, - new Class[] {AjaxBehaviorEvent.class}); - - behavior.addAjaxBehaviorListener(new AjaxBehaviorListenerImpl(mExpression)); - } - } - - static class AjaxBehaviorListenerImpl implements AjaxBehaviorListener, Serializable { - /** - * - */ - private static final long serialVersionUID = 1812543470662919310L; - - private MethodExpression methodExpression; - - public AjaxBehaviorListenerImpl() {} - - public AjaxBehaviorListenerImpl(MethodExpression expression) { - this.methodExpression = expression; - } - - public void processAjaxBehavior(AjaxBehaviorEvent event) throws AbortProcessingException { - if (methodExpression != null) { - ELContext elContext = FacesContext.getCurrentInstance().getELContext(); - - try { - methodExpression.invoke(elContext, new Object[] {event}); - } catch (Exception e) { - - // TODO: log or message ?? - throw new AbortProcessingException(e); - } - } - } - } -} Deleted: root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxPushHandler.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxPushHandler.java 2010-04-20 15:42:52 UTC (rev 16776) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxPushHandler.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -1,84 +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.richfaces.taglib.html.facelets; - -import java.util.EventListener; - -import javax.faces.view.facelets.ComponentConfig; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.FaceletContext; -import javax.faces.view.facelets.MetaRule; -import javax.faces.view.facelets.MetaRuleset; -import javax.faces.view.facelets.Metadata; -import javax.faces.view.facelets.MetadataTarget; -import javax.faces.view.facelets.TagAttribute; - -import org.richfaces.component.AbstractPush; - -public class AjaxPushHandler extends ComponentHandler { - private static final MetaRule AJAX_PUSH_META_RULE = new AjaxPushMetaRule(); - - public AjaxPushHandler(ComponentConfig config) { - super(config); - } - - @Override - protected MetaRuleset createMetaRuleset(Class type) { - MetaRuleset metaRules = super.createMetaRuleset(type); - - metaRules.addRule(AJAX_PUSH_META_RULE); - - return metaRules; - } - - static class AjaxPushActionMapper extends Metadata { - private static final Class<?>[] AJAX_PUSH_ACTION_SIG = new Class[] {EventListener.class}; - private final TagAttribute send; - - public AjaxPushActionMapper(TagAttribute attribute) { - send = attribute; - } - - public void applyMetadata(FaceletContext ctx, Object instance) { - ((AbstractPush) instance).setEventProducer(this.send.getMethodExpression(ctx, null, AJAX_PUSH_ACTION_SIG)); - } - } - - static class AjaxPushMetaRule extends MetaRule { - - public AjaxPushMetaRule() { - super(); - } - - public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { - if (meta.isTargetInstanceOf(AbstractPush.class)) { - if ("eventProducer".equals(name)) { - return new AjaxPushActionMapper(attribute); - } - } - - return null; - } - } -} Deleted: root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorStack.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorStack.java 2010-04-20 15:42:52 UTC (rev 16776) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorStack.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -1,152 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2009, 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.taglib.html.facelets; - -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.faces.application.Application; -import javax.faces.component.StateHolder; -import javax.faces.component.behavior.ClientBehavior; -import javax.faces.component.behavior.ClientBehaviorHint; -import javax.faces.component.behavior.ClientBehaviorHolder; -import javax.faces.context.FacesContext; - -/** - * @author Nick Belaevski - * - * This class is necessary to handle nesting wrapping behaviors properly and is created - * to work around this issue: https://javaserverfaces-spec-public.dev.java.net/issues/show_bug.cgi?id=655 - * - */ - -//TODO - check for bug resolution -final class BehaviorStack { - private static final String BEHAVIOR_STACK = "org.richfaces.BehaviorStack"; - private LinkedList<BehaviorInfo> behaviorStack = null; - - public BehaviorStack() { - behaviorStack = new LinkedList<BehaviorInfo>(); - } - - public static BehaviorStack getBehaviorStack(FacesContext context, boolean createIfNull) { - Map<Object, Object> attributes = context.getAttributes(); - BehaviorStack behaviorStack = (BehaviorStack) attributes.get(BEHAVIOR_STACK); - - if (behaviorStack == null && createIfNull) { - behaviorStack = new BehaviorStack(); - attributes.put(BEHAVIOR_STACK, behaviorStack); - } - - return behaviorStack; - } - - public void addBehaviors(FacesContext context, ClientBehaviorHolder behaviorHolder) { - if (behaviorStack == null || behaviorStack.isEmpty()) { - return; - } - - for (BehaviorInfo behaviorInfo : behaviorStack) { - behaviorInfo.addBehavior(context, behaviorHolder); - } - } - - public void pushBehavior(FacesContext context, ClientBehavior clientBehavior, String behaviorId, String eventName) { - Object behaviorState = ((StateHolder) clientBehavior).saveState(context); - - // closer behaviors are processed earlier - behaviorStack.addFirst(new BehaviorInfo(behaviorId, eventName, behaviorState)); - } - - public void popBehavior() { - if (!behaviorStack.isEmpty()) { - behaviorStack.removeFirst(); - } - } - - private static class BehaviorInfo { - private String behaviorId; - private Object behaviorState; - private String eventName; - - public BehaviorInfo(String behaviorId, String eventName, Object behaviorState) { - this.behaviorId = behaviorId; - this.eventName = eventName; - this.behaviorState = behaviorState; - } - - public void addBehavior(FacesContext context, ClientBehaviorHolder behaviorHolder) { - String eventName = this.eventName; - - if (eventName == null) { - eventName = behaviorHolder.getDefaultEventName(); - - if (eventName == null) { - return; - } - } - - if (shouldAddBehavior(behaviorHolder, eventName)) { - ClientBehavior behavior = createBehavior(context); - - behaviorHolder.addClientBehavior(eventName, behavior); - } - } - - private boolean shouldAddBehavior(ClientBehaviorHolder behaviorHolder, String eventName) { - if (!behaviorHolder.getEventNames().contains(eventName)) { - return false; - } - - Map<String, List<ClientBehavior>> clientBehaviorsMap = behaviorHolder.getClientBehaviors(); - List<ClientBehavior> clientBehaviors = clientBehaviorsMap.get(eventName); - - if (clientBehaviors == null || clientBehaviors.isEmpty()) { - return true; - } - - for (ClientBehavior behavior : clientBehaviors) { - Set<ClientBehaviorHint> hints = behavior.getHints(); - - if (hints.contains(ClientBehaviorHint.SUBMITTING)) { - return false; - } - } - - return true; - } - - private ClientBehavior createBehavior(FacesContext context) { - Application application = context.getApplication(); - ClientBehavior behavior = (ClientBehavior) application.createBehavior(this.behaviorId); - - ((StateHolder) behavior).restoreState(context, behaviorState); - - return behavior; - } - } -} Deleted: root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsAddingComponentHandlerWrapper.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsAddingComponentHandlerWrapper.java 2010-04-20 15:42:52 UTC (rev 16776) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsAddingComponentHandlerWrapper.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -1,118 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2009, 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.taglib.html.facelets; - -import java.io.IOException; - -import javax.el.ELException; - -import javax.faces.FacesException; -import javax.faces.component.UIComponent; -import javax.faces.component.behavior.ClientBehaviorHolder; -import javax.faces.context.FacesContext; -import javax.faces.view.facelets.ComponentConfig; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.FaceletContext; -import javax.faces.view.facelets.Tag; -import javax.faces.view.facelets.TagAttribute; - -/** - * @author Nick Belaevski - */ -public class BehaviorsAddingComponentHandlerWrapper extends ComponentHandler { - private ComponentHandler componentHandler; - - public BehaviorsAddingComponentHandlerWrapper(ComponentHandler componentHandler) { - super(componentHandler.getComponentConfig()); - this.componentHandler = componentHandler; - } - - public void apply(FaceletContext ctx, UIComponent parent) throws IOException { - componentHandler.apply(ctx, parent); - } - - public void applyNextHandler(FaceletContext ctx, UIComponent c) throws IOException, FacesException, ELException { - componentHandler.applyNextHandler(ctx, c); - } - - public TagAttribute getBinding() { - return componentHandler.getBinding(); - } - - public ComponentConfig getComponentConfig() { - return componentHandler.getComponentConfig(); - } - - public Tag getTag() { - return componentHandler.getTag(); - } - - public TagAttribute getTagAttribute(String localName) { - return componentHandler.getTagAttribute(localName); - } - - public String getTagId() { - return componentHandler.getTagId(); - } - - public boolean equals(Object obj) { - return componentHandler.equals(obj); - } - - public int hashCode() { - return componentHandler.hashCode(); - } - - public String toString() { - return componentHandler.toString(); - } - - public boolean isDisabled(FaceletContext ctx) { - return componentHandler.isDisabled(ctx); - } - - public void onComponentCreated(FaceletContext ctx, UIComponent c, UIComponent parent) { - componentHandler.onComponentCreated(ctx, c, parent); - } - - public void onComponentPopulated(FaceletContext ctx, UIComponent c, UIComponent parent) { - FacesContext facesContext = ctx.getFacesContext(); - BehaviorStack behaviorStack = BehaviorStack.getBehaviorStack(facesContext, false); - - if (behaviorStack != null) { - if (c instanceof ClientBehaviorHolder) { - ClientBehaviorHolder behaviorHolder = (ClientBehaviorHolder) c; - - behaviorStack.addBehaviors(facesContext, behaviorHolder); - } - } - - componentHandler.onComponentPopulated(ctx, c, parent); - } - - public void setAttributes(FaceletContext ctx, Object instance) { - componentHandler.setAttributes(ctx, instance); - } -} Deleted: root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsTagHandlerDelegateFactoryImpl.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-04-20 15:42:52 UTC (rev 16776) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -1,82 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2009, 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.taglib.html.facelets; - -import javax.faces.view.facelets.BehaviorHandler; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.ConverterHandler; -import javax.faces.view.facelets.TagHandlerDelegate; -import javax.faces.view.facelets.TagHandlerDelegateFactory; -import javax.faces.view.facelets.ValidatorHandler; - -/** - * @author Nick Belaevski - */ -public class BehaviorsTagHandlerDelegateFactoryImpl extends TagHandlerDelegateFactory { - private TagHandlerDelegateFactory factory; - - public BehaviorsTagHandlerDelegateFactoryImpl(TagHandlerDelegateFactory factory) { - this.factory = factory; - } - - /* - * (non-Javadoc) - * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createBehaviorHandlerDelegate(javax.faces.view.facelets.BehaviorHandler) - */ - @Override - public TagHandlerDelegate createBehaviorHandlerDelegate(BehaviorHandler owner) { - return factory.createBehaviorHandlerDelegate(owner); - } - - /* - * (non-Javadoc) - * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createComponentHandlerDelegate(javax.faces.view.facelets.ComponentHandler) - */ - @Override - public TagHandlerDelegate createComponentHandlerDelegate(ComponentHandler owner) { - - // TagHandlers structure is created when view is compiled - // so there's no need to check for BehaviorsStack - return factory.createComponentHandlerDelegate(new BehaviorsAddingComponentHandlerWrapper(owner)); - } - - /* - * (non-Javadoc) - * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createConverterHandlerDelegate(javax.faces.view.facelets.ConverterHandler) - */ - @Override - public TagHandlerDelegate createConverterHandlerDelegate(ConverterHandler owner) { - return factory.createConverterHandlerDelegate(owner); - } - - /* - * (non-Javadoc) - * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createValidatorHandlerDelegate(javax.faces.view.facelets.ValidatorHandler) - */ - @Override - public TagHandlerDelegate createValidatorHandlerDelegate(ValidatorHandler owner) { - return factory.createValidatorHandlerDelegate(owner); - } -} Deleted: root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/MediaOutputHandler.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/MediaOutputHandler.java 2010-04-20 15:42:52 UTC (rev 16776) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/MediaOutputHandler.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -1,123 +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.richfaces.taglib.html.facelets; - -import java.io.OutputStream; - -import javax.faces.view.facelets.ComponentConfig; -import javax.faces.view.facelets.ComponentHandler; -import javax.faces.view.facelets.FaceletContext; -import javax.faces.view.facelets.MetaRule; -import javax.faces.view.facelets.MetaRuleset; -import javax.faces.view.facelets.Metadata; -import javax.faces.view.facelets.MetadataTarget; -import javax.faces.view.facelets.TagAttribute; - -import org.richfaces.component.AbstractMediaOutput; - -/** - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:22 $ - * - */ -public class MediaOutputHandler extends ComponentHandler { - private static final MetaRule MMEDIA_META_RULE = new MMediaMetaRule(); - - /** - * @param config - */ - public MediaOutputHandler(ComponentConfig config) { - super(config); - } - - @Override - protected MetaRuleset createMetaRuleset(Class type) { - MetaRuleset metaRules = super.createMetaRuleset(type); - - metaRules.addRule(MMEDIA_META_RULE); - - return metaRules; - } - - /** - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:22 $ - * - */ - static class MMediaActionMapper extends Metadata { - private static final Class<?>[] MMEDIA_ACTION_SIG = new Class[] {OutputStream.class, Object.class}; - private final TagAttribute send; - - /** - * @param attribute - */ - public MMediaActionMapper(TagAttribute attribute) { - send = attribute; - } - - /* - * (non-Javadoc) - * - * @seecom.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets. - * FaceletContext, java.lang.Object) - */ - public void applyMetadata(FaceletContext ctx, Object instance) { - ((AbstractMediaOutput) instance).setCreateContentExpression(this.send.getMethodExpression(ctx, null, - MMEDIA_ACTION_SIG)); - } - } - - - /** - * @author shura (latest modification by $Author: alexsmirnov $) - * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:22 $ - * - */ - static class MMediaMetaRule extends MetaRule { - - /** - * - */ - public MMediaMetaRule() { - super(); - } - - /* - * (non-Javadoc) - * - * @see com.sun.facelets.tag.MetaRule#applyRule(java.lang.String, - * com.sun.facelets.tag.TagAttribute, - * com.sun.facelets.tag.MetadataTarget) - */ - public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { - if (meta.isTargetInstanceOf(AbstractMediaOutput.class)) { - if ("createContent".equals(name)) { - return new MMediaActionMapper(attribute); - } - } - - return null; - } - } -} Copied: root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java (from rev 16773, root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxHandler.java) =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java (rev 0) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxHandler.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -0,0 +1,272 @@ +package org.richfaces.view.facelets.html; + +import java.beans.BeanDescriptor; +import java.beans.BeanInfo; +import java.io.IOException; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import javax.el.ELContext; +import javax.el.MethodExpression; +import javax.faces.application.Application; +import javax.faces.component.UIComponent; +import javax.faces.component.behavior.ClientBehaviorHolder; +import javax.faces.context.FacesContext; +import javax.faces.event.AbortProcessingException; +import javax.faces.event.AjaxBehaviorEvent; +import javax.faces.event.AjaxBehaviorListener; +import javax.faces.view.AttachedObjectHandler; +import javax.faces.view.AttachedObjectTarget; +import javax.faces.view.BehaviorHolderAttachedObjectHandler; +import javax.faces.view.BehaviorHolderAttachedObjectTarget; +import javax.faces.view.facelets.BehaviorConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.CompositeFaceletHandler; +import javax.faces.view.facelets.FaceletContext; +import javax.faces.view.facelets.TagAttribute; +import javax.faces.view.facelets.TagException; +import javax.faces.view.facelets.TagHandler; + +import org.ajax4jsf.component.behavior.AjaxBehavior; + +public class AjaxHandler extends TagHandler implements BehaviorHolderAttachedObjectHandler { + + // TODO - is that implementation dependency? + private static final String JAVAX_FACES_RETARGETABLE_HANDLERS = "javax.faces.RetargetableHandlers"; + private final TagAttribute disabled; + private final TagAttribute event; + private final TagAttribute execute; + private final TagAttribute immediate; + private final TagAttribute limitRender; + private final TagAttribute listener; + private final TagAttribute onbeforedomupdate; + private final TagAttribute onbegin; + private final TagAttribute oncomplete; + private final TagAttribute onerror; + private final TagAttribute onevent; + private final TagAttribute queueId; + private final TagAttribute render; + private final TagAttribute similarityGroupingId; + private final TagAttribute statusId; + private final boolean wrapping; + + public AjaxHandler(BehaviorConfig config) { + super(config); + this.event = this.getAttribute("event"); + this.execute = this.getAttribute("execute"); + this.render = this.getAttribute("render"); + this.disabled = this.getAttribute("disabled"); + this.immediate = this.getAttribute("immediate"); + this.listener = this.getAttribute("listener"); + this.limitRender = this.getAttribute("limitRender"); + this.queueId = this.getAttribute("queueId"); + this.statusId = this.getAttribute("status"); + this.similarityGroupingId = this.getAttribute("similarityGroupingId"); + this.onevent = this.getAttribute("onevent"); + this.onerror = this.getAttribute("onerror"); + this.onbegin = this.getAttribute("onbegin"); + this.oncomplete = this.getAttribute("oncomplete"); + this.onbeforedomupdate = this.getAttribute("onbeforedomupdate"); + this.wrapping = isWrapping(); + } + + public void apply(FaceletContext fContext, UIComponent parent) throws IOException { + String eventName = getEventName(); + + if (this.wrapping) { + applyWrapping(fContext, parent, eventName); + } else { + applyNested(fContext, parent, eventName); + } + } + + private static List<AttachedObjectHandler> getOrCreateRetargetableHandlersList(UIComponent component) { + Map<String, Object> attrs = component.getAttributes(); + @SuppressWarnings({ + "unchecked"}) List<AttachedObjectHandler> list = + (List<AttachedObjectHandler>) attrs.get(JAVAX_FACES_RETARGETABLE_HANDLERS); + + if (list == null) { + list = new ArrayList<AttachedObjectHandler>(); + attrs.put(JAVAX_FACES_RETARGETABLE_HANDLERS, list); + } + + return list; + } + + private void applyNested(FaceletContext ctx, UIComponent parent, String eventName) { + if (!ComponentHandler.isNew(parent)) { + return; + } + + if (UIComponent.isCompositeComponent(parent)) { + BeanInfo componentBeanInfo = (BeanInfo) parent.getAttributes().get(UIComponent.BEANINFO_KEY); + + if (null == componentBeanInfo) { + throw new TagException(tag, "Error: enclosing composite component does not have BeanInfo attribute"); + } + + BeanDescriptor componentDescriptor = componentBeanInfo.getBeanDescriptor(); + + if (null == componentDescriptor) { + throw new TagException(tag, + "Error: enclosing composite component BeanInfo does not have BeanDescriptor"); + } + + @SuppressWarnings( + "unchecked") List<AttachedObjectTarget> targetList = + (List<AttachedObjectTarget>) componentDescriptor.getValue( + AttachedObjectTarget.ATTACHED_OBJECT_TARGETS_KEY); + + if (null == targetList) { + throw new TagException(tag, "Error: enclosing composite component does not support behavior events"); + } + + boolean supportedEvent = false; + + for (AttachedObjectTarget target : targetList) { + if (target instanceof BehaviorHolderAttachedObjectTarget) { + BehaviorHolderAttachedObjectTarget behaviorTarget = (BehaviorHolderAttachedObjectTarget) target; + + if ((null != eventName && eventName.equals(behaviorTarget.getName())) + || (null == eventName && behaviorTarget.isDefaultEvent())) { + supportedEvent = true; + + break; + } + } + } + + if (supportedEvent) { + getOrCreateRetargetableHandlersList(parent).add(this); + } else { + throw new TagException(tag, "Error: enclosing composite component does not support event " + eventName); + } + } else if (parent instanceof ClientBehaviorHolder) { + applyAttachedObject(ctx, parent, eventName); + } else { + throw new TagException(this.tag, "Unable to attach <a4j:ajax> to non-ClientBehaviorHolder parent"); + } + } + + private void applyWrapping(FaceletContext ctx, UIComponent parent, String eventName) throws IOException { + AjaxBehavior ajaxBehavior = createAjaxBehavior(ctx, eventName); + FacesContext context = ctx.getFacesContext(); + BehaviorStack ajaxBehaviors = BehaviorStack.getBehaviorStack(context, true); + + ajaxBehaviors.pushBehavior(context, ajaxBehavior, AjaxBehavior.BEHAVIOR_ID, eventName); + nextHandler.apply(ctx, parent); + ajaxBehaviors.popBehavior(); + } + + public void applyAttachedObject(FaceletContext fContext, UIComponent parent, String eventName) { + ClientBehaviorHolder bHolder = (ClientBehaviorHolder) parent; + + if (null == eventName) { + eventName = bHolder.getDefaultEventName(); + + if (null == eventName) { + throw new TagException(this.tag, "Event attribute could not be determined: " + eventName); + } + } else { + Collection<String> eventNames = bHolder.getEventNames(); + + if (!eventNames.contains(eventName)) { + throw new TagException(this.tag, + eventName + "event is not supported for the " + + parent.getClass().getSimpleName()); + } + } + + AjaxBehavior ajaxBehavior = createAjaxBehavior(fContext, eventName); + + bHolder.addClientBehavior(eventName, ajaxBehavior); + } + + public AjaxBehavior createAjaxBehavior(FaceletContext fContext, String eventName) { + Application application = fContext.getFacesContext().getApplication(); + AjaxBehavior ajaxBehavior = (AjaxBehavior) application.createBehavior(AjaxBehavior.BEHAVIOR_ID); + + setBehaviorAttribute(fContext, ajaxBehavior, this.disabled, Boolean.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.immediate, Boolean.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.execute, Object.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.render, Object.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.limitRender, Boolean.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.queueId, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.statusId, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.similarityGroupingId, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.onevent, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.onerror, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.onbegin, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.oncomplete, String.class); + setBehaviorAttribute(fContext, ajaxBehavior, this.onbeforedomupdate, String.class); + registerBehaviorListener(fContext, ajaxBehavior, listener); + + return ajaxBehavior; + } + + public void applyAttachedObject(FacesContext context, UIComponent parent) { + FaceletContext ctx = (FaceletContext) context.getAttributes().get(FaceletContext.FACELET_CONTEXT_KEY); + + applyAttachedObject(ctx, parent, getEventName()); + } + + private void setBehaviorAttribute(FaceletContext ctx, AjaxBehavior behavior, TagAttribute attr, Class<?> type) { + if (attr != null) { + behavior.setValueExpression(attr.getLocalName(), attr.getValueExpression(ctx, type)); + } + } + + public String getEventName() { + return (this.event != null) ? this.event.getValue() : null; + } + + public String getFor() { + return null; + } + + private boolean isWrapping() { + return (this.nextHandler instanceof TagHandler) || (this.nextHandler instanceof CompositeFaceletHandler); + } + + public void registerBehaviorListener(FaceletContext fContext, AjaxBehavior behavior, TagAttribute listenerAttr) { + if (listenerAttr != null) { + MethodExpression mExpression = listenerAttr.getMethodExpression(fContext, Object.class, + new Class[] {AjaxBehaviorEvent.class}); + + behavior.addAjaxBehaviorListener(new AjaxBehaviorListenerImpl(mExpression)); + } + } + + static class AjaxBehaviorListenerImpl implements AjaxBehaviorListener, Serializable { + /** + * + */ + private static final long serialVersionUID = 1812543470662919310L; + + private MethodExpression methodExpression; + + public AjaxBehaviorListenerImpl() {} + + public AjaxBehaviorListenerImpl(MethodExpression expression) { + this.methodExpression = expression; + } + + public void processAjaxBehavior(AjaxBehaviorEvent event) throws AbortProcessingException { + if (methodExpression != null) { + ELContext elContext = FacesContext.getCurrentInstance().getELContext(); + + try { + methodExpression.invoke(elContext, new Object[] {event}); + } catch (Exception e) { + + // TODO: log or message ?? + throw new AbortProcessingException(e); + } + } + } + } +} Copied: root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxPushHandler_.java (from rev 16773, root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/AjaxPushHandler.java) =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxPushHandler_.java (rev 0) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxPushHandler_.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -0,0 +1,83 @@ +/** + * 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.richfaces.view.facelets.html; + +import java.util.EventListener; + +import javax.faces.view.facelets.ComponentConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.FaceletContext; +import javax.faces.view.facelets.MetaRule; +import javax.faces.view.facelets.MetaRuleset; +import javax.faces.view.facelets.Metadata; +import javax.faces.view.facelets.MetadataTarget; +import javax.faces.view.facelets.TagAttribute; + +import org.richfaces.component.AbstractPush; + +public class AjaxPushHandler_ extends ComponentHandler { + private static final MetaRule AJAX_PUSH_META_RULE = new AjaxPushMetaRule(); + + public AjaxPushHandler_(ComponentConfig config) { + super(config); + } + + @Override + protected MetaRuleset createMetaRuleset(Class type) { + MetaRuleset metaRules = super.createMetaRuleset(type); + + metaRules.addRule(AJAX_PUSH_META_RULE); + + return metaRules; + } + + static class AjaxPushActionMapper extends Metadata { + private static final Class<?>[] AJAX_PUSH_ACTION_SIG = new Class[] {EventListener.class}; + private final TagAttribute send; + + public AjaxPushActionMapper(TagAttribute attribute) { + send = attribute; + } + + public void applyMetadata(FaceletContext ctx, Object instance) { + ((AbstractPush) instance).setEventProducer(this.send.getMethodExpression(ctx, null, AJAX_PUSH_ACTION_SIG)); + } + } + + static class AjaxPushMetaRule extends MetaRule { + + public AjaxPushMetaRule() { + super(); + } + + public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { + if (meta.isTargetInstanceOf(AbstractPush.class)) { + if ("eventProducer".equals(name)) { + return new AjaxPushActionMapper(attribute); + } + } + + return null; + } + } +} Property changes on: root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxPushHandler_.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Date Revision Author Copied: root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/BehaviorStack.java (from rev 16773, root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorStack.java) =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/BehaviorStack.java (rev 0) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/BehaviorStack.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -0,0 +1,151 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, 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.view.facelets.html; + +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.faces.application.Application; +import javax.faces.component.StateHolder; +import javax.faces.component.behavior.ClientBehavior; +import javax.faces.component.behavior.ClientBehaviorHint; +import javax.faces.component.behavior.ClientBehaviorHolder; +import javax.faces.context.FacesContext; + +/** + * @author Nick Belaevski + * + * This class is necessary to handle nesting wrapping behaviors properly and is created + * to work around this issue: https://javaserverfaces-spec-public.dev.java.net/issues/show_bug.cgi?id=655 + * + */ + +//TODO - check for bug resolution +final class BehaviorStack { + private static final String BEHAVIOR_STACK = "org.richfaces.BehaviorStack"; + private LinkedList<BehaviorInfo> behaviorStack = null; + + public BehaviorStack() { + behaviorStack = new LinkedList<BehaviorInfo>(); + } + + public static BehaviorStack getBehaviorStack(FacesContext context, boolean createIfNull) { + Map<Object, Object> attributes = context.getAttributes(); + BehaviorStack behaviorStack = (BehaviorStack) attributes.get(BEHAVIOR_STACK); + + if (behaviorStack == null && createIfNull) { + behaviorStack = new BehaviorStack(); + attributes.put(BEHAVIOR_STACK, behaviorStack); + } + + return behaviorStack; + } + + public void addBehaviors(FacesContext context, ClientBehaviorHolder behaviorHolder) { + if (behaviorStack == null || behaviorStack.isEmpty()) { + return; + } + + for (BehaviorInfo behaviorInfo : behaviorStack) { + behaviorInfo.addBehavior(context, behaviorHolder); + } + } + + public void pushBehavior(FacesContext context, ClientBehavior clientBehavior, String behaviorId, String eventName) { + Object behaviorState = ((StateHolder) clientBehavior).saveState(context); + + // closer behaviors are processed earlier + behaviorStack.addFirst(new BehaviorInfo(behaviorId, eventName, behaviorState)); + } + + public void popBehavior() { + if (!behaviorStack.isEmpty()) { + behaviorStack.removeFirst(); + } + } + + private static class BehaviorInfo { + private String behaviorId; + private Object behaviorState; + private String eventName; + + public BehaviorInfo(String behaviorId, String eventName, Object behaviorState) { + this.behaviorId = behaviorId; + this.eventName = eventName; + this.behaviorState = behaviorState; + } + + public void addBehavior(FacesContext context, ClientBehaviorHolder behaviorHolder) { + String eventName = this.eventName; + + if (eventName == null) { + eventName = behaviorHolder.getDefaultEventName(); + + if (eventName == null) { + return; + } + } + + if (shouldAddBehavior(behaviorHolder, eventName)) { + ClientBehavior behavior = createBehavior(context); + + behaviorHolder.addClientBehavior(eventName, behavior); + } + } + + private boolean shouldAddBehavior(ClientBehaviorHolder behaviorHolder, String eventName) { + if (!behaviorHolder.getEventNames().contains(eventName)) { + return false; + } + + Map<String, List<ClientBehavior>> clientBehaviorsMap = behaviorHolder.getClientBehaviors(); + List<ClientBehavior> clientBehaviors = clientBehaviorsMap.get(eventName); + + if (clientBehaviors == null || clientBehaviors.isEmpty()) { + return true; + } + + for (ClientBehavior behavior : clientBehaviors) { + Set<ClientBehaviorHint> hints = behavior.getHints(); + + if (hints.contains(ClientBehaviorHint.SUBMITTING)) { + return false; + } + } + + return true; + } + + private ClientBehavior createBehavior(FacesContext context) { + Application application = context.getApplication(); + ClientBehavior behavior = (ClientBehavior) application.createBehavior(this.behaviorId); + + ((StateHolder) behavior).restoreState(context, behaviorState); + + return behavior; + } + } +} Copied: root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/BehaviorsAddingComponentHandlerWrapper.java (from rev 16773, root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsAddingComponentHandlerWrapper.java) =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/BehaviorsAddingComponentHandlerWrapper.java (rev 0) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/BehaviorsAddingComponentHandlerWrapper.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -0,0 +1,117 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, 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.view.facelets.html; + +import java.io.IOException; + +import javax.el.ELException; + +import javax.faces.FacesException; +import javax.faces.component.UIComponent; +import javax.faces.component.behavior.ClientBehaviorHolder; +import javax.faces.context.FacesContext; +import javax.faces.view.facelets.ComponentConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.FaceletContext; +import javax.faces.view.facelets.Tag; +import javax.faces.view.facelets.TagAttribute; + +/** + * @author Nick Belaevski + */ +public class BehaviorsAddingComponentHandlerWrapper extends ComponentHandler { + private ComponentHandler componentHandler; + + public BehaviorsAddingComponentHandlerWrapper(ComponentHandler componentHandler) { + super(componentHandler.getComponentConfig()); + this.componentHandler = componentHandler; + } + + public void apply(FaceletContext ctx, UIComponent parent) throws IOException { + componentHandler.apply(ctx, parent); + } + + public void applyNextHandler(FaceletContext ctx, UIComponent c) throws IOException, FacesException, ELException { + componentHandler.applyNextHandler(ctx, c); + } + + public TagAttribute getBinding() { + return componentHandler.getBinding(); + } + + public ComponentConfig getComponentConfig() { + return componentHandler.getComponentConfig(); + } + + public Tag getTag() { + return componentHandler.getTag(); + } + + public TagAttribute getTagAttribute(String localName) { + return componentHandler.getTagAttribute(localName); + } + + public String getTagId() { + return componentHandler.getTagId(); + } + + public boolean equals(Object obj) { + return componentHandler.equals(obj); + } + + public int hashCode() { + return componentHandler.hashCode(); + } + + public String toString() { + return componentHandler.toString(); + } + + public boolean isDisabled(FaceletContext ctx) { + return componentHandler.isDisabled(ctx); + } + + public void onComponentCreated(FaceletContext ctx, UIComponent c, UIComponent parent) { + componentHandler.onComponentCreated(ctx, c, parent); + } + + public void onComponentPopulated(FaceletContext ctx, UIComponent c, UIComponent parent) { + FacesContext facesContext = ctx.getFacesContext(); + BehaviorStack behaviorStack = BehaviorStack.getBehaviorStack(facesContext, false); + + if (behaviorStack != null) { + if (c instanceof ClientBehaviorHolder) { + ClientBehaviorHolder behaviorHolder = (ClientBehaviorHolder) c; + + behaviorStack.addBehaviors(facesContext, behaviorHolder); + } + } + + componentHandler.onComponentPopulated(ctx, c, parent); + } + + public void setAttributes(FaceletContext ctx, Object instance) { + componentHandler.setAttributes(ctx, instance); + } +} Copied: root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java (from rev 16773, root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/BehaviorsTagHandlerDelegateFactoryImpl.java) =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java (rev 0) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/BehaviorsTagHandlerDelegateFactoryImpl.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2009, 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.view.facelets.html; + +import javax.faces.view.facelets.BehaviorHandler; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.ConverterHandler; +import javax.faces.view.facelets.TagHandlerDelegate; +import javax.faces.view.facelets.TagHandlerDelegateFactory; +import javax.faces.view.facelets.ValidatorHandler; + +/** + * @author Nick Belaevski + */ +public class BehaviorsTagHandlerDelegateFactoryImpl extends TagHandlerDelegateFactory { + private TagHandlerDelegateFactory factory; + + public BehaviorsTagHandlerDelegateFactoryImpl(TagHandlerDelegateFactory factory) { + this.factory = factory; + } + + /* + * (non-Javadoc) + * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createBehaviorHandlerDelegate(javax.faces.view.facelets.BehaviorHandler) + */ + @Override + public TagHandlerDelegate createBehaviorHandlerDelegate(BehaviorHandler owner) { + return factory.createBehaviorHandlerDelegate(owner); + } + + /* + * (non-Javadoc) + * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createComponentHandlerDelegate(javax.faces.view.facelets.ComponentHandler) + */ + @Override + public TagHandlerDelegate createComponentHandlerDelegate(ComponentHandler owner) { + + // TagHandlers structure is created when view is compiled + // so there's no need to check for BehaviorsStack + return factory.createComponentHandlerDelegate(new BehaviorsAddingComponentHandlerWrapper(owner)); + } + + /* + * (non-Javadoc) + * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createConverterHandlerDelegate(javax.faces.view.facelets.ConverterHandler) + */ + @Override + public TagHandlerDelegate createConverterHandlerDelegate(ConverterHandler owner) { + return factory.createConverterHandlerDelegate(owner); + } + + /* + * (non-Javadoc) + * @see javax.faces.view.facelets.TagHandlerDelegateFactory#createValidatorHandlerDelegate(javax.faces.view.facelets.ValidatorHandler) + */ + @Override + public TagHandlerDelegate createValidatorHandlerDelegate(ValidatorHandler owner) { + return factory.createValidatorHandlerDelegate(owner); + } +} Copied: root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/MediaOutputHandler.java (from rev 16764, root/ui/trunk/components/core/src/main/java/org/richfaces/taglib/html/facelets/MediaOutputHandler.java) =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/MediaOutputHandler.java (rev 0) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/MediaOutputHandler.java 2010-04-20 15:48:45 UTC (rev 16777) @@ -0,0 +1,73 @@ +/** + * 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.richfaces.view.facelets.html; + +import org.richfaces.MethodMetadata; +import org.richfaces.component.AbstractMediaOutput; + +import javax.faces.view.facelets.ComponentConfig; +import javax.faces.view.facelets.ComponentHandler; +import javax.faces.view.facelets.FaceletContext; +import javax.faces.view.facelets.MetaRule; +import javax.faces.view.facelets.MetaRuleset; +import javax.faces.view.facelets.Metadata; +import javax.faces.view.facelets.MetadataTarget; +import javax.faces.view.facelets.TagAttribute; +import java.io.OutputStream; + +/** + * @author shura (latest modification by $Author: alexsmirnov $) + * @version $Revision: 1.1.2.1 $ $Date: 2007/02/01 15:31:22 $ + * + */ +public class MediaOutputHandler extends ComponentHandler { + + private static final MediaOutputHandlerMetaRule META_RULE = new MediaOutputHandlerMetaRule(); + + + public MediaOutputHandler(ComponentConfig config) { + super(config); + } + + protected MetaRuleset createMetaRuleset(Class type) { + MetaRuleset m = super.createMetaRuleset(type); + m.addRule(META_RULE); + return m; + } + + static class MediaOutputHandlerMetaRule extends MetaRule{ + + public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) { + if (meta.isTargetInstanceOf(AbstractMediaOutput.class)) { + if ("createContent".equals(name)) { + return new MethodMetadata(attribute, OutputStream.class, Object.class) { + public void applyMetadata(FaceletContext ctx, Object instance) { + ((AbstractMediaOutput) instance).setCreateContentExpression(getMethodExpression(ctx)); + } + }; + } + } + return null; + } + } +}