You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/10/13 21:45:10 UTC

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

Author: awiner
Date: Fri Oct 13 14:45:09 2006
New Revision: 463848

URL: http://svn.apache.org/viewvc?view=rev&rev=463848
Log:
ADFFACES-237: "action" facet of tr:table is not rendered if navigation commands are not rendered.  Commit patch from Thorsten Guenther.

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=463848&r1=463847&r2=463848
==============================================================================
--- 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 Fri Oct 13 14:45:09 2006
@@ -515,9 +515,11 @@
     UIComponent           component)
     throws IOException
   {
+    UIComponent action = getFacet(component, CoreTable.ACTIONS_FACET);
     boolean tableNotEmpty = !tContext.getRowData().isEmptyTable();
     boolean hasNav = tContext.hasNavigation()&&tableNotEmpty;
-    if (hasNav)
+
+    if (hasNav || (action != null))
     {
       boolean isUpper = (tContext.getRenderStage().getStage() ==
                          RenderStage.UPPER_CONTROL_BAR_STAGE);
@@ -545,7 +547,6 @@
         renderStyleClass(context, arc, style);
         writer.startElement(XhtmlConstants.TABLE_ROW_ELEMENT, null);
 
-        UIComponent action = getFacet(component, CoreTable.ACTIONS_FACET);
         if (action != null)
         {
           writer.startElement(XhtmlConstants.TABLE_DATA_ELEMENT, null);

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=463848&r1=463847&r2=463848
==============================================================================
--- 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 Fri Oct 13 14:45:09 2006
@@ -57,10 +57,11 @@
     UIComponent           component)
     throws IOException
   {
+    UIComponent action = getFacet(component, CoreTable.ACTIONS_FACET);
     boolean tableNotEmpty = !tContext.getRowData().isEmptyTable();
     boolean hasNav = tContext.hasNavigation() && tableNotEmpty;
 
-    if (hasNav)
+    if (hasNav || (action != null))
     {
       ResponseWriter writer = context.getResponseWriter();
 
@@ -73,7 +74,6 @@
       renderStyleClass(context, arc,
                        SkinSelectors.AF_TABLE_CONTROL_BAR_TOP_STYLE);
 
-      UIComponent action = getFacet(component, CoreTable.ACTIONS_FACET);
       if (action != null)
       {
         writer.startElement(XhtmlConstants.TABLE_DATA_ELEMENT, null);