[richfaces-svn-commits] JBoss Rich Faces SVN: r15801 - in root/framework/trunk/impl/src/main/java/org/richfaces: renderkit/html/images and 2 other directories.

Author: nbelaevski Date: 2009-11-01 17:52:42 -0500 (Sun, 01 Nov 2009) New Revision: 15801 Modified: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonBackgroundImage.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/InputBackgroundImage.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java root/framework/trunk/impl/src/main/java/org/richfaces/resource/TestResource2.java root/framework/trunk/impl/src/main/java/org/richfaces/skin/BaseSkinImpl.java root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinImpl.java Log: Fixed compilation errors for RFPL-196 Modified: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2009-11-01 17:10:42 UTC (rev 15800) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2009-11-01 22:52:42 UTC (rev 15801) @@ -88,7 +88,7 @@ this.headerGradientColor = headerIntColor; if (gradientTypeString == null || gradientTypeString.length() == 0) { - gradientTypeString = getValueParameter(context, Skin.gradientType); + gradientTypeString = getValueParameter(context, Skin.GRADIENT_TYPE); } this.gradientType = GradientType.getByParameter(gradientTypeString); @@ -99,8 +99,8 @@ this.width = width; this.height = height; this.gradientHeight = gradientHeight; - this.baseColor = baseColor != null ? baseColor : Skin.headerBackgroundColor; - this.gradientColor = gradientColor != null ? gradientColor : Skin.headerGradientColor; + this.baseColor = baseColor != null ? baseColor : Skin.HEADER_BACKGROUND_COLOR; + this.gradientColor = gradientColor != null ? gradientColor : Skin.HEADER_GRADIENT_COLOR; this.horizontal = horizontal; initialize(); Modified: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java 2009-11-01 17:10:42 UTC (rev 15800) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java 2009-11-01 22:52:42 UTC (rev 15801) @@ -59,7 +59,7 @@ public CustomizeableGradient() { super(ImageType.PNG); - String gradientTypeString = safeTrim(getValueParameter(FacesContext.getCurrentInstance(), Skin.gradientType)); + String gradientTypeString = safeTrim(getValueParameter(FacesContext.getCurrentInstance(), Skin.GRADIENT_TYPE)); if (gradientTypeString != null && gradientTypeString.length() != 0) { gradientType = GradientType.getByParameter(gradientTypeString); } Modified: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2009-11-01 17:10:42 UTC (rev 15800) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2009-11-01 22:52:42 UTC (rev 15801) @@ -44,7 +44,7 @@ private Dimension dimension = null; //TODO - lazy initialize? - private Integer height = getHeight(FacesContext.getCurrentInstance(), Skin.generalSizeFont); + private Integer height = getHeight(FacesContext.getCurrentInstance(), Skin.GENERAL_SIZE_FONT); public BaseControlBackgroundImage(String baseColor, String gradientColor, int width) { super(width, -1, baseColor, gradientColor); Modified: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonBackgroundImage.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonBackgroundImage.java 2009-11-01 17:10:42 UTC (rev 15800) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/ButtonBackgroundImage.java 2009-11-01 22:52:42 UTC (rev 15801) @@ -31,6 +31,6 @@ public class ButtonBackgroundImage extends BaseControlBackgroundImage { public ButtonBackgroundImage() { - super(Skin.headerGradientColor, Skin.headerBackgroundColor, 1); + super(Skin.HEADER_GRADIENT_COLOR, Skin.HEADER_BACKGROUND_COLOR, 1); } } Modified: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/InputBackgroundImage.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/InputBackgroundImage.java 2009-11-01 17:10:42 UTC (rev 15800) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/InputBackgroundImage.java 2009-11-01 22:52:42 UTC (rev 15801) @@ -32,7 +32,7 @@ public class InputBackgroundImage extends BaseControlBackgroundImage { public InputBackgroundImage() { - super(Skin.additionalBackgroundColor, Skin.controlBackgroundColor, 2000); + super(Skin.ADDITIONAL_BACKGROUND_COLOR, Skin.CONTROL_BACKGROUND_COLOR, 2000); } } Modified: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java 2009-11-01 17:10:42 UTC (rev 15800) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonBgImage.java 2009-11-01 22:52:42 UTC (rev 15801) @@ -28,11 +28,11 @@ public class StandardButtonBgImage extends BaseControlBackgroundImage { public StandardButtonBgImage() { - super(Skin.additionalBackgroundColor, "trimColor", 9); + super(Skin.ADDITIONAL_BACKGROUND_COLOR, "trimColor", 9); } protected Integer getHeight(FacesContext context) { - return (int) (1.7 * super.getHeight(context, Skin.buttonSizeFont)); + return (int) (1.7 * super.getHeight(context, Skin.BUTTON_SIZE_FONT)); } } Modified: root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java 2009-11-01 17:10:42 UTC (rev 15800) +++ root/framework/trunk/impl/src/main/java/org/richfaces/renderkit/html/images/StandardButtonPressedBgImage.java 2009-11-01 22:52:42 UTC (rev 15801) @@ -28,11 +28,11 @@ public class StandardButtonPressedBgImage extends BaseControlBackgroundImage { public StandardButtonPressedBgImage() { - super("trimColor", Skin.additionalBackgroundColor, 9); + super("trimColor", Skin.ADDITIONAL_BACKGROUND_COLOR, 9); } protected Integer getHeight(FacesContext context) { - return (int) (1.7 * super.getHeight(context, Skin.buttonSizeFont)); + return (int) (1.7 * super.getHeight(context, Skin.BUTTON_SIZE_FONT)); } } Modified: root/framework/trunk/impl/src/main/java/org/richfaces/resource/TestResource2.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/resource/TestResource2.java 2009-11-01 17:10:42 UTC (rev 15800) +++ root/framework/trunk/impl/src/main/java/org/richfaces/resource/TestResource2.java 2009-11-01 22:52:42 UTC (rev 15801) @@ -48,7 +48,7 @@ super(ImageType.PNG); FacesContext context = FacesContext.getCurrentInstance(); Skin skin = SkinFactory.getInstance().getSkin(context); - Object parameter = skin.getParameter(context, Skin.headerGradientColor); + Object parameter = skin.getParameter(context, Skin.HEADER_GRADIENT_COLOR); this.color = HtmlColor.decode(parameter.toString()); } Modified: root/framework/trunk/impl/src/main/java/org/richfaces/skin/BaseSkinImpl.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/skin/BaseSkinImpl.java 2009-11-01 17:10:42 UTC (rev 15800) +++ root/framework/trunk/impl/src/main/java/org/richfaces/skin/BaseSkinImpl.java 2009-11-01 22:52:42 UTC (rev 15801) @@ -41,7 +41,7 @@ } protected Skin getBaseSkin(FacesContext context) { - Object object = getLocalParameter(context, Skin.baseSkin); + Object object = getLocalParameter(context, Skin.BASE_SKIN); Skin skin = null; if (object != null) { Modified: root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinImpl.java =================================================================== --- root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinImpl.java 2009-11-01 17:10:42 UTC (rev 15800) +++ root/framework/trunk/impl/src/main/java/org/richfaces/skin/SkinImpl.java 2009-11-01 22:52:42 UTC (rev 15801) @@ -41,7 +41,7 @@ } protected Skin getBaseSkin(FacesContext context) { - Object object = getLocalParameter(context, Skin.baseSkin); + Object object = getLocalParameter(context, Skin.BASE_SKIN); Skin skin = null; if (object != null) {