Author: abelevich Date: 2008-02-13 13:37:42 -0500 (Wed, 13 Feb 2008) New Revision: 6068 Added: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/saveControlIcon.java Removed: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/OkControlIcon.java Modified: trunk/sandbox/ui/inplaceInput/src/main/config/resources/resource-config.xml Log: rename okIcon --> saveIcon, apply new shadow image Modified: trunk/sandbox/ui/inplaceInput/src/main/config/resources/resource-config.xml =================================================================== --- trunk/sandbox/ui/inplaceInput/src/main/config/resources/resource-config.xml 2008-02-13 17:47:33 UTC (rev 6067) +++ trunk/sandbox/ui/inplaceInput/src/main/config/resources/resource-config.xml 2008-02-13 18:37:42 UTC (rev 6068) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <resource-config> - <resource class="org.richfaces.renderkit.images.OkControlIcon"> - <name>org.richfaces.renderkit.images.OkControlIcon</name> + <resource class="org.richfaces.renderkit.images.saveControlIcon"> + <name>org.richfaces.renderkit.images.saveControlIcon</name> </resource> <resource class="org.richfaces.renderkit.images.EditIcon"> <name>org.richfaces.renderkit.images.EditIcon</name> @@ -15,7 +15,4 @@ <resource class="org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient"> <name>org.richfaces.renderkit.html.images.ComboBoxButtonPressGradient</name> </resource> - <resource class="org.richfaces.renderkit.html.images.ComboBoxListShadow"> - <name>org.richfaces.renderkit.html.images.ComboBoxListShadow</name> - </resource> </resource-config> \ No newline at end of file Deleted: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/OkControlIcon.java =================================================================== --- trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/OkControlIcon.java 2008-02-13 17:47:33 UTC (rev 6067) +++ trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/OkControlIcon.java 2008-02-13 18:37:42 UTC (rev 6068) @@ -1,125 +0,0 @@ -/** - * - */ -package org.richfaces.renderkit.images; - -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.util.Date; - -import javax.faces.context.FacesContext; - -import org.ajax4jsf.resource.GifRenderer; -import org.ajax4jsf.resource.InternetResourceBuilder; -import org.ajax4jsf.resource.Java2Dresource; -import org.ajax4jsf.resource.ResourceContext; -import org.ajax4jsf.util.HtmlColor; -import org.ajax4jsf.util.Zipper2; - -/** - * implementation of the default OK icon renderer - * @author Anton Belevich - * @since 3.2.0 - * - */ -public class OkControlIcon extends Java2Dresource { - - protected static final String ICON_COLOR = "#5BC248"; - protected static final String ICON_SHADOW = "#006406"; - protected static final String ICON_BORDER = "#FFFFFF"; - - private static final Dimension dimensions = new Dimension(11, 11); - - public Dimension getDimensions(FacesContext facesContext, Object data) { - return dimensions; - } - - - protected Dimension getDimensions(ResourceContext resourceContext) { - return dimensions; - } - public OkControlIcon() { - setRenderer(new GifRenderer()); - setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime())); - } - - protected Object deserializeData(byte[] objectArray) { - if (objectArray == null) { - return null; - } - Zipper2 zipper = new Zipper2(objectArray); - return new Color[] {zipper.nextColor(), zipper.nextColor(), zipper.nextColor()}; - } - - protected Object getDataToStore(FacesContext context, Object data){ - - byte [] ret = new byte[9]; - - Color color = null; - Zipper2 zipper = new Zipper2(ret); - - color = HtmlColor.decode(ICON_COLOR); - zipper.addColor(color); - - color = HtmlColor.decode(ICON_SHADOW); - zipper.addColor(color); - - color = HtmlColor.decode(ICON_BORDER); - zipper.addColor(color); - - return ret; - } - - protected void paint(ResourceContext context, Graphics2D g2d) { - Color [] data = (Color[]) restoreData(context); - - Color iconColor = data[0]; - Color iconShadow = data[1]; - Color borderColor = data[2]; - - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); - g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); - g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE); - g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); - g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); - - g2d.setColor(iconColor); - g2d.drawLine(1, 6, 4, 9); - g2d.drawLine(4, 9, 4, 8); - g2d.drawLine(4, 8, 2, 6); - g2d.drawLine(2, 5, 5, 8); - g2d.drawLine(5, 8, 5, 6); - g2d.drawLine(5, 6, 9, 2); - g2d.drawLine(9, 2, 9, 3); - g2d.drawLine(9, 3, 5, 7); - - //draw shadow - g2d.setColor(iconShadow); - g2d.drawLine(3, 5, 4, 6); - g2d.drawLine(5, 9, 6, 8); - g2d.drawLine(6, 8, 6, 7); - g2d.drawLine(6, 7, 9, 4); - - // draw border - g2d.setColor(borderColor); - g2d.drawLine(0, 6, 4, 10); - g2d.drawLine(4, 10, 5,10); - g2d.drawLine(5,10,7,8); - g2d.drawLine(7,8,7,7); - g2d.drawLine(7,7,10,4); - g2d.drawLine(10,4,10,1); - g2d.drawLine(10,1,9,1); - g2d.drawLine(9,1,5,5); - g2d.drawLine(5,5,4,5); - g2d.drawLine(4,5,3,4); - g2d.drawLine(3,4,2,4); - g2d.drawLine(2,4,0,6); - - - - } -} Added: trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/saveControlIcon.java =================================================================== --- trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/saveControlIcon.java (rev 0) +++ trunk/sandbox/ui/inplaceInput/src/main/java/org/richfaces/renderkit/images/saveControlIcon.java 2008-02-13 18:37:42 UTC (rev 6068) @@ -0,0 +1,125 @@ +/** + * + */ +package org.richfaces.renderkit.images; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.RenderingHints; +import java.util.Date; + +import javax.faces.context.FacesContext; + +import org.ajax4jsf.resource.GifRenderer; +import org.ajax4jsf.resource.InternetResourceBuilder; +import org.ajax4jsf.resource.Java2Dresource; +import org.ajax4jsf.resource.ResourceContext; +import org.ajax4jsf.util.HtmlColor; +import org.ajax4jsf.util.Zipper2; + +/** + * implementation of the default OK icon renderer + * @author Anton Belevich + * @since 3.2.0 + * + */ +public class saveControlIcon extends Java2Dresource { + + protected static final String ICON_COLOR = "#5BC248"; + protected static final String ICON_SHADOW = "#006406"; + protected static final String ICON_BORDER = "#FFFFFF"; + + private static final Dimension dimensions = new Dimension(11, 11); + + public Dimension getDimensions(FacesContext facesContext, Object data) { + return dimensions; + } + + + protected Dimension getDimensions(ResourceContext resourceContext) { + return dimensions; + } + public saveControlIcon() { + setRenderer(new GifRenderer()); + setLastModified(new Date(InternetResourceBuilder.getInstance().getStartTime())); + } + + protected Object deserializeData(byte[] objectArray) { + if (objectArray == null) { + return null; + } + Zipper2 zipper = new Zipper2(objectArray); + return new Color[] {zipper.nextColor(), zipper.nextColor(), zipper.nextColor()}; + } + + protected Object getDataToStore(FacesContext context, Object data){ + + byte [] ret = new byte[9]; + + Color color = null; + Zipper2 zipper = new Zipper2(ret); + + color = HtmlColor.decode(ICON_COLOR); + zipper.addColor(color); + + color = HtmlColor.decode(ICON_SHADOW); + zipper.addColor(color); + + color = HtmlColor.decode(ICON_BORDER); + zipper.addColor(color); + + return ret; + } + + protected void paint(ResourceContext context, Graphics2D g2d) { + Color [] data = (Color[]) restoreData(context); + + Color iconColor = data[0]; + Color iconShadow = data[1]; + Color borderColor = data[2]; + + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); + g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE); + g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); + g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE); + g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); + g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); + g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); + + g2d.setColor(iconColor); + g2d.drawLine(1, 6, 4, 9); + g2d.drawLine(4, 9, 4, 8); + g2d.drawLine(4, 8, 2, 6); + g2d.drawLine(2, 5, 5, 8); + g2d.drawLine(5, 8, 5, 6); + g2d.drawLine(5, 6, 9, 2); + g2d.drawLine(9, 2, 9, 3); + g2d.drawLine(9, 3, 5, 7); + + //draw shadow + g2d.setColor(iconShadow); + g2d.drawLine(3, 5, 4, 6); + g2d.drawLine(5, 9, 6, 8); + g2d.drawLine(6, 8, 6, 7); + g2d.drawLine(6, 7, 9, 4); + + // draw border + g2d.setColor(borderColor); + g2d.drawLine(0, 6, 4, 10); + g2d.drawLine(4, 10, 5,10); + g2d.drawLine(5,10,7,8); + g2d.drawLine(7,8,7,7); + g2d.drawLine(7,7,10,4); + g2d.drawLine(10,4,10,1); + g2d.drawLine(10,1,9,1); + g2d.drawLine(9,1,5,5); + g2d.drawLine(5,5,4,5); + g2d.drawLine(4,5,3,4); + g2d.drawLine(3,4,2,4); + g2d.drawLine(2,4,0,6); + + + + } +}