You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2005/09/21 13:11:03 UTC

svn commit: r290681 - in /myfaces: api/trunk/src/java/javax/faces/component/ tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/ tomahawk/trunk/src/java/org/apache/myfaces/custom/crosstable/

Author: mbr
Date: Wed Sep 21 04:10:54 2005
New Revision: 290681

URL: http://svn.apache.org/viewcvs?rev=290681&view=rev
Log:
fix for MYFACES-586

Modified:
    myfaces/api/trunk/src/java/javax/faces/component/UIData.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/crosstable/UIColumns.java

Modified: myfaces/api/trunk/src/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/component/UIData.java?rev=290681&r1=290680&r2=290681&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/UIData.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/component/UIData.java Wed Sep 21 04:10:54 2005
@@ -350,6 +350,7 @@
 
     public void encodeBegin(FacesContext context) throws IOException
     {
+        setRowIndex(-1);
         _initialDescendantComponentState = null;
         if (_isValidChilds)
         {

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java?rev=290681&r1=290680&r2=290681&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTable.java Wed Sep 21 04:10:54 2005
@@ -27,7 +27,6 @@
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
 import javax.faces.model.DataModel;
-import javax.faces.model.ListDataModel;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -293,6 +292,8 @@
     
     public void encodeBegin(FacesContext context) throws IOException
     {
+        setRowIndex(-1);
+        
         if (!isRendered())
             return;
 

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java?rev=290681&r1=290680&r2=290681&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/component/html/ext/HtmlDataTableHack.java Wed Sep 21 04:10:54 2005
@@ -116,6 +116,7 @@
      */
     public void encodeBegin(FacesContext context) throws IOException
     {
+        setRowIndex(-1);
         if (_isValidChilds)
         {
             //Refresh DataModel for rendering:

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/crosstable/UIColumns.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/crosstable/UIColumns.java?rev=290681&r1=290680&r2=290681&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/crosstable/UIColumns.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/crosstable/UIColumns.java Wed Sep 21 04:10:54 2005
@@ -553,6 +553,8 @@
 
     public void encodeTableBegin(FacesContext context)
     {
+        setRowIndex(-1);
+
         if (_isValidChilds)
         {
             //Refresh DataModel for rendering: