You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2010/11/18 17:59:26 UTC

svn commit: r1036529 - /myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java

Author: lofwyr
Date: Thu Nov 18 16:59:26 2010
New Revision: 1036529

URL: http://svn.apache.org/viewvc?rev=1036529&view=rev
Log:
prevent NullPointerException when there is no label set

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java?rev=1036529&r1=1036528&r2=1036529&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeSelectRenderer.java Thu Nov 18 16:59:26 2010
@@ -17,6 +17,7 @@ package org.apache.myfaces.tobago.render
  * limitations under the License.
  */
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.myfaces.tobago.component.UITreeSelect;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -51,12 +52,15 @@ public class TreeSelectRenderer extends 
     writer.endElement(HtmlElements.INPUT);
 
     // label
-    writer.startElement(HtmlElements.LABEL, null);
-    writer.writeClassAttribute(Classes.create(select, "label"));
-    HtmlRendererUtils.renderTip(select, writer);
-    writer.writeAttribute(HtmlAttributes.FOR, id, false);
-    writer.writeText(select.getLabel());
-    writer.endElement(HtmlElements.LABEL);
+    final String label = select.getLabel();
+    if (StringUtils.isNotEmpty(label)) {
+      writer.startElement(HtmlElements.LABEL, null);
+      writer.writeClassAttribute(Classes.create(select, "label"));
+      HtmlRendererUtils.renderTip(select, writer);
+      writer.writeAttribute(HtmlAttributes.FOR, id, false);
+      writer.writeText(label);
+      writer.endElement(HtmlElements.LABEL);
+    }
   }
 
   @Override