[richfaces-svn-commits] JBoss Rich Faces SVN: r7113 - trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images.

Author: dsvyatobatsko Date: 2008-03-24 11:07:02 -0400 (Mon, 24 Mar 2008) New Revision: 7113 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: [RF-2689] fileUpload:java.lang.NullPointerException appears in case createTempFiles init parametr is set to "false" 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-03-24 15:01:40 UTC (rev 7112) +++ trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarAnimatedBg.java 2008-03-24 15:07:02 UTC (rev 7113) @@ -148,9 +148,14 @@ private Color getColorValueParameter(FacesContext context, String name) { Color retVal = null; String color = (String) SkinFactory.getInstance().getSkin(context).getParameter(context, name); - if (color != null && !color.trim().equals("")) { + if (null == color || "".equals(color.trim())) { + color = (String) SkinFactory.getInstance().getDefaultSkin(context).getParameter(context, name); + } + + if (null != color && !"".equals(color.trim())) { retVal = HtmlColor.decode(color); } + 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-03-24 15:01:40 UTC (rev 7112) +++ trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarBg.java 2008-03-24 15:07:02 UTC (rev 7113) @@ -131,9 +131,14 @@ private Color getColorValueParameter(FacesContext context, String name) { Color retVal = null; String color = (String) SkinFactory.getInstance().getSkin(context).getParameter(context, name); - if (color != null && !color.trim().equals("")) { + if (null == color || "".equals(color.trim())) { + color = (String) SkinFactory.getInstance().getDefaultSkin(context).getParameter(context, name); + } + + if (null != color && !"".equals(color.trim())) { retVal = HtmlColor.decode(color); } + return retVal; }