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 2007/12/21 16:56:19 UTC
svn commit: r606226 -
/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
Author: lofwyr
Date: Fri Dec 21 07:56:16 2007
New Revision: 606226
URL: http://svn.apache.org/viewvc?rev=606226&view=rev
Log:
prevent NPE when label is empty
Modified:
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java?rev=606226&r1=606225&r2=606226&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java Fri Dec 21 07:56:16 2007
@@ -357,7 +357,10 @@
UIMenuCommand menuItem = (UIMenuCommand) application.createComponent(UIMenuCommand.COMPONENT_TYPE);
menuItem.setRendererType("MenuCommand");
menuItem.getAttributes().put(ATTR_ONCLICK, onclick);
- menuItem.getAttributes().put(ATTR_LABEL, tab.getAttributes().get(ATTR_LABEL));
+ Object label2 = tab.getAttributes().get(ATTR_LABEL);
+ if (label2 != null) {
+ menuItem.getAttributes().put(ATTR_LABEL, label2);
+ }
menu.getChildren().add(menuItem);
}