Author: nbelaevski Date: 2008-05-14 12:04:09 -0400 (Wed, 14 May 2008) New Revision: 8581 Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/GradientType.java Log: CustomizeableGradient refactoring & trimming for parameter values added 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 2008-05-14 15:49:12 UTC (rev 8580) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/BaseGradient.java 2008-05-14 16:04:09 UTC (rev 8581) @@ -244,7 +244,7 @@ gradientTypeString = getValueParameter(context, Skin.gradientType); } - data.setGradientType(GradientType.getBySkinParameter(gradientTypeString)); + data.setGradientType(GradientType.getByParameter(gradientTypeString)); } protected Object getDataToStore(FacesContext context, Object data) { Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java 2008-05-14 15:49:12 UTC (rev 8580) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/CustomizeableGradient.java 2008-05-14 16:04:09 UTC (rev 8581) @@ -190,6 +190,10 @@ return null; } } + + protected static String safeTrim(String s) { + return s != null ? s.trim() : null; + } protected Object getDataToStore(FacesContext context, Object parameterData) { Data data = new Data(); @@ -204,8 +208,8 @@ if (parameterData instanceof Map<?, ?>) { Map<?, ?> map = (Map<?, ?>) parameterData; - gradientTypeString = (String) map.get(Skin.gradientType); - alignmentString = (String) map.get("valign"); + gradientTypeString = safeTrim((String) map.get(Skin.gradientType)); + alignmentString = safeTrim((String) map.get("valign")); baseIntColor = decodeColor((String) map.get("baseColor")); gradientIntColor = decodeColor((String) map.get("gradientColor")); gradientHeight = decodeHeight((String) map.get("gradientHeight")); @@ -224,10 +228,10 @@ data.setGradientHeight(gradientHeight); if (gradientTypeString == null || gradientTypeString.length() == 0) { - gradientTypeString = getValueParameter(context, Skin.gradientType); + gradientTypeString = safeTrim(getValueParameter(context, Skin.gradientType)); } - data.setGradientType(GradientType.getBySkinParameter(gradientTypeString)); + data.setGradientType(GradientType.getByParameter(gradientTypeString)); data.setGradientAlignment(GradientAlignment.getByParameter(alignmentString)); return data.toByteArray(); Modified: trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/GradientType.java =================================================================== --- trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/GradientType.java 2008-05-14 15:49:12 UTC (rev 8580) +++ trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/GradientType.java 2008-05-14 16:04:09 UTC (rev 8581) @@ -91,7 +91,7 @@ }; - public static final GradientType getBySkinParameter(String string) { + public static final GradientType getByParameter(String string) { if (string == null || string.length() == 0) { return PLAIN; }