[richfaces-svn-commits] JBoss Rich Faces SVN: r2434 - in trunk/ui: inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons and 4 other directories.

Author: abelevich Date: 2007-08-23 09:46:39 -0400 (Thu, 23 Aug 2007) New Revision: 2434 Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/CalendarIcon.java trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonImage.java trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/iconimages/ScrollableDataTableIconBasic.java trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/ToolBarSeparatorImage.java Log: done task RF-665 Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/CalendarIcon.java =================================================================== --- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/CalendarIcon.java 2007-08-23 13:45:18 UTC (rev 2433) +++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/CalendarIcon.java 2007-08-23 13:46:39 UTC (rev 2434) @@ -40,7 +40,6 @@ import org.ajax4jsf.resource.Java2Dresource; import org.ajax4jsf.resource.ResourceContext; import org.ajax4jsf.util.HtmlColor; -import org.ajax4jsf.util.Zipper; import org.ajax4jsf.util.Zipper2; import org.richfaces.skin.Skin; import org.richfaces.skin.SkinFactory; @@ -87,6 +86,10 @@ if (null == headerTextColor || "".equals(headerTextColor)) headerTextColor = (String) defaultSkin.getParameter(context, skinParameter); + if (headerTextColor == null) { + return null; + } + byte[] ret = new byte[6]; Zipper2 zipper2 = new Zipper2(ret).addColor(HtmlColor.decode(headerTextColor).getRGB()); @@ -95,98 +98,112 @@ if (null == headerBackgroundColor || "".equals(headerBackgroundColor)) headerBackgroundColor = (String) defaultSkin.getParameter(context, skinParameter); + if(headerBackgroundColor == null){ + return null; + } + zipper2.addColor(HtmlColor.decode(headerBackgroundColor).getRGB()); return ret; } protected Object deserializeData(byte[] objectArray) { + if (objectArray == null) { + return null; + } + Object[] colors = new Object[2]; Zipper2 z = new Zipper2(objectArray); colors[0] = z.nextColor(); colors[1] = z.nextColor(); + return colors; } public void paint(ResourceContext context, Graphics2D graphics) { Object[] stored = (Object[]) restoreData(context); - Dimension dim = getDimensions(context); - BufferedImage image = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB); - Graphics2D g2d = image.createGraphics(); + if (stored != null) { - Color borderColor = (Color) stored[0];//new Color(((Integer) stored[0]).intValue()); - Color activeColor = (Color) stored[1];//new Color(((Integer) stored[1]).intValue()); - + Dimension dim = getDimensions(context); + BufferedImage image = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); + Graphics2D g2d = image.createGraphics(); + + Color borderColor = (Color) stored[0];//new Color(((Integer) stored[0]).intValue()); + Color activeColor = (Color) stored[1];//new Color(((Integer) stored[1]).intValue()); + + + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); + + g2d.setStroke(new BasicStroke(1)); + + int w = 16; + int h = 16; + + + //Draw Border + g2d.setColor(borderColor); + Rectangle2D border = new Rectangle2D.Double(1, 1, w - 3, h - 3); + RoundRectangle2D round = new RoundRectangle2D.Double(1, 1, w- 3, h - 3, 2, 2); + g2d.draw(round); + + Color lightBlue = new Color(216, 226, 240); + Paint gradient1 = new GradientPaint(w-4, h-4, lightBlue, 2, 2, Color.white); + g2d.setPaint(gradient1); + border = new Rectangle2D.Double(2, 2, w - 4, h - 4); + g2d.fill(border); + + border = new Rectangle2D.Double(3, 3, w - 6, h - 6); + gradient1 = new GradientPaint(3, 3, lightBlue , w - 6, h - 6, borderColor); + g2d.setPaint(gradient1); + g2d.fill(border); + + g2d.setColor(Color.white); + g2d.drawLine(3, 6, 3, 11); + g2d.drawLine(5, 6, 5, 11); + g2d.drawLine(7, 6, 7, 11); + g2d.drawLine(9, 6, 9, 11); + g2d.drawLine(11, 6, 11, 11); + + + + + + //Draw orange rectangle + border = new Rectangle2D.Double(3, 3, 10, 3); + g2d.setColor(Color.white); + g2d.fill(border); + + Color c = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 100); + Color c2 = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 200); + + gradient1 = new GradientPaint(12, 4, activeColor, 4, 7, c2); + g2d.setPaint(gradient1); + g2d.fill(border); + //g2d.setColor(activeColor); + + c = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 150); + c2 = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 200); + border = new Rectangle2D.Double(4, 4, 8, 1); + + g2d.setColor(Color.white); + g2d.fill(border); + + gradient1 = new GradientPaint(4, 4, c, 10, 4, c2); + //g2d.setPaint(gradient1); + g2d.setColor(c); + g2d.fill(border); + + g2d.dispose(); + + graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); + graphics.drawImage(image, 0, 0, dim.width, dim.height, null); + + } - g2d.setStroke(new BasicStroke(1)); - - int w = 16; - int h = 16; - - - //Draw Border - g2d.setColor(borderColor); - Rectangle2D border = new Rectangle2D.Double(1, 1, w - 3, h - 3); - RoundRectangle2D round = new RoundRectangle2D.Double(1, 1, w- 3, h - 3, 2, 2); - g2d.draw(round); - - Color lightBlue = new Color(216, 226, 240); - Paint gradient1 = new GradientPaint(w-4, h-4, lightBlue, 2, 2, Color.white); - g2d.setPaint(gradient1); - border = new Rectangle2D.Double(2, 2, w - 4, h - 4); - g2d.fill(border); - - border = new Rectangle2D.Double(3, 3, w - 6, h - 6); - gradient1 = new GradientPaint(3, 3, lightBlue , w - 6, h - 6, borderColor); - g2d.setPaint(gradient1); - g2d.fill(border); - - g2d.setColor(Color.white); - g2d.drawLine(3, 6, 3, 11); - g2d.drawLine(5, 6, 5, 11); - g2d.drawLine(7, 6, 7, 11); - g2d.drawLine(9, 6, 9, 11); - g2d.drawLine(11, 6, 11, 11); - - - - - - //Draw orange rectangle - border = new Rectangle2D.Double(3, 3, 10, 3); - g2d.setColor(Color.white); - g2d.fill(border); - - Color c = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 100); - Color c2 = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 200); - - gradient1 = new GradientPaint(12, 4, activeColor, 4, 7, c2); - g2d.setPaint(gradient1); - g2d.fill(border); - //g2d.setColor(activeColor); - - c = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 150); - c2 = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 200); - border = new Rectangle2D.Double(4, 4, 8, 1); - - g2d.setColor(Color.white); - g2d.fill(border); - - gradient1 = new GradientPaint(4, 4, c, 10, 4, c2); - //g2d.setPaint(gradient1); - g2d.setColor(c); - g2d.fill(border); - - g2d.dispose(); - - graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); - graphics.drawImage(image, 0, 0, dim.width, dim.height, null); - } } Modified: trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonImage.java =================================================================== --- trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonImage.java 2007-08-23 13:45:18 UTC (rev 2433) +++ trunk/ui/inputnumber-spinner/src/main/java/org/richfaces/renderkit/html/images/buttons/SpinnerButtonImage.java 2007-08-23 13:46:39 UTC (rev 2434) @@ -41,6 +41,10 @@ } protected Object deserializeData(byte[] objectArray) { + if (objectArray == null) { + return null; + } + return new Integer(new Zipper2(objectArray).nextIntColor()); } @@ -48,15 +52,16 @@ Skin skin = SkinFactory.getInstance().getSkin(context); String skinParameter = "headerTextColor"; - String tmp = (String) skin.getParameter(context, skinParameter); - if (null == tmp || "".equals(tmp)) { + String headerTextColor = (String) skin.getParameter(context, skinParameter); + if (null == headerTextColor || "".equals(headerTextColor)) { Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context); - tmp = (String) defaultSkin.getParameter(context, skinParameter); + headerTextColor = (String) defaultSkin.getParameter(context, skinParameter); } - int intValue = HtmlColor.decode( tmp ==null? "#000000":tmp ).getRGB(); + int intValue = HtmlColor.decode( headerTextColor == null ? "#000000":headerTextColor ).getRGB(); byte[] ret = new byte[3]; new Zipper2(ret).addColor(intValue); + return ret; } Modified: trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java =================================================================== --- trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-08-23 13:45:18 UTC (rev 2433) +++ trunk/ui/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-08-23 13:46:39 UTC (rev 2434) @@ -14,7 +14,6 @@ import org.ajax4jsf.resource.Java2Dresource; import org.ajax4jsf.resource.ResourceContext; import org.ajax4jsf.util.HtmlColor; -import org.ajax4jsf.util.Zipper; import org.ajax4jsf.util.Zipper2; import org.richfaces.skin.Skin; import org.richfaces.skin.SkinFactory; @@ -36,10 +35,15 @@ } protected Object deserializeData(byte[] objectArray) { + if (objectArray == null) { + return null; + } + MenuNodeImageData mnd = new MenuNodeImageData(); Zipper2 zipper2 = new Zipper2(objectArray); mnd.setGeneralColor(new Integer(zipper2.nextIntColor())); mnd.setDisabledColor(new Integer(zipper2.nextIntColor())); + return mnd; } @@ -52,11 +56,14 @@ String skinParameter = "generalTextColor"; tmp = (String) skin.getParameter(context, skinParameter); + if (null == tmp || "".equals(tmp)) { tmp = (String) defaultSkin.getParameter(context, skinParameter); } + if (tmp == null || "".equals(tmp)) tmp = "#4A75B5"; + intValue = HtmlColor.decode(tmp).getRGB(); byte[] ret = new byte[6]; @@ -78,24 +85,30 @@ protected void paint(ResourceContext context, Graphics2D g2d) { MenuNodeImageData mnd = (MenuNodeImageData) restoreData(context); - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - int x0 = 6; - int y0 = 8; - - g2d.setColor(new Color(mnd.getGeneralColor().intValue())); - g2d.drawLine(x0, y0 - 3, x0, y0 +3); - g2d.drawLine(x0 + 1, y0 - 2, x0 + 1, y0 + 2); - g2d.drawLine(x0 + 2, y0 - 1, x0 + 2, y0 + 1); - g2d.drawLine(x0 + 3, y0, x0 + 3, y0); - - int y1 = 24; - - g2d.setColor(new Color(mnd.getDisabledColor().intValue())); - g2d.drawLine(x0, y1 - 3, x0, y1 +3); - g2d.drawLine(x0 + 1, y1 - 2, x0 + 1, y1 + 2); - g2d.drawLine(x0 + 2, y1 - 1, x0 + 2, y1 + 1); - g2d.drawLine(x0 + 3, y1, x0 + 3, y1); + if (mnd != null) { + + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + + int x0 = 6; + int y0 = 8; + + g2d.setColor(new Color(mnd.getGeneralColor().intValue())); + g2d.drawLine(x0, y0 - 3, x0, y0 +3); + g2d.drawLine(x0 + 1, y0 - 2, x0 + 1, y0 + 2); + g2d.drawLine(x0 + 2, y0 - 1, x0 + 2, y0 + 1); + g2d.drawLine(x0 + 3, y0, x0 + 3, y0); + + int y1 = 24; + + g2d.setColor(new Color(mnd.getDisabledColor().intValue())); + g2d.drawLine(x0, y1 - 3, x0, y1 +3); + g2d.drawLine(x0 + 1, y1 - 2, x0 + 1, y1 + 2); + g2d.drawLine(x0 + 2, y1 - 1, x0 + 2, y1 + 1); + g2d.drawLine(x0 + 3, y1, x0 + 3, y1); + + } + } Modified: trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/iconimages/ScrollableDataTableIconBasic.java =================================================================== --- trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/iconimages/ScrollableDataTableIconBasic.java 2007-08-23 13:45:18 UTC (rev 2433) +++ trunk/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/iconimages/ScrollableDataTableIconBasic.java 2007-08-23 13:46:39 UTC (rev 2434) @@ -30,9 +30,14 @@ } protected Object deserializeData(byte[] objectArray) { + if (objectArray == null) { + return null; + } + Object [] stored = new Object[2]; stored[0] = new Color(Zipper.unzip(objectArray, 0)); stored[1] = new Color(Zipper.unzip(objectArray, 3)); + return stored; } @@ -49,6 +54,11 @@ String headerTextColor = (String) skin.getParameter(context, skinParameter); if (null == headerTextColor || "".equals(headerTextColor)) headerTextColor = (String) defaultSkin.getParameter(context, skinParameter); + + if (headerTextColor == null) { + return null; + } + col = HtmlColor.decode(headerTextColor); byte[] ret = new byte[6]; @@ -58,6 +68,11 @@ String headerBackgroundColor = (String) skin.getParameter(context, skinParameter); if (null == headerBackgroundColor || "".equals(headerBackgroundColor)) headerBackgroundColor = (String) defaultSkin.getParameter(context, skinParameter); + + if (headerBackgroundColor == null) { + return null; + } + col = HtmlColor.decode(headerBackgroundColor); Zipper.zip(ret, col.getRGB(), 3); Modified: trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java =================================================================== --- trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java 2007-08-23 13:45:18 UTC (rev 2433) +++ trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/BevelSeparatorImage.java 2007-08-23 13:46:39 UTC (rev 2434) @@ -39,7 +39,6 @@ import org.ajax4jsf.resource.ResourceContext; import org.ajax4jsf.util.HtmlColor; import org.ajax4jsf.util.HtmlDimensions; -import org.ajax4jsf.util.Zipper; import org.ajax4jsf.util.Zipper2; import org.richfaces.component.UISeparator; import org.richfaces.skin.Skin; @@ -69,73 +68,83 @@ protected void paint(ResourceContext context, Graphics2D g2d) { SeparatorData stored = (SeparatorData) restoreData(context); - Color bg = new Color(stored.getBgColor()); - Color grad = new Color(stored.getGradColor()); - float [] grads = grad.getRGBComponents(null); - int level3D = (stored.getLevel3D()); - Dimension dim = calculateDimensions(stored); - float height = (float) dim.getHeight(); - float width = (float) dim.getWidth(); - - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); - - Rectangle2D rect = new Rectangle2D.Double(0.0, 0.0, width, height); - g2d.setColor(bg); - g2d.fill(rect); - - if (level3D > 0) { - g2d.translate(0d, height / 18d); - // Vertical cradient. - float verticalOpacity = ((float) (level3D + 1) * 0.1f); - if (verticalOpacity < 0) { - verticalOpacity = 0; - } else if (verticalOpacity > 1) { - verticalOpacity = 1; - } - g2d.setPaint( - new GradientPaint( - width / 2, - 0f, - new Color( - grads[0], - grads[1], - grads[2], - verticalOpacity), - width / 2, - height / 2, - new Color( - 1f, - 1f, - 1f, - 0f))); - g2d.fill(rect); - verticalOpacity = ((float) (level3D - 1) * 0.1f); - if (verticalOpacity < 0) { - verticalOpacity = 0; - } else if (verticalOpacity > 1) { - verticalOpacity = 1; - } - //XXX by nick - fantonov - get rid of get*() - store values in local var - g2d.setPaint(new GradientPaint(width / 2, height / 2, new Color(1f, 1f, 1f, 0f), - width / 2, height * 0.75f, new Color(grads[0], grads[1], grads[2], verticalOpacity), true)); - Shape currentClip = g2d.getClip(); - Rectangle2D.Double clipRect = new Rectangle2D.Double(0, height / 2, width * 2, height); - g2d.setClip(clipRect); - g2d.fill(rect); - g2d.setClip(currentClip); + + if(stored != null) { + + Color bg = new Color(stored.getBgColor()); + Color grad = new Color(stored.getGradColor()); + float [] grads = grad.getRGBComponents(null); + int level3D = (stored.getLevel3D()); + Dimension dim = calculateDimensions(stored); + float height = (float) dim.getHeight(); + float width = (float) dim.getWidth(); + + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); + g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_ENABLE); + + Rectangle2D rect = new Rectangle2D.Double(0.0, 0.0, width, height); + g2d.setColor(bg); + g2d.fill(rect); + + if (level3D > 0) { + g2d.translate(0d, height / 18d); + // Vertical cradient. + float verticalOpacity = ((float) (level3D + 1) * 0.1f); + if (verticalOpacity < 0) { + verticalOpacity = 0; + } else if (verticalOpacity > 1) { + verticalOpacity = 1; + } + g2d.setPaint( + new GradientPaint( + width / 2, + 0f, + new Color( + grads[0], + grads[1], + grads[2], + verticalOpacity), + width / 2, + height / 2, + new Color( + 1f, + 1f, + 1f, + 0f))); + g2d.fill(rect); + verticalOpacity = ((float) (level3D - 1) * 0.1f); + if (verticalOpacity < 0) { + verticalOpacity = 0; + } else if (verticalOpacity > 1) { + verticalOpacity = 1; + } + //XXX by nick - fantonov - get rid of get*() - store values in local var + g2d.setPaint(new GradientPaint(width / 2, height / 2, new Color(1f, 1f, 1f, 0f), + width / 2, height * 0.75f, new Color(grads[0], grads[1], grads[2], verticalOpacity), true)); + Shape currentClip = g2d.getClip(); + Rectangle2D.Double clipRect = new Rectangle2D.Double(0, height / 2, width * 2, height); + g2d.setClip(clipRect); + g2d.fill(rect); + g2d.setClip(currentClip); + } + } } protected Object deserializeData(byte[] objectArray) { + if (objectArray == null) { + return null; + } + SeparatorData separatorData = new SeparatorData(); Zipper2 zipper2 = new Zipper2(objectArray); separatorData.setHeight(zipper2.nextShort()); separatorData.setLevel3D(zipper2.nextShort()); separatorData.setBgColor(zipper2.nextIntColor()); separatorData.setGradColor(zipper2.nextIntColor()); + return separatorData; } Modified: trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java =================================================================== --- trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java 2007-08-23 13:45:18 UTC (rev 2433) +++ trunk/ui/separator/src/main/java/org/richfaces/renderkit/html/images/SimpleSeparatorImage.java 2007-08-23 13:46:39 UTC (rev 2434) @@ -37,7 +37,6 @@ import org.ajax4jsf.resource.ResourceContext; import org.ajax4jsf.util.HtmlColor; import org.ajax4jsf.util.HtmlDimensions; -import org.ajax4jsf.util.Zipper; import org.ajax4jsf.util.Zipper2; import org.richfaces.component.UISeparator; import org.richfaces.skin.Skin; @@ -106,11 +105,16 @@ } protected Object deserializeData(byte[] objectArray) { + if(objectArray == null){ + return null; + } + SimpleSeparatorData separatorData = new SimpleSeparatorData(); Zipper2 zipper2 = new Zipper2(objectArray); separatorData.setHeight(zipper2.nextShort()); separatorData.setColor(zipper2.nextIntColor()); separatorData.setLineType(zipper2.nextByte()); + return separatorData; } Modified: trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/ToolBarSeparatorImage.java =================================================================== --- trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/ToolBarSeparatorImage.java 2007-08-23 13:45:18 UTC (rev 2433) +++ trunk/ui/toolBar/src/main/java/org/richfaces/renderkit/html/images/ToolBarSeparatorImage.java 2007-08-23 13:46:39 UTC (rev 2434) @@ -50,6 +50,10 @@ } protected Object deserializeData(byte[] objectArray) { + if (objectArray == null) { + return null; + } + SeparatorData separatorData = new SeparatorData(); Zipper2 zipper2 = new Zipper2(objectArray); separatorData.setHeaderBackgroundColor(zipper2.nextIntColor());