Author: Alex.Kolonitsky Date: 2010-04-20 14:47:01 -0400 (Tue, 20 Apr 2010) New Revision: 16785 Removed: root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxPushHandler1.java Modified: root/ui/trunk/components/core/src/main/old_configs/component/mediaOutput.xml root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml Log: fix checkstyle Deleted: root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxPushHandler1.java =================================================================== --- root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxPushHandler1.java 2010-04-20 16:48:51 UTC (rev 16784) +++ root/ui/trunk/components/core/src/main/java/org/richfaces/view/facelets/html/AjaxPushHandler1.java 2010-04-20 18:47:01 UTC (rev 16785) @@ -1,83 +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.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 AjaxPushHandler1 extends ComponentHandler { - private static final MetaRule AJAX_PUSH_META_RULE = new AjaxPushMetaRule(); - - public AjaxPushHandler1(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; - } - } -} Modified: root/ui/trunk/components/core/src/main/old_configs/component/mediaOutput.xml =================================================================== --- root/ui/trunk/components/core/src/main/old_configs/component/mediaOutput.xml 2010-04-20 16:48:51 UTC (rev 16784) +++ root/ui/trunk/components/core/src/main/old_configs/component/mediaOutput.xml 2010-04-20 18:47:01 UTC (rev 16785) @@ -45,7 +45,7 @@ <icon>icon</icon> </tag> <taghandler generate="false"> - <classname>org.ajax4jsf.taglib.html.facelets.MediaOutputHandler</classname> + <classname>org.ajax4jsf.view.facelets.html.MediaOutputHandler</classname> </taghandler> &ui_component_attributes; &html_event_handler_attributes; Modified: root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml =================================================================== --- root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml 2010-04-20 16:48:51 UTC (rev 16784) +++ root/ui/trunk/components/core/src/main/resources/META-INF/a4j.taglib.xml 2010-04-20 18:47:01 UTC (rev 16785) @@ -50,7 +50,7 @@ <component> <component-type>org.richfaces.MediaOutput</component-type> <renderer-type>org.richfaces.MediaOutputRenderer</renderer-type> - <handler-class>org.richfaces.taglib.html.facelets.MediaOutputHandler</handler-class> + <handler-class>org.richfaces.view.facelets.html.MediaOutputHandler</handler-class> </component> </tag>