You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/01/16 23:17:51 UTC
svn commit: r612591 -
/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
Author: lu4242
Date: Wed Jan 16 14:17:49 2008
New Revision: 612591
URL: http://svn.apache.org/viewvc?rev=612591&view=rev
Log:
Fixes MYFACES-1790 HtmlColumnTag.getComponentType returns the wrong value (JSR-252 issue 4 related)
Modified:
myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?rev=612591&r1=612590&r2=612591&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Wed Jan 16 14:17:49 2008
@@ -25,6 +25,7 @@
import org.apache.myfaces.shared.util.ArrayUtils;
import org.apache.myfaces.shared.util.StringUtils;
+import javax.el.ValueExpression;
import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
import javax.faces.component.UIData;
@@ -826,6 +827,23 @@
styleClass = column.getHeaderClass();
else if (!isHeader && column.getFooterClass()!=null)
styleClass = column.getFooterClass();
+ }else{
+ //This code corrects MYFACES-1790, because HtmlColumnTag
+ //has as component type javax.faces.Column, so as side
+ //effect it not create HtmlColumn, it create UIColumn
+ //classes.
+ UIColumn column = (UIColumn) uiComponent;
+ if (isHeader){
+ String headerClass = (String) column.getAttributes().get("headerClass");
+ if (headerClass != null){
+ styleClass = (String) headerClass;
+ }
+ }else{
+ String footerClass = (String) column.getAttributes().get("footerClass");
+ if (footerClass != null){
+ styleClass = (String) footerClass;
+ }
+ }
}
if (isHeader)