Author: dsvyatobatsko Date: 2008-04-08 06:38:55 -0400 (Tue, 08 Apr 2008) New Revision: 7657 Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarAnimatedBg.java trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarBg.java Log: animation resource fix + attempt to fix http://jira.jboss.com/jira/browse/RF-2948 Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarAnimatedBg.java =================================================================== --- trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarAnimatedBg.java 2008-04-08 10:38:32 UTC (rev 7656) +++ trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarAnimatedBg.java 2008-04-08 10:38:55 UTC (rev 7657) @@ -83,9 +83,8 @@ @Override protected void paint(ResourceContext context, Graphics2D g2d, int frameIndex) { - if (mainStage == null) { - mainStage = createMainStage(context); - } + restoreData(context); + mainStage = createMainStage(context); BufferedImage frame = mainStage.getSubimage(0, 48 - frameIndex * 2, frameSize.width, frameSize.height); g2d.drawImage(frame, null, null); // paint a shadow in the form of semi-transparent gradient @@ -122,12 +121,8 @@ * @see InternetResourceBase#getDataToStore(FacesContext, Object) */ protected Object getDataToStore(FacesContext context, Object data) { - byte[] retVal = null; - if (progressbarBasicColor == null) { - progressbarBasicColor = getColorValueParameter(context, "selectControlColor"); - } - - retVal = new byte[3 * 1]; + byte[] retVal = new byte[3 * 1]; + progressbarBasicColor = getColorValueParameter(context, "selectControlColor"); new Zipper2(retVal).addColor(progressbarBasicColor); return retVal; Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarBg.java =================================================================== --- trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarBg.java 2008-04-08 10:38:32 UTC (rev 7656) +++ trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarBg.java 2008-04-08 10:38:55 UTC (rev 7657) @@ -84,6 +84,7 @@ * </p> */ protected void paint(ResourceContext context, Graphics2D g2d) { + restoreData(context); Color progressbarBackgroundColor = progressbarBasicColor; Color progressbarSpiralColor = adjustLightness(progressbarBasicColor, 0.2f); Color progressbarShadowStartColor = overwriteAlpha(adjustLightness(progressbarBasicColor, 0.7f), 0.6f); @@ -105,12 +106,8 @@ * @see InternetResourceBase#getDataToStore(FacesContext, Object) */ protected Object getDataToStore(FacesContext context, Object data) { - byte[] retVal = null; - if (progressbarBasicColor == null) { - progressbarBasicColor = getColorValueParameter(context, "selectControlColor"); - } - - retVal = new byte[3 * 1]; + byte[] retVal = new byte[3 * 1]; + progressbarBasicColor = getColorValueParameter(context, "selectControlColor"); new Zipper2(retVal).addColor(progressbarBasicColor); return retVal;