[richfaces-svn-commits] JBoss Rich Faces SVN: r19440 - in trunk: core/api/src/main/java/org/richfaces/resource and 5 other directories.

Author: nbelaevski Date: 2010-10-04 19:52:08 -0400 (Mon, 04 Oct 2010) New Revision: 19440 Added: trunk/core/api/src/main/java/org/richfaces/renderkit/util/ColorUtils.java trunk/core/api/src/main/java/org/richfaces/resource/Java2DAnimatedUserResource.java trunk/core/impl/src/main/java/org/richfaces/resource/Java2DAnimatedUserResourceWrapperImpl.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarAnimatedBackgroundImage.java Modified: trunk/core/api/src/main/java/org/richfaces/resource/ImageType.java trunk/core/impl/src/main/java/org/richfaces/resource/Java2DUserResourceWrapperImpl.java trunk/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java trunk/ui/output/ui/pom.xml trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/progressBar.ecss trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties Log: https://jira.jboss.org/browse/RF-9413 Added: trunk/core/api/src/main/java/org/richfaces/renderkit/util/ColorUtils.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/renderkit/util/ColorUtils.java (rev 0) +++ trunk/core/api/src/main/java/org/richfaces/renderkit/util/ColorUtils.java 2010-10-04 23:52:08 UTC (rev 19440) @@ -0,0 +1,235 @@ +/** + * License Agreement. + * + * JBoss RichFaces - 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.renderkit.util; + +import java.awt.Color; + +/** + * Utility methods that are useful for color processing. + * + * @author carcasser + */ +public final class ColorUtils { + + private ColorUtils() { + } + + /** + * Converts the components of a color, as specified by the default RGB + * model, to an equivalent set of values for hue, saturation, and lightness + * that are the three components of the HSL model. + * + * @param r + * the red component of the color + * @param g + * the green component of the color + * @param b + * the blue component of the color + * @return an array of three elements containing the hue, saturation, and + * lightness (in that order), of the color with the indicated red, + * green, and blue components. + */ + public static float[] convertRGBtoHSL(int r, int g, int b) { + float varR = (r / 255f); + float varG = (g / 255f); + float varB = (b / 255f); + + float varMin = Math.min(varR, Math.min(varG, varB)); // Min value of RGB + float varMax = Math.max(varR, Math.max(varG, varB)); // Max value of RGB + float delMax = varMax - varMin; // Delta RGB value + + float h = 0; + float s = 0; + float l = (varMax + varMin) / 2; + + if (delMax == 0 || l == 0) { + s = 0; + } else if (l == 1) { + s = 1; + } else if (l <= 0.5) { + s = delMax / (2 * (1 - l)); + } else if (l > 0.5) { + s = delMax / (2 * l); + } + + if (delMax == 0) { + h = 0; + } else if (varMax == varR && g >= b) { + h = 60 * (varG - varB) / delMax + 0; + } else if (varMax == varR && varG < b) { + h = 60 * (varG - varB) / delMax + 360; + } else if (varMax == varG) { + h = 60 * (varB - varR) / delMax + 120; + } else if (varMax == varB) { + h = 60 * (varR - varG) / delMax + 240; + } + + return new float[] { h, s, l }; + } + + /** + * Converts the components of a color, as specified by the HSL model, to an + * equivalent set of values for the default RGB model. + * <p> + * The <code>saturation</code> and <code>lightness</code> components + * should be floating-point values between zero and one (numbers in the + * range 0.0-1.0). The <code>hue</code> component can be any + * floating-point number. The floor of this number is subtracted from it to + * create a fraction between 0 and 1. This fractional number is then + * multiplied by 360 to produce the hue angle in the HSB color model. + * + * @param h + * the hue component of the color + * @param s + * the saturation of the color + * @param l + * the lightness of the color + * @return the RGB value of the color with the indicated hue, saturation, + * and lightness + */ + public static Color convertHSLtoRGB(float h, float s, float l) { + float q; + if (l < 0.5) { + q = l * (1 + s); + } else { + q = l + s - (l * s); + } + + float p = 2 * l - q; + float hNorm = h / 360; + + float tR = hNorm + 1f / 3f; + float tG = hNorm; + float tB = hNorm - 1f / 3f; + + float r = tC2C(tR, p, q); + float g = tC2C(tG, p, q); + float b = tC2C(tB, p, q); + + return new Color(r, g, b); + } + + private static float tC2C(float tC, float p, float q) { + float retVal; + + if (tC < 0) { + tC += 1; + } + + if (tC > 1) { + tC -= 1; + } + + if ((6 * tC) < 1) { + retVal = (p + (q - p) * 6 * tC); + } else if ((2 * tC) < 1) { + retVal = q; + } else if ((3 * tC) < 2) { + retVal = (p + (q - p) * 6 * (2f / 3f - tC)); + } else { + retVal = p; + } + + return retVal; + } + + /** + * Increases/decreases brightness of the given color by the specified + * <code>difference</code>. + * <p> + * The <code>difference</code> values in the range (-1.0, 1.0): 1.0 - the + * brightest value; -1.0 - the dimmest value. + * + * @param c + * color to adjust + * @param difference + * value to be added to the current brightness + * + * @return a new <code>Color</code> instance with increased/decreased + * brightness by specified <code>difference</code> + * @throws IllegalArgumentException + * if difference is outside of the range -1.0 to 1.0, inclusive + */ + public static Color adjustBrightness(Color c, float difference) { + if (difference < -1.0 || difference > 1.0) { + throw new IllegalArgumentException("Difference parameter outside of expected range: " + + "Difference parameter should be floating-point values between -1 and 1"); + } + + Color retVal = null; + if (c != null) { + float[] hsb = Color.RGBtoHSB(c.getRed(), c.getGreen(), c.getBlue(), null); + float brightness = Math.min(1.0f, Math.max(0.0f, hsb[2] + difference)); + retVal = new Color(Color.HSBtoRGB(hsb[0], hsb[1], brightness)); + } + + return retVal; + } + + /** + * Increases/decreases lightness of the given color by the specified + * <code>difference</code>. + * <p> + * The <code>difference</code> values in the range (-1.0, 1.0): 1.0 - the + * lightest value; -1.0 - on the contrary. + * + * @param c + * color to adjust + * @param difference + * value to be added to the current lightness + * + * @return a new <code>Color</code> instance with increased/decreased + * lightness by specified <code>difference</code> + * @throws IllegalArgumentException + * if difference is outside of the range -1.0 to 1.0, inclusive + */ + public static Color adjustLightness(Color c, float difference) { + if (difference < -1.0 || difference > 1.0) { + throw new IllegalArgumentException("Difference parameter outside of expected range: " + + "Difference parameter should be floating-point values between -1 and 1"); + } + + Color retVal = null; + if (c != null) { + float[] hsl = convertRGBtoHSL(c.getRed(), c.getGreen(), c.getBlue()); + float lightness = Math.min(1.0f, Math.max(0.0f, hsl[2] + difference)); + retVal = convertHSLtoRGB(hsl[0], hsl[1], lightness); + } + + return retVal; + } + + /** + * Overwrites alpha value for given color. + * + * @param c color to overwrite + * @param alpha a new value of alpha + * @return a new <code>Color</code> object with a new specified alpha value + */ + public static Color overwriteAlpha(Color c, float alpha) { + Color retVal = c; + if (c != null) { + retVal = new Color(c.getRed(), c.getGreen(), c.getBlue(), (int) (alpha * 255 + 0.5)); + } + return retVal; + } + +} Modified: trunk/core/api/src/main/java/org/richfaces/resource/ImageType.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/resource/ImageType.java 2010-10-04 21:44:13 UTC (rev 19439) +++ trunk/core/api/src/main/java/org/richfaces/resource/ImageType.java 2010-10-04 23:52:08 UTC (rev 19440) @@ -21,6 +21,7 @@ */ package org.richfaces.resource; +import java.awt.Dimension; import java.awt.Transparency; import java.awt.color.ColorSpace; import java.awt.image.BufferedImage; @@ -115,6 +116,10 @@ public abstract BufferedImage createImage(int width, int height); + public BufferedImage createImage(Dimension dimension) { + return createImage(dimension.width, dimension.height); + } + public String getFormatName() { return formatName; } Added: trunk/core/api/src/main/java/org/richfaces/resource/Java2DAnimatedUserResource.java =================================================================== --- trunk/core/api/src/main/java/org/richfaces/resource/Java2DAnimatedUserResource.java (rev 0) +++ trunk/core/api/src/main/java/org/richfaces/resource/Java2DAnimatedUserResource.java 2010-10-04 23:52:08 UTC (rev 19440) @@ -0,0 +1,43 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.resource; + +import java.awt.Dimension; +import java.awt.Graphics2D; + +/** + * @author Nick Belaevski + * + */ +public interface Java2DAnimatedUserResource extends Java2DUserResource { + + public boolean isLooped(); + + public int getFrameDelay(); + + public void startFramesSequence(); + + public boolean hasNextFrame(); + + public void paint(Graphics2D graphics2d, Dimension dimension); + +} Added: trunk/core/impl/src/main/java/org/richfaces/resource/Java2DAnimatedUserResourceWrapperImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/resource/Java2DAnimatedUserResourceWrapperImpl.java (rev 0) +++ trunk/core/impl/src/main/java/org/richfaces/resource/Java2DAnimatedUserResourceWrapperImpl.java 2010-10-04 23:52:08 UTC (rev 19440) @@ -0,0 +1,161 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.resource; + +import java.awt.Dimension; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.text.MessageFormat; +import java.util.Iterator; + +import javax.imageio.IIOImage; +import javax.imageio.ImageIO; +import javax.imageio.ImageTypeSpecifier; +import javax.imageio.ImageWriteParam; +import javax.imageio.ImageWriter; +import javax.imageio.metadata.IIOMetadata; +import javax.imageio.metadata.IIOMetadataNode; +import javax.imageio.stream.ImageOutputStream; + +import org.w3c.dom.Node; + +/** + * @author Nick Belaevski + * + */ +public class Java2DAnimatedUserResourceWrapperImpl extends Java2DUserResourceWrapperImpl { + + public Java2DAnimatedUserResourceWrapperImpl(Java2DAnimatedUserResource resourceObject) { + super(resourceObject); + } + + private static ImageWriter getSequenceCapableImageWriter(ImageType imageType) { + Iterator<ImageWriter> imageWriters = ImageIO.getImageWritersByFormatName(imageType.getFormatName()); + + while (imageWriters.hasNext()) { + ImageWriter imageWriter = imageWriters.next(); + + if (imageWriter.canWriteSequence()) { + return imageWriter; + } + } + + throw new IllegalArgumentException(MessageFormat.format("Cannot find sequence-capable image writer for {0} format", + imageType.getFormatName())); + } + + private static Node getOrCreateChild(Node root, String name) { + Node result = null; + + for (Node node = root.getFirstChild(); (node != null) && (result == null); node = node.getNextSibling()) { + if (name.equals(node.getNodeName())) { + result = node; + } + } + + if (result == null) { + result = new IIOMetadataNode(name); + root.appendChild(result); + } + + return result; + } + + private static void checkSupportedFormat(ImageType imageType) { + if (imageType != ImageType.GIF) { + throw new IllegalArgumentException(MessageFormat.format("Image format {0} is not supported", imageType.getFormatName())); + } + } + + @Override + public String getRequestPath() { + //detect unsupported types early + checkSupportedFormat(getWrapped().getImageType()); + return super.getRequestPath(); + } + + @Override + protected void paintAndWrite(ImageOutputStream outputStream) throws IOException { + Java2DAnimatedUserResource userResource = (Java2DAnimatedUserResource) getWrapped(); + + ImageType imageType = userResource.getImageType(); + checkSupportedFormat(imageType); + ImageWriter imageWriter = getSequenceCapableImageWriter(imageType); + Dimension dimension = userResource.getDimension(); + BufferedImage image = imageType.createImage(dimension); + + try { + imageWriter.setOutput(outputStream); + + ImageWriteParam defaultImageWriteParam = imageWriter.getDefaultWriteParam(); + IIOMetadata imageMetaData = imageWriter.getDefaultImageMetadata(ImageTypeSpecifier.createFromBufferedImageType( + BufferedImage.TYPE_INT_RGB), + defaultImageWriteParam); + String metaFormatName = imageMetaData.getNativeMetadataFormatName(); + Node root = imageMetaData.getAsTree(metaFormatName); + IIOMetadataNode graphicsControlExtensionNode = (IIOMetadataNode) getOrCreateChild(root, "GraphicControlExtension"); + + // http://java.sun.com/javase/6/docs/api/javax/imageio/metadata/doc-files/gi... + graphicsControlExtensionNode.setAttribute("disposalMethod", "none"); + graphicsControlExtensionNode.setAttribute("userInputFlag", "FALSE"); + graphicsControlExtensionNode.setAttribute("transparentColorFlag", "FALSE"); + graphicsControlExtensionNode.setAttribute("delayTime", Integer.toString(userResource.getFrameDelay() / 100)); + graphicsControlExtensionNode.setAttribute("transparentColorIndex", "0"); + + Node applicationExtensionsNode = getOrCreateChild(root, "ApplicationExtensions"); + IIOMetadataNode netscapeExtension = new IIOMetadataNode("ApplicationExtension"); + + netscapeExtension.setAttribute("applicationID", "NETSCAPE"); + netscapeExtension.setAttribute("authenticationCode", "2.0"); + + byte numLoops = (byte) (userResource.isLooped() ? 0x0 : 0x1); + + netscapeExtension.setUserObject(new byte[]{0x1, numLoops, 0x0}); + applicationExtensionsNode.appendChild(netscapeExtension); + imageMetaData.setFromTree(metaFormatName, root); + + imageWriter.prepareWriteSequence(null); + + userResource.startFramesSequence(); + + while (userResource.hasNextFrame()) { + Graphics2D g2d = null; + try { + g2d = createGraphics(image); + userResource.paint(g2d, dimension); + imageWriter.writeToSequence(new IIOImage(image, null, imageMetaData), + defaultImageWriteParam); + } finally { + if (g2d != null) { + g2d.dispose(); + } + } + } + + imageWriter.endWriteSequence(); + } finally { + imageWriter.dispose(); + } + } + +} Modified: trunk/core/impl/src/main/java/org/richfaces/resource/Java2DUserResourceWrapperImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/resource/Java2DUserResourceWrapperImpl.java 2010-10-04 21:44:13 UTC (rev 19439) +++ trunk/core/impl/src/main/java/org/richfaces/resource/Java2DUserResourceWrapperImpl.java 2010-10-04 23:52:08 UTC (rev 19440) @@ -34,6 +34,7 @@ import javax.faces.context.FacesContext; import javax.imageio.ImageIO; +import javax.imageio.stream.ImageOutputStream; import org.ajax4jsf.util.HtmlColor; import org.richfaces.renderkit.util.HtmlDimensions; @@ -52,54 +53,33 @@ } public InputStream getInputStream() throws IOException { - Java2DUserResource j2DUserResource = getWrapped(); - Dimension dimension = j2DUserResource.getDimension(); - int width = dimension.width; - int height = dimension.height; ByteArrayOutputStream baos = new ByteArrayOutputStream(); - - ImageType imageType = j2DUserResource.getImageType(); - - if ((width > 0) && (height > 0)) { - BufferedImage image = imageType.createImage(width, height); - Graphics2D g2d = image.createGraphics(); - - try { - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); - - g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, - RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); - - j2DUserResource.paint(g2d, dimension); - } finally { - g2d.dispose(); - } - - try { - ImageIO.write(image, imageType.getFormatName(), baos); - } finally { + ImageOutputStream imageOutputStream = ImageIO.createImageOutputStream(baos); + try { + paintAndWrite(imageOutputStream); + } finally { + if (imageOutputStream != null) { try { - baos.close(); + imageOutputStream.close(); } catch (IOException e) { - - // TODO Auto-generated catch block + // TODO: handle exception e.printStackTrace(); } } } - return new ByteArrayInputStream(baos.toByteArray()); } + protected void write(BufferedImage image, String formatName, ImageOutputStream imageOutputStream) throws IOException { + ImageIO.write(image, formatName, imageOutputStream); + } + public String getContentType() { return getWrapped().getImageType().getMimeType(); } protected String getValueParameter(FacesContext context, String name) { - SkinFactory skinFactory = SkinFactory.getInstance(); + SkinFactory skinFactory = SkinFactory.getInstance(context); Skin skin = skinFactory.getSkin(context); String value = (String) skin.getParameter(context, name); @@ -115,16 +95,16 @@ protected Integer getColorValueParameter(FacesContext context, String name, boolean useDefault) { Skin skin; if (useDefault) { - skin = SkinFactory.getInstance().getDefaultSkin(context); + skin = SkinFactory.getInstance(context).getDefaultSkin(context); } else { - skin = SkinFactory.getInstance().getSkin(context); + skin = SkinFactory.getInstance(context).getSkin(context); } return decodeColor((String) skin.getParameter(context, name)); } protected Integer getHeight(FacesContext context, String heightParamName) { - SkinFactory skinFactory = SkinFactory.getInstance(); + SkinFactory skinFactory = SkinFactory.getInstance(context); Skin skin = skinFactory.getSkin(context); String height = (String) skin.getParameter(context, heightParamName); @@ -157,4 +137,33 @@ protected Date getLastModified(FacesContext context) { return getWrapped().getLastModified(); } + + protected void paintAndWrite(ImageOutputStream outputStream) throws IOException { + Java2DUserResource resource = getWrapped(); + ImageType imageType = resource.getImageType(); + + BufferedImage image = imageType.createImage(resource.getDimension()); + Graphics2D g2d = null; + try { + g2d = createGraphics(image); + resource.paint(g2d, new Dimension(image.getWidth(), image.getHeight())); + ImageIO.write(image, imageType.getFormatName(), outputStream); + } finally { + if (g2d != null) { + g2d.dispose(); + } + } + } + + protected Graphics2D createGraphics(BufferedImage image) { + Graphics2D g2d = image.createGraphics(); + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); + + g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, + RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY); + g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); + g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); + return g2d; + } } Modified: trunk/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java =================================================================== --- trunk/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java 2010-10-04 21:44:13 UTC (rev 19439) +++ trunk/core/impl/src/main/java/org/richfaces/resource/ResourceFactoryImpl.java 2010-10-04 23:52:08 UTC (rev 19440) @@ -260,7 +260,11 @@ if (legitimateResource) { Object wrappedResource; - if (Java2DUserResource.class.isAssignableFrom(loadedClass)) { + if (Java2DAnimatedUserResource.class.isAssignableFrom(loadedClass)) { + Java2DAnimatedUserResource java2DAnimatedUserResource = (Java2DAnimatedUserResource) loadedClass.newInstance(); + wrappedResource = java2DAnimatedUserResource; + resource = new Java2DAnimatedUserResourceWrapperImpl(java2DAnimatedUserResource); + } else if (Java2DUserResource.class.isAssignableFrom(loadedClass)) { Java2DUserResource java2DUserResource = (Java2DUserResource) loadedClass.newInstance(); wrappedResource = java2DUserResource; resource = new Java2DUserResourceWrapperImpl(java2DUserResource); Modified: trunk/ui/output/ui/pom.xml =================================================================== --- trunk/ui/output/ui/pom.xml 2010-10-04 21:44:13 UTC (rev 19439) +++ trunk/ui/output/ui/pom.xml 2010-10-04 23:52:08 UTC (rev 19440) @@ -55,10 +55,6 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-api</artifactId> </dependency> - <dependency> - <groupId>org.richfaces.core</groupId> - <artifactId>richfaces-core-impl</artifactId> - </dependency> <dependency> <groupId>org.richfaces.ui.common</groupId> <artifactId>richfaces-ui-common-ui</artifactId> Added: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarAnimatedBackgroundImage.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarAnimatedBackgroundImage.java (rev 0) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarAnimatedBackgroundImage.java 2010-10-04 23:52:08 UTC (rev 19440) @@ -0,0 +1,168 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software 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 software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.richfaces.renderkit.html; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.GradientPaint; +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.image.BufferedImage; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.Date; +import java.util.Map; + +import javax.faces.context.FacesContext; + +import org.richfaces.renderkit.util.ColorUtils; +import org.richfaces.resource.CacheableResource; +import org.richfaces.resource.DynamicResource; +import org.richfaces.resource.ImageType; +import org.richfaces.resource.Java2DAnimatedUserResource; +import org.richfaces.resource.StateHolderResource; +import org.richfaces.skin.Skin; +import org.richfaces.skin.SkinFactory; + +/** + * @author Nick Belaevski + * + */ +//TODO - add version +@DynamicResource +public class ProgressBarAnimatedBackgroundImage implements Java2DAnimatedUserResource, StateHolderResource, CacheableResource { + + private static final int NUMBER_OF_FRAMES = 12; + + private static final Dimension DIMENSION = new Dimension(24, 48); + + private int frameNumber = 0; + + private Color basicColor; + + public Map<String, String> getResponseHeaders() { + return null; + } + + public Date getLastModified() { + return null; + } + + public ImageType getImageType() { + return ImageType.GIF; + } + + public Dimension getDimension() { + return DIMENSION; + } + + public boolean isLooped() { + return true; + } + + public int getFrameDelay() { + return 1000; + } + + public void startFramesSequence() { + frameNumber = 0; + } + + public boolean hasNextFrame() { + return frameNumber < NUMBER_OF_FRAMES; + } + + /** + * Creates a main stage for progress bar background. + * + * @param context + * resource context + * @return a <code>BufferedImage</code> object + */ + private BufferedImage createMainStage() { + Color progressbarBackgroundColor = basicColor; + Color progressbarSpiralColor = ColorUtils.adjustLightness(basicColor, 0.2f); + + Dimension dimension = getDimension(); + BufferedImage retVal = getImageType().createImage(dimension.width, dimension.height * 2); + Graphics g = retVal.getGraphics(); + try { + g.setColor(progressbarBackgroundColor); + g.fillRect(0, 0, dimension.width, dimension.height * 2); + g.setColor(progressbarSpiralColor); + for (int k : new int[] { -24, 0, 24, 48, 72 }) { + g.fillPolygon(new int[] { 0, 24, 24, 0 }, new int[] { 24 + k, k, 12 + k, 36 + k }, 4); + } + } finally { + if (g != null) { + g.dispose(); + } + } + + return retVal; + } + + public void paint(Graphics2D g2d, Dimension dimension) { + frameNumber++; + + BufferedImage mainStage = createMainStage(); + BufferedImage frame = mainStage.getSubimage(0, 48 - frameNumber * 2, dimension.width, dimension.height); + g2d.drawImage(frame, null, null); + Color progressbarShadowStartColor = ColorUtils.overwriteAlpha(ColorUtils.adjustLightness(basicColor, 0.7f), 0.6f); + Color progressbarShadowEndColor = ColorUtils.overwriteAlpha(ColorUtils.adjustLightness(basicColor, 0.3f), 0.6f); + // paint a shadow in the form of semi-transparent gradient + g2d.setPaint(new GradientPaint(0, 0, progressbarShadowStartColor, 0, 7, progressbarShadowEndColor)); + g2d.fillRect(0, 0, dimension.width, 7); + } + + public boolean isTransient() { + return false; + } + + public void writeState(FacesContext context, DataOutput dataOutput) throws IOException { + // TODO Auto-generated method stub + Skin skin = SkinFactory.getInstance(context).getSkin(context); + Integer color = skin.getColorParameter(context, Skin.SELECT_CONTROL_COLOR); + dataOutput.writeInt(color.intValue()); + } + + public void readState(FacesContext context, DataInput dataInput) throws IOException { + basicColor = new Color(dataInput.readInt()); + } + + public boolean isCacheable(FacesContext context) { + return true; + } + + public Date getExpires(FacesContext context) { + return null; + } + + public int getTimeToLive(FacesContext context) { + return 0; + } + + public String getEntityTag(FacesContext context) { + return null; + } +} Modified: trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/progressBar.ecss =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/progressBar.ecss 2010-10-04 21:44:13 UTC (rev 19439) +++ trunk/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/progressBar.ecss 2010-10-04 23:52:08 UTC (rev 19440) @@ -5,7 +5,7 @@ } .rf-pb-upl{ background-repeat : repeat-x; -background-image : "url(#{resource['org.richfaces.renderkit.html.images.ProgressBarAnimatedBg']})"; +background-image : "url(#{resource['org.richfaces.images:pbAniBg.gif']})"; background-color : '#{richSkin.selectControlColor}'; height : 13px; } @@ -40,5 +40,5 @@ height : 13px; width : 200px; padding: 0px; -background-image : "url(#{resource['org.richfaces.renderkit.html.images.ProgressBarAnimatedBg']})"; +background-image : "url(#{resource['org.richfaces.images:pbAniBg.gif']})"; } Modified: trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties =================================================================== --- trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2010-10-04 21:44:13 UTC (rev 19439) +++ trunk/ui/output/ui/src/main/resources/META-INF/richfaces/resource-mappings.properties 2010-10-04 23:52:08 UTC (rev 19440) @@ -12,3 +12,5 @@ org.richfaces.images\:actRightTabBg.png=org.richfaces.renderkit.html.BaseGradient\ {width=26, height=5, baseColorParam=generalBackgroundColor, gradientColorParam=tabBackgroundColor, horizontal=true} + +org.richfaces.images\:pbAniBg.gif=org.richfaces.renderkit.html.ProgressBarAnimatedBackgroundImage \ No newline at end of file