Author: nbelaevski Date: 2007-03-21 13:59:16 -0400 (Wed, 21 Mar 2007) New Revision: 115 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/DropSupportRenderer.java Log: AJAXScript added to required resources 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-21 15:35:53 UTC (rev 114) +++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DragSupportRenderer.java 2007-03-21 17:59:16 UTC (rev 115) @@ -22,11 +22,13 @@ package org.richfaces.renderkit.html; import java.io.IOException; +import java.util.LinkedHashSet; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.ajax4jsf.framework.ajax.AjaxScript; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.util.javascript.JSFunction; @@ -44,6 +46,8 @@ */ public class DragSupportRenderer extends CompositeRenderer { + private InternetResource [] scripts = null; + public DragSupportRenderer() { super(); @@ -58,11 +62,24 @@ } protected InternetResource[] getScripts() { - InternetResource[] resources = super.getScripts(); - InternetResource[] result = new InternetResource[resources.length + 1]; - System.arraycopy(resources, 0, result, 0, resources.length); - result[result.length - 1] = getResource("/org/richfaces/renderkit/html/scripts/simple-draggable.js"); - return result; + synchronized (this) { + if (scripts == null) { + LinkedHashSet set = new LinkedHashSet(); + InternetResource[] resources = super.getScripts(); + if (resources != null) { + for (int i = 0; i < resources.length; i++) { + set.add(resources[i]); + } + } + + set.add(new AjaxScript()); + set.add(getResource("/org/richfaces/renderkit/html/scripts/simple-draggable.js")); + + scripts = (InternetResource[]) set.toArray(new InternetResource[set.size()]); + } + } + + return scripts; } public void encodeEnd(FacesContext context, UIComponent component) 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-21 15:35:53 UTC (rev 114) +++ trunk/richfaces/drag-drop/src/main/java/org/richfaces/renderkit/html/DropSupportRenderer.java 2007-03-21 17:59:16 UTC (rev 115) @@ -22,11 +22,13 @@ package org.richfaces.renderkit.html; import java.io.IOException; +import java.util.LinkedHashSet; import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.ajax4jsf.framework.ajax.AjaxScript; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.resource.InternetResource; import org.ajax4jsf.framework.util.javascript.JSFunction; @@ -44,6 +46,8 @@ */ public class DropSupportRenderer extends CompositeRenderer { + private InternetResource [] scripts = null; + public DropSupportRenderer() { super(); @@ -58,11 +62,24 @@ } protected InternetResource[] getScripts() { - InternetResource[] resources = super.getScripts(); - InternetResource[] result = new InternetResource[resources.length + 1]; - System.arraycopy(resources, 0, result, 0, resources.length); - result[result.length - 1] = getResource("/org/richfaces/renderkit/html/scripts/simple-dropzone.js"); - return result; + synchronized (this) { + if (scripts == null) { + LinkedHashSet set = new LinkedHashSet(); + InternetResource[] resources = super.getScripts(); + if (resources != null) { + for (int i = 0; i < resources.length; i++) { + set.add(resources[i]); + } + } + + set.add(new AjaxScript()); + set.add(getResource("/org/richfaces/renderkit/html/scripts/simple-dropzone.js")); + + scripts = (InternetResource[]) set.toArray(new InternetResource[set.size()]); + } + } + + return scripts; } public void encodeEnd(FacesContext context, UIComponent component)