[richfaces-svn-commits] JBoss Rich Faces SVN: r13852 - trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit.
Author: pyaschenko
Date: 2009-04-25 08:38:26 -0400 (Sat, 25 Apr 2009)
New Revision: 13852
Modified:
trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java
Log:
https://jira.jboss.org/jira/browse/RF-6751
Modified:
trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java
===================================================================
---
trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2009-04-25
11:26:25 UTC (rev 13851)
+++
trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/AbstractProgressBarRenderer.java 2009-04-25
12:38:26 UTC (rev 13852)
@@ -395,6 +395,7 @@
String initialClass = (String) component.getAttributes().get(
"initialClass");
String style = (String) component.getAttributes().get("style");
+ if (null==style) style="";
ResponseWriter writer = context.getResponseWriter();
writer.startElement(HTML.DIV_ELEM, component);
getUtils().writeAttribute(writer, HTML.class_ATTRIBUTE, initialClass);
@@ -431,6 +432,8 @@
String clientId = component.getClientId(context);
String styleClass = (String) variables.getVariable("styleClass");
boolean isSimple = isSimpleMarkup(component);
+ String style = (String) component.getAttributes().get("style");
+ if (null==style) style="";
String shellClass = (!isSimple) ? "rich-progress-bar-shell-dig "
: "rich-progress-bar-shell ";
writer.startElement("div", component);
@@ -444,8 +447,7 @@
getUtils().writeAttribute(
writer,
"style",
- variables.getVariable("style")
- + (!isAjaxMode ? "display: none" : ""));
+ style + (!isAjaxMode ? "display: none" : ""));
getUtils().encodePassThruWithExclusions(context, component, "onsubmit");
encodeProgressBar(context, component, isSimple);
if (isAjaxMode) {
@@ -478,6 +480,7 @@
String width = String.valueOf(value.intValue());
String style = (String) component.getAttributes().get("style");
+ if (null==style) style="";
String completeClass = (String) component.getAttributes().get(
"completeClass");
@@ -648,6 +651,7 @@
String finishClass = (String) component.getAttributes().get(
"finishClass");
String style = (String) component.getAttributes().get("style");
+ if (null==style) style="";
ResponseWriter writer = context.getResponseWriter();
writer.startElement(HTML.DIV_ELEM, component);
writer.writeAttribute(HTML.id_ATTRIBUTE, (isAjaxMode) ? clientId