Author: nbelaevski Date: 2007-03-16 09:38:37 -0400 (Fri, 16 Mar 2007) New Revision: 83 Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java Log: Bindings for Drag/Drop listeners not created in facelets - fixed Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java =================================================================== --- trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java 2007-03-16 10:26:01 UTC (rev 82) +++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java 2007-03-16 13:38:37 UTC (rev 83) @@ -44,73 +44,65 @@ super(config); } - public static class DragHandler extends AjaxComponentHandler { + private static final DragSupportHandlerMetaRule metaRule = new DragSupportHandlerMetaRule(); - private static final DragSupportHandlerMetaRule metaRule = new DragSupportHandlerMetaRule(); + // Metarule + protected MetaRuleset createMetaRuleset(Class type) { + MetaRuleset m = super.createMetaRuleset(type); + m.addRule(metaRule); + return m; + } - public DragHandler(ComponentConfig config) { - super(config); - } + /** + * @author shura (latest modification by $Author$) + * @version $Revision$ $Date$ + * + */ + static class DragSupportHandlerMetaRule extends MetaRule { - // Metarule - protected MetaRuleset createMetaRuleset(Class type) { - MetaRuleset m = super.createMetaRuleset(type); - m.addRule(metaRule); - return m; - } - - /** - * @author shura (latest modification by $Author$) - * @version $Revision$ $Date$ + /* + * (non-Javadoc) * + * @see com.sun.facelets.tag.MetaRule#applyRule(java.lang.String, + * com.sun.facelets.tag.TagAttribute, + * com.sun.facelets.tag.MetadataTarget) */ - static class DragSupportHandlerMetaRule extends MetaRule { - - /* - * (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(UIDragSupport.class)) { - if ("dragListener".equals(name)) { - return new dragListenerMapper(attribute); - } - + public Metadata applyRule(String name, TagAttribute attribute, + MetadataTarget meta) { + if (meta.isTargetInstanceOf(UIDragSupport.class)) { + if ("dragListener".equals(name)) { + return new dragListenerMapper(attribute); } - return null; - } + } + return null; } - static class dragListenerMapper extends Metadata { + } - private static final Class[] SIGNATURE = new Class[] { org.ajax4jsf.dnd.event.DragEvent.class }; + static class dragListenerMapper extends Metadata { - private final TagAttribute _action; + private static final Class[] SIGNATURE = new Class[] { org.ajax4jsf.dnd.event.DragEvent.class }; - /** - * @param attribute - */ - public dragListenerMapper(TagAttribute attribute) { - _action = attribute; - } + private final TagAttribute _action; - /* - * (non-Javadoc) - * - * @see com.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets.FaceletContext, - * java.lang.Object) - */ - public void applyMetadata(FaceletContext ctx, Object instance) { - ((UIDragSupport) instance) - .setDragListener(new LegacyMethodBinding(this._action - .getMethodExpression(ctx, null, SIGNATURE))); - } + /** + * @param attribute + */ + public dragListenerMapper(TagAttribute attribute) { + _action = attribute; + } + /* + * (non-Javadoc) + * + * @see com.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets.FaceletContext, + * java.lang.Object) + */ + public void applyMetadata(FaceletContext ctx, Object instance) { + ((UIDragSupport) instance) + .setDragListener(new LegacyMethodBinding(this._action + .getMethodExpression(ctx, null, SIGNATURE))); } } Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java =================================================================== --- trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java 2007-03-16 10:26:01 UTC (rev 82) +++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java 2007-03-16 13:38:37 UTC (rev 83) @@ -43,73 +43,65 @@ super(config); } - public static class DropHandler extends AjaxComponentHandler { + private static final DropSupportHandlerMetaRule metaRule = new DropSupportHandlerMetaRule(); - private static final DropSupportHandlerMetaRule metaRule = new DropSupportHandlerMetaRule(); + // Metarule + protected MetaRuleset createMetaRuleset(Class type) { + MetaRuleset m = super.createMetaRuleset(type); + m.addRule(metaRule); + return m; + } - public DropHandler(ComponentConfig config) { - super(config); - } + /** + * @author shura (latest modification by $Author$) + * @version $Revision$ $Date$ + * + */ + static class DropSupportHandlerMetaRule extends MetaRule { - // Metarule - protected MetaRuleset createMetaRuleset(Class type) { - MetaRuleset m = super.createMetaRuleset(type); - m.addRule(metaRule); - return m; - } - - /** - * @author shura (latest modification by $Author$) - * @version $Revision$ $Date$ + /* + * (non-Javadoc) * + * @see com.sun.facelets.tag.MetaRule#applyRule(java.lang.String, + * com.sun.facelets.tag.TagAttribute, + * com.sun.facelets.tag.MetadataTarget) */ - static class DropSupportHandlerMetaRule extends MetaRule { - - /* - * (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(UIDropSupport.class)) { - if ("dropListener".equals(name)) { - return new dropListenerMapper(attribute); - } - + public Metadata applyRule(String name, TagAttribute attribute, + MetadataTarget meta) { + if (meta.isTargetInstanceOf(UIDropSupport.class)) { + if ("dropListener".equals(name)) { + return new dropListenerMapper(attribute); } - return null; - } + } + return null; } - static class dropListenerMapper extends Metadata { + } - private static final Class[] SIGNATURE = new Class[] { org.ajax4jsf.dnd.event.DropEvent.class }; + static class dropListenerMapper extends Metadata { - private final TagAttribute _action; + private static final Class[] SIGNATURE = new Class[] { org.ajax4jsf.dnd.event.DropEvent.class }; - /** - * @param attribute - */ - public dropListenerMapper(TagAttribute attribute) { - _action = attribute; - } + private final TagAttribute _action; - /* - * (non-Javadoc) - * - * @see com.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets.FaceletContext, - * java.lang.Object) - */ - public void applyMetadata(FaceletContext ctx, Object instance) { - ((UIDropSupport) instance) - .setDropListener(new LegacyMethodBinding(this._action - .getMethodExpression(ctx, null, SIGNATURE))); - } + /** + * @param attribute + */ + public dropListenerMapper(TagAttribute attribute) { + _action = attribute; + } + /* + * (non-Javadoc) + * + * @see com.sun.facelets.tag.Metadata#applyMetadata(com.sun.facelets.FaceletContext, + * java.lang.Object) + */ + public void applyMetadata(FaceletContext ctx, Object instance) { + ((UIDropSupport) instance) + .setDropListener(new LegacyMethodBinding(this._action + .getMethodExpression(ctx, null, SIGNATURE))); } }