Author: sergeyhalipov Date: 2007-11-16 07:52:31 -0500 (Fri, 16 Nov 2007) New Revision: 4034 Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java Log: Ordering list - added Zipper2 class to images. Modified: trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java =================================================================== --- trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java 2007-11-16 11:40:05 UTC (rev 4033) +++ trunk/sandbox/ui/orderingList/src/main/java/org/richfaces/renderkit/html/images/OrderingListIconBase.java 2007-11-16 12:52:31 UTC (rev 4034) @@ -34,6 +34,7 @@ import org.ajax4jsf.resource.Java2Dresource; import org.ajax4jsf.resource.ResourceContext; import org.ajax4jsf.util.HtmlColor; +import org.ajax4jsf.util.Zipper2; import org.richfaces.skin.Skin; import org.richfaces.skin.SkinFactory; @@ -68,10 +69,10 @@ protected void paint(ResourceContext context, Graphics2D g2d) { - int [] data = (int[]) restoreData(context); - Color textColor = new Color(data[0]); - Color backgroundColor = new Color(data[1]); - Color borderColor = new Color(data[2]); + Color [] data = (Color[]) restoreData(context); + Color textColor = data[0]; + Color backgroundColor = 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); @@ -113,9 +114,10 @@ Skin skin = SkinFactory.getInstance().getSkin(context); Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context); - int [] ret = new int[3]; + byte [] ret = new byte[9]; Color color = null; + Zipper2 zipper = new Zipper2(ret); String color1 = (String) skin.getParameter(context, colorSkinParam); if (null == color1 || "".equals(color1)) @@ -127,7 +129,7 @@ color = HtmlColor.decode(color1); - ret[0] = color.getRGB(); + zipper.addColor(color); String color2 = (String) skin.getParameter(context, backgroundSkinParam); if (null == color2 || "".equals(color2)) @@ -138,7 +140,7 @@ } color = HtmlColor.decode(color2); - ret[1] = color.getRGB(); + zipper.addColor(color); String color3 = (String) skin.getParameter(context, borderSkinParam); if (null == color3 || "".equals(color3)) @@ -149,11 +151,22 @@ } color = HtmlColor.decode(color3); - ret[2] = color.getRGB(); + zipper.addColor(color); return ret; } + @Override + protected Object deserializeData(byte[] objectArray) { + if (objectArray == null) { + return null; + } + + Zipper2 zipper = new Zipper2(objectArray); + + return new Color[] {zipper.nextColor(), zipper.nextColor(), zipper.nextColor()}; + } + public boolean isCacheable() { return true; }