Author: alexsmirnov Date: 2007-07-10 15:43:06 -0400 (Tue, 10 Jul 2007) New Revision: 1591 Removed: trunk/framework/impl/src/main/java/org/ajax4jsf/framework/ trunk/framework/impl/src/main/java/org/ajax4jsf/taglib/ trunk/framework/impl/src/main/java/org/ajax4jsf/util/image/ trunk/framework/impl/src/main/java/org/richfaces/org/ trunk/framework/test/src/test/java/org/ajax4jsf/util/ Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java Log: packages and classes refactor in the "impl" project Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java =================================================================== --- trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-07-10 19:28:19 UTC (rev 1590) +++ trunk/ui/drag-drop/src/main/java/org/richfaces/renderkit/DragIndicatorRendererBase.java 2007-07-10 19:43:06 UTC (rev 1591) @@ -30,9 +30,9 @@ import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; +import org.ajax4jsf.javascript.ScriptUtils; import org.richfaces.component.UIDragIndicator; import org.richfaces.component.nsutils.NSUtils; -import org.richfaces.org.apache.commons.lang.StringEscapeUtils; /** * Base renderer class for drag indicator ( marker ). @@ -102,7 +102,7 @@ protected String getPredefinedMarker(FacesContext context, Object facetName) { if (MARKERS_PREDEFINED.contains(facetName)) { - return StringEscapeUtils.escapeJavaScript("<img alt=\"\" border=\"0\" width=\"16\" height=\"16\" src=\"" + + return ScriptUtils.toScript("<img alt=\"\" border=\"0\" width=\"16\" height=\"16\" src=\"" + getResource("/org/richfaces/renderkit/html/images/" + facetName + ".gif").getUri(context, null) +"\" />"); } Modified: trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java =================================================================== --- trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java 2007-07-10 19:28:19 UTC (rev 1590) +++ trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java 2007-07-10 19:43:06 UTC (rev 1591) @@ -22,18 +22,19 @@ package org.richfaces.renderkit.html; -import org.ajax4jsf.framework.util.CSSFormat; +import java.io.IOException; + +import javax.faces.FacesException; +import javax.faces.component.UIComponent; +import javax.faces.context.FacesContext; + import org.ajax4jsf.renderkit.RendererBase; import org.ajax4jsf.util.HtmlDimensions; +import org.ajax4jsf.util.style.CSSFormat; import org.richfaces.component.UISeparator; import org.richfaces.renderkit.html.images.BevelSeparatorImage; import org.richfaces.renderkit.html.images.SimpleSeparatorImage; -import javax.faces.FacesException; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import java.io.IOException; - public class SeparatorRendererBase extends RendererBase { private static final String[] SUPPORTED_TYPES = {