Author: nbelaevski Date: 2007-08-29 13:55:07 -0400 (Wed, 29 Aug 2007) New Revision: 2589 Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java Log: http://jira.jboss.com/jira/browse/RF-665 Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2007-08-29 17:44:15 UTC (rev 2588) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2007-08-29 17:55:07 UTC (rev 2589) @@ -139,8 +139,8 @@ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - Data dataToStore = new Data((byte[])resourceContext.getResourceData()); - if (dataToStore.headerBackgroundColor!=null && dataToStore.headerGradientColor!=null) { + Data dataToStore = (Data) restoreData(resourceContext); + if (dataToStore != null && dataToStore.headerBackgroundColor!=null && dataToStore.headerGradientColor!=null) { Color baseColor = new Color(dataToStore.headerBackgroundColor.intValue()); Dimension dim =getDimensions(resourceContext); Rectangle2D rect = @@ -163,6 +163,17 @@ } } + protected Object deserializeData(byte[] objectArray) { + Data data = new Data(); + if (objectArray != null) { + Zipper2 zipper2 = new Zipper2(objectArray); + data.headerBackgroundColor = new Integer(zipper2.nextIntColor()); + data.headerGradientColor = new Integer(zipper2.nextIntColor()); + } + + return data; + } + protected Object getDataToStore(FacesContext context, Object data) { if (baseColor == null) { return new Data(context).toByteArray(); @@ -176,17 +187,9 @@ } protected static class Data implements Serializable { - private static final String SEPARATOR = "."; - public Data() { } - public Data(byte[] data) { - Zipper2 zipper2 = new Zipper2(data); - headerBackgroundColor = new Integer(zipper2.nextIntColor()); - headerGradientColor = new Integer(zipper2.nextIntColor()); - } - protected Data(FacesContext context) { this(context, Skin.headerBackgroundColor, "headerGradientColor"); } @@ -229,9 +232,13 @@ protected Integer headerBackgroundColor; protected Integer headerGradientColor; public byte[] toByteArray() { - byte[] ret = new byte[6]; - new Zipper2(ret).addColor(headerBackgroundColor.intValue()).addColor(headerGradientColor.intValue()); - return ret; + if (headerBackgroundColor != null && headerGradientColor != null) { + byte[] ret = new byte[6]; + new Zipper2(ret).addColor(headerBackgroundColor.intValue()).addColor(headerGradientColor.intValue()); + return ret; + } else { + return null; + } } }