[richfaces-svn-commits] JBoss Rich Faces SVN: r62 - in trunk/richfaces/drag-drop/src/main: java/org/richfaces/component and 3 other directories.

Author: nbelaevski Date: 2007-03-13 16:58:09 -0400 (Tue, 13 Mar 2007) New Revision: 62 Removed: trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/EventInjectionSupportHandler.java Modified: trunk/richfaces/drag-drop/src/main/config/component/dragSupport.xml trunk/richfaces/drag-drop/src/main/config/component/dropSupport.xml trunk/richfaces/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java trunk/richfaces/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-draggable.js trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-dropzone.js Log: DnD supports switched from attributes a4j:support mechanism to rendering <script> elements registering evt. listeners Modified: trunk/richfaces/drag-drop/src/main/config/component/dragSupport.xml =================================================================== --- trunk/richfaces/drag-drop/src/main/config/component/dragSupport.xml 2007-03-13 20:56:05 UTC (rev 61) +++ trunk/richfaces/drag-drop/src/main/config/component/dragSupport.xml 2007-03-13 20:58:09 UTC (rev 62) @@ -17,11 +17,12 @@ <tag> <name>dragSupport</name> <classname>org.richfaces.taglib.DragSupportTag</classname> - <superclass>org.ajax4jsf.taglib.ajax.AjaxSupport</superclass> + <superclass>org.ajax4jsf.framework.taglib.HtmlComponentTagBase</superclass> </tag> <taghandler> <classname>org.richfaces.taglib.DragSupportHandler</classname> </taghandler> + &draggable_attributes; &ui_component_attributes; <!-- @@ -35,22 +36,22 @@ --> </component> - <listener> - <name>dragListener</name> - <listenerclass> - org.ajax4jsf.dnd.event.DragListener - </listenerclass> - <componentclass> - org.ajax4jsf.dnd.Draggable - </componentclass> - <eventclass> - org.ajax4jsf.dnd.event.DragEvent - </eventclass> - <methodname>addDropListener</methodname> - <taghandler generate="true"> - <classname> - org.richfaces.taglib.DragListenerHandler - </classname> - </taghandler> - </listener> + + <listener> + <name>dragListener</name> + <listenerclass> + org.ajax4jsf.dnd.event.DragListener + </listenerclass> + <componentclass> + org.ajax4jsf.dnd.Draggable + </componentclass> + <eventclass> + org.ajax4jsf.dnd.event.DragEvent + </eventclass> + <taghandler generate="true"> + <classname> + org.richfaces.taglib.DragListenerHandler + </classname> + </taghandler> + </listener> </components> Modified: trunk/richfaces/drag-drop/src/main/config/component/dropSupport.xml =================================================================== --- trunk/richfaces/drag-drop/src/main/config/component/dropSupport.xml 2007-03-13 20:56:05 UTC (rev 61) +++ trunk/richfaces/drag-drop/src/main/config/component/dropSupport.xml 2007-03-13 20:58:09 UTC (rev 62) @@ -18,7 +18,7 @@ <tag> <name>dropSupport</name> <classname>org.richfaces.taglib.DropSupportTag</classname> - <superclass>org.ajax4jsf.taglib.ajax.AjaxSupport</superclass> + <superclass>org.ajax4jsf.framework.taglib.HtmlComponentTagBase</superclass> </tag> <taghandler> <classname>org.richfaces.taglib.DropSupportHandler</classname> Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java =================================================================== --- trunk/richfaces/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2007-03-13 20:56:05 UTC (rev 61) +++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2007-03-13 20:58:09 UTC (rev 62) @@ -21,35 +21,23 @@ package org.richfaces.component; -import java.io.IOException; - -import javax.faces.FacesException; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; import javax.faces.el.MethodBinding; import javax.faces.event.AbortProcessingException; import javax.faces.event.ActionEvent; import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; -import org.ajax4jsf.ajax.UIAjaxSupport; import org.ajax4jsf.dnd.Draggable; import org.ajax4jsf.dnd.event.DragEvent; import org.ajax4jsf.dnd.event.DragListener; +import org.ajax4jsf.framework.ajax.AjaxActionComponent; import org.ajax4jsf.framework.ajax.AjaxEvent; -import org.ajax4jsf.framework.ajax.AjaxSupport; -import org.ajax4jsf.framework.ajax.EventValueBinding; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.richfaces.renderkit.DnDParametersEncoder; -import org.richfaces.renderkit.DraggableRendererContributor; -import org.richfaces.renderkit.RendererContributor; -import org.richfaces.renderkit.ScriptOptions; /** * JSF component class * */ -public abstract class UIDragSupport extends UIAjaxSupport implements AjaxSupport, Draggable { +public abstract class UIDragSupport extends AjaxActionComponent implements Draggable { private static final String COMPONENT_TYPE = "org.richfaces.DragSupport"; @@ -80,10 +68,6 @@ } } - public void setParentProperties(UIComponent component) { - component.setValueBinding(getEvent(), new EventValueBinding(this)); - } - public void queueEvent(FacesEvent event) { super.queueEvent(event); if (event instanceof DragEvent) { @@ -94,48 +78,4 @@ } } } - - public void setEvent(String event) { - //TODO nick - exception message - throw new UnsupportedOperationException(); - } - - public String getEventHandler(FacesContext context) { - // Due to JSF RI 1.1 bug, clear cached clientId - setId(getId()); - - try { - StringBuffer buffer = new StringBuffer("if (this.draggable) { this.draggable.eventMouseDown(event); return ;} this.draggable = "); - JSFunction function = new JSFunction("new DnD.SimpleDraggable"); - function.addParameter(this.getParent().getClientId(context)); - RendererContributor contributor = DraggableRendererContributor.getInstance(); - ScriptOptions dragOptions = contributor.buildOptions(context, this); - - DnDParametersEncoder parametersEncoder = DnDParametersEncoder.getInstance(); - dragOptions.addOption("dndParams", parametersEncoder.doEncodeAsString(context, this)); - - function.addParameter(dragOptions); - function.appendScript(buffer); - - String scriptContribution = contributor.getScriptContribution(context, this); - if (scriptContribution != null && scriptContribution.length() != 0) { - buffer.append("; this.draggable" + scriptContribution); - } - - buffer.append("; this.draggable.eventMouseDown(event);"); - - return buffer.toString(); - } catch (IOException e) { - throw new FacesException(e); - } - } - - public String getEventString() { - FacesContext context = FacesContext.getCurrentInstance(); - return getEventHandler(context); - } - - public String getEvent() { - return "onmousedown"; - } } Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java =================================================================== --- trunk/richfaces/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2007-03-13 20:56:05 UTC (rev 61) +++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2007-03-13 20:58:09 UTC (rev 62) @@ -21,35 +21,23 @@ package org.richfaces.component; -import java.io.IOException; - -import javax.faces.FacesException; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; import javax.faces.el.MethodBinding; import javax.faces.event.AbortProcessingException; import javax.faces.event.ActionEvent; import javax.faces.event.FacesEvent; import javax.faces.event.PhaseId; -import org.ajax4jsf.ajax.UIAjaxSupport; import org.ajax4jsf.dnd.Dropzone; import org.ajax4jsf.dnd.event.DropEvent; import org.ajax4jsf.dnd.event.DropListener; +import org.ajax4jsf.framework.ajax.AjaxActionComponent; import org.ajax4jsf.framework.ajax.AjaxEvent; -import org.ajax4jsf.framework.ajax.AjaxSupport; -import org.ajax4jsf.framework.ajax.EventValueBinding; -import org.ajax4jsf.framework.util.javascript.JSFunction; -import org.richfaces.renderkit.DnDParametersEncoder; -import org.richfaces.renderkit.DropzoneRendererContributor; -import org.richfaces.renderkit.RendererContributor; -import org.richfaces.renderkit.ScriptOptions; /** * JSF component class * */ -public abstract class UIDropSupport extends UIAjaxSupport implements AjaxSupport, Dropzone { +public abstract class UIDropSupport extends AjaxActionComponent implements Dropzone { private static final String COMPONENT_TYPE = "org.richfaces.DropSupport"; @@ -67,10 +55,6 @@ return (DropListener[]) getFacesListeners(DropListener.class); } - public void setParentProperties(UIComponent component) { - component.setValueBinding(getEvent(), new EventValueBinding(this)); - } - public void broadcast(FacesEvent event) throws AbortProcessingException { super.broadcast(event); if (event instanceof DropEvent) { @@ -95,44 +79,4 @@ } } } - - public String getEventString() { - // Due to JSF RI 1.1 bug, clear cached clientId - setId(getId()); - - try { - FacesContext context = FacesContext.getCurrentInstance(); - - RendererContributor contributor = DropzoneRendererContributor.getInstance(); - StringBuffer buffer = new StringBuffer("if (this.dropZone) { this.dropZone.mouseoverBound(event); return ;} this.dropZone = "); - JSFunction function = new JSFunction("new DnD.SimpleDropZone"); - function.addParameter(this.getParent().getClientId(context)); - ScriptOptions dropOptions = contributor.buildOptions(context, this); - - DnDParametersEncoder parametersEncoder = DnDParametersEncoder.getInstance(); - dropOptions.addOption("dndParams", parametersEncoder.doEncodeAsString(context, this)); - - function.addParameter(dropOptions); - function.appendScript(buffer); - - String scriptContribution = contributor.getScriptContribution(context, this); - if (scriptContribution != null && scriptContribution.length() != 0) { - buffer.append("; this.dropZone" + scriptContribution); - } - - return buffer.toString() + "; this.dropZone.mouseoverBound(event);"; - } catch (IOException e) { - throw new FacesException(e); - } - } - - public void setEvent(String event) { - //TODO nick - exception message - throw new UnsupportedOperationException(); - } - - public String getEvent() { - return "onmouseover"; - } - } Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java =================================================================== --- trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java 2007-03-13 20:56:05 UTC (rev 61) +++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java 2007-03-13 20:58:09 UTC (rev 62) @@ -21,10 +21,21 @@ package org.richfaces.renderkit.html; +import java.io.IOException; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.framework.util.javascript.JSFunction; import org.richfaces.component.UIDragSupport; import org.richfaces.renderkit.CompositeRenderer; +import org.richfaces.renderkit.DnDParametersEncoder; import org.richfaces.renderkit.DraggableRendererContributor; +import org.richfaces.renderkit.RendererContributor; +import org.richfaces.renderkit.ScriptOptions; /** * @author Nick Belaevski - nbelaevski(a)exadel.com @@ -45,7 +56,7 @@ protected Class getComponentClass() { return UIDragSupport.class; } - + protected InternetResource[] getScripts() { InternetResource[] resources = super.getScripts(); InternetResource[] result = new InternetResource[resources.length + 1]; @@ -53,4 +64,32 @@ result[result.length - 1] = getResource("/org/richfaces/renderkit/html/scripts/simple-draggable.js"); return result; } + + public void encodeEnd(FacesContext context, UIComponent component) + throws IOException { + super.encodeEnd(context, component); + StringBuffer buffer = new StringBuffer(); + JSFunction function = new JSFunction("new DnD.SimpleDraggable"); + function.addParameter(component.getParent().getClientId(context)); + RendererContributor contributor = DraggableRendererContributor.getInstance(); + ScriptOptions dragOptions = contributor.buildOptions(context, component); + + DnDParametersEncoder parametersEncoder = DnDParametersEncoder.getInstance(); + dragOptions.addOption("dndParams", parametersEncoder.doEncodeAsString(context, component)); + + function.addParameter(dragOptions); + function.appendScript(buffer); + + String scriptContribution = contributor.getScriptContribution(context, component); + if (scriptContribution != null && scriptContribution.length() != 0) { + buffer.append(scriptContribution); + } + + ResponseWriter writer = context.getResponseWriter(); + + writer.startElement(HTML.SCRIPT_ELEM, component); + writer.writeAttribute("id", component.getClientId(context), "id"); + writer.write(buffer.toString()); + writer.endElement(HTML.SCRIPT_ELEM); + } } Modified: trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java =================================================================== --- trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java 2007-03-13 20:56:05 UTC (rev 61) +++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java 2007-03-13 20:58:09 UTC (rev 62) @@ -21,10 +21,21 @@ package org.richfaces.renderkit.html; +import java.io.IOException; + +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; + +import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.resource.InternetResource; +import org.ajax4jsf.framework.util.javascript.JSFunction; import org.richfaces.component.UIDropSupport; import org.richfaces.renderkit.CompositeRenderer; +import org.richfaces.renderkit.DnDParametersEncoder; import org.richfaces.renderkit.DropzoneRendererContributor; +import org.richfaces.renderkit.RendererContributor; +import org.richfaces.renderkit.ScriptOptions; /** * @author Nick Belaevski - nbelaevski(a)exadel.com @@ -53,5 +64,33 @@ result[result.length - 1] = getResource("/org/richfaces/renderkit/html/scripts/simple-dropzone.js"); return result; } - + + public void encodeEnd(FacesContext context, UIComponent component) + throws IOException { + super.encodeEnd(context, component); + + RendererContributor contributor = DropzoneRendererContributor.getInstance(); + StringBuffer buffer = new StringBuffer(); + JSFunction function = new JSFunction("new DnD.SimpleDropZone"); + function.addParameter(component.getParent().getClientId(context)); + ScriptOptions dropOptions = contributor.buildOptions(context, component); + + DnDParametersEncoder parametersEncoder = DnDParametersEncoder.getInstance(); + dropOptions.addOption("dndParams", parametersEncoder.doEncodeAsString(context, component)); + + function.addParameter(dropOptions); + function.appendScript(buffer); + + String scriptContribution = contributor.getScriptContribution(context, component); + if (scriptContribution != null && scriptContribution.length() != 0) { + buffer.append(scriptContribution); + } + + ResponseWriter writer = context.getResponseWriter(); + + writer.startElement(HTML.SCRIPT_ELEM, component); + writer.writeAttribute("id", component.getClientId(context), "id"); + writer.write(buffer.toString()); + writer.endElement(HTML.SCRIPT_ELEM); + } } 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-13 20:56:05 UTC (rev 61) +++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/DragSupportHandler.java 2007-03-13 20:58:09 UTC (rev 62) @@ -38,7 +38,12 @@ * created 01.03.2007 * */ -public class DragSupportHandler extends EventInjectionSupportHandler { +public class DragSupportHandler extends AjaxComponentHandler { + + public DragSupportHandler(ComponentConfig config) { + super(config); + } + public static class DragHandler extends AjaxComponentHandler { private static final DragSupportHandlerMetaRule metaRule = new DragSupportHandlerMetaRule(); @@ -110,15 +115,4 @@ } - public DragSupportHandler(ComponentConfig componentConfig) { - super(componentConfig, new DragHandler(componentConfig)); - } - - /* (non-Javadoc) - * @see org.richfaces.taglib.EventInjectionSupportHandler#getEventName() - */ - protected String getEventName() { - return "onmousedown"; - } - } 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-13 20:56:05 UTC (rev 61) +++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/DropSupportHandler.java 2007-03-13 20:58:09 UTC (rev 62) @@ -37,7 +37,12 @@ * @author Nick - mailto:nbelaevski@exadel.com created 01.03.2007 * */ -public class DropSupportHandler extends EventInjectionSupportHandler { +public class DropSupportHandler extends AjaxComponentHandler { + + public DropSupportHandler(ComponentConfig config) { + super(config); + } + public static class DropHandler extends AjaxComponentHandler { private static final DropSupportHandlerMetaRule metaRule = new DropSupportHandlerMetaRule(); @@ -108,18 +113,4 @@ } } - - public DropSupportHandler(ComponentConfig componentConfig) { - super(componentConfig, new DropHandler(componentConfig)); - } - - /* - * (non-Javadoc) - * - * @see org.richfaces.taglib.EventInjectionSupportHandler#getEventName() - */ - protected String getEventName() { - return "onmouseover"; - } - } Deleted: trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/EventInjectionSupportHandler.java =================================================================== --- trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/EventInjectionSupportHandler.java 2007-03-13 20:56:05 UTC (rev 61) +++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/taglib/EventInjectionSupportHandler.java 2007-03-13 20:58:09 UTC (rev 62) @@ -1,85 +0,0 @@ -/** - * License Agreement. - * - * JBoss RichFaces 3.0 - Ajax4jsf Component Library - * - * 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; - -import java.io.IOException; - -import javax.el.ELException; -import javax.faces.FacesException; -import javax.faces.component.UIComponent; -import javax.faces.component.UIComponentBase; - -import org.ajax4jsf.taglib.html.facelets.AjaxSupportHandler; - -import com.sun.facelets.FaceletContext; -import com.sun.facelets.FaceletException; -import com.sun.facelets.tag.TagHandler; -import com.sun.facelets.tag.jsf.ComponentConfig; - -/** - * @author Nick - mailto:nbelaevski@exadel.com - * created 24.02.2007 - * - * Higher abstraction of {@link AjaxSupportHandler} - */ -public abstract class EventInjectionSupportHandler extends TagHandler { - - private TagHandler baseHandler; - - private static final class EventInjectionSupportFacet extends UIComponentBase { - - public String getFamily() { - return null; - } - } - - protected abstract String getEventName(); - - public EventInjectionSupportHandler(ComponentConfig componentConfig, TagHandler tagHandler) { - super(componentConfig); - - this.baseHandler = tagHandler; - } - - public void apply(FaceletContext faceletContext, UIComponent parent) - throws IOException, FacesException, FaceletException, ELException { - String eventName = getEventName(); - // our id -// String id = ctx.generateUniqueId(this.tagId); - EventInjectionSupportFacet facet = new EventInjectionSupportFacet(); - // Find facet for support component - String facetName = EventInjectionSupportHandler.class.getName() + "_" + eventName; - UIComponent c = parent.getFacet(facetName); - if (null != c) { - parent.getFacets().remove(facetName); - facet.getChildren().add(c); - } - this.baseHandler.apply(faceletContext, facet); - - c = (UIComponent) facet.getChildren().get(0); - parent.getFacets().put(facetName, c); - // Fix for possible incompabilites in different frameworks. -// c.setParentProperties(parent); - - } - -} Modified: trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-draggable.js =================================================================== --- trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-draggable.js 2007-03-13 20:56:05 UTC (rev 61) +++ trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-draggable.js 2007-03-13 20:58:09 UTC (rev 62) @@ -4,13 +4,19 @@ Object.extend(DnD.SimpleDraggable.prototype, { initialize: function(id, options) { this.id = $(id); + + if (!this.id) { + alert("drag: Element with [" + id + "] ID was not found in the DOM tree. Probably element has no client ID or client ID hasn't been written. DnD's disabled. Check please!"); + return ; + } + this.options = options; this.dragIndicatorId = this.options.dragIndicator; this.eventMouseDown = this.initDrag.bindAsEventListener(this); - //Event.observe(this.id, "mousedown", this.eventMouseDown); + Event.observe(this.id, "mousedown", this.eventMouseDown); }, getDnDDragParams: function() { Modified: trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-dropzone.js =================================================================== --- trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-dropzone.js 2007-03-13 20:56:05 UTC (rev 61) +++ trunk/richfaces/drag-drop/src/main/resources/org/richfaces/renderkit/html/scripts/simple-dropzone.js 2007-03-13 20:58:09 UTC (rev 62) @@ -4,6 +4,12 @@ initialize: function(id, options) { this.id = id; var element = $(id); + + if (!element) { + alert("drop: Element with [" + id + "] ID was not found in the DOM tree. Probably element has no client ID or client ID hasn't been written. DnD's disabled. Check please!"); + return ; + } + this.element = element; if (options.acceptedTypes) { this.acceptedTypes = options.acceptedTypes; @@ -21,7 +27,7 @@ this.mouseoutBound = this.mouseout.bindAsEventListener(this); this.mouseupBound = this.mouseup.bindAsEventListener(this); - //Event.observe(element, "mouseover", this.mouseoverBound); + Event.observe(element, "mouseover", this.mouseoverBound); Event.observe(element, "mouseout", this.mouseoutBound); Event.observe(element, "mouseup", this.mouseupBound);