You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2006/09/19 07:57:54 UTC

svn commit: r447752 - /myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java

Author: mmarinschek
Date: Mon Sep 18 22:57:53 2006
New Revision: 447752

URL: http://svn.apache.org/viewvc?view=rev&rev=447752
Log:
fix for [TOMAHAWK-494]   detailStamp facet is decoded/validated/updated twice. Thanks to Val Blant.

Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java?view=diff&rev=447752&r1=447751&r2=447752
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java Mon Sep 18 22:57:53 2006
@@ -281,7 +281,14 @@
         {
             return;
         }
+
+        // We must remove and then replace the facet so that
+        // it is not processed by default facet handling code
+        //
+        Object facet = getFacets().remove(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME);
         super.processDecodes(context);
+        if ( facet != null ) getFacets().put(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME, facet);
+
         setRowIndex(-1);
         processColumns(context, PROCESS_DECODES);
         setRowIndex(-1);
@@ -402,7 +409,13 @@
         {
             return;
         }
+        // We must remove and then replace the facet so that
+        // it is not processed by default facet handling code
+        //
+        Object facet = getFacets().remove(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME);
         super.processValidators(context);
+        if ( facet != null ) getFacets().put(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME, facet);
+
         processColumns(context, PROCESS_VALIDATORS);
         setRowIndex(-1);
         processDetails(context, PROCESS_VALIDATORS);
@@ -420,7 +433,14 @@
         {
             return;
         }
+
+        // We must remove and then replace the facet so that
+        // it is not processed by default facet handling code
+        //
+        Object facet = getFacets().remove(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME);
         super.processUpdates(context);
+        if ( facet != null ) getFacets().put(HtmlTableRenderer.DETAIL_STAMP_FACET_NAME, facet);
+
         processColumns(context, PROCESS_UPDATES);
         setRowIndex(-1);
         processDetails(context, PROCESS_UPDATES);