svn commit: r468084 - in /incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core: desktop/DesktopTableRenderer.java pda/PdaTableRenderer.java

[aw...@apache.org]

Author: awiner
Date: Thu Oct 26 11:34:24 2006
New Revision: 468084

URL: http://svn.apache.org/viewvc?view=rev&rev=468084
Log:
ADFFACES-247: Incorrect cast of columns to CoreColumn class.  Also some tweaks in DesktopTableRenderer for improved creation of sub-renderers.

Modified:
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java?view=diff&rev=468084&r1=468083&r2=468084
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/desktop/DesktopTableRenderer.java Thu Oct 26 11:34:24 2006
@@ -74,6 +74,8 @@
     if (_heightKey == null)
       _heightKey = PropertyKey.createPropertyKey("height");
     _allDetailsEnabledKey = type.findKey("allDetailsEnabled");
+    _allDisclosed = new AllDetail(type, true);
+    _allUndisclosed = new AllDetail(type, false);
   }
 
   public DesktopTableRenderer()
@@ -1103,9 +1105,9 @@
 
   static private class AllDetail extends ShowDetailRenderer
   {
-    public AllDetail(boolean disclosed)
+    public AllDetail(FacesBean.Type type, boolean disclosed)
     {
-      super(CoreTable.TYPE);
+      super(type);
       _disclosed = disclosed;
     }
 
@@ -1177,8 +1179,8 @@
   // Private variables
   //
 
-  private CoreRenderer _allDisclosed = new AllDetail(true);
-  private CoreRenderer _allUndisclosed = new AllDetail(false);
+  private CoreRenderer _allDisclosed;
+  private CoreRenderer _allUndisclosed;
   // translation keys
 
   private static final String _SHOW_ALL_DETAILS_TEXT_KEY = "af_table.SHOW_ALL_DETAILS";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java?view=diff&rev=468084&r1=468083&r2=468084
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/pda/PdaTableRenderer.java Thu Oct 26 11:34:24 2006
@@ -434,8 +434,10 @@
     {
       if (hidden[j] != TableRenderingContext.NORMAL_COLUMN)
         continue;
-      CoreColumn column = (CoreColumn) component.getChildren().get(j);
-      if (!column.isRowHeader())
+      UIXColumn column = (UIXColumn) component.getChildren().get(j);
+      boolean isRowHeader = Boolean.TRUE.equals(
+        column.getAttributes().get(CoreColumn.ROW_HEADER_KEY.getName()));
+      if (!isRowHeader)
       {
         colData.setColumnIndex(physicalCol, j);
         encodeChild(context, column);