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/22 18:53:01 UTC

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

Author: mbr
Date: Thu Sep 22 09:52:51 2005
New Revision: 290979

URL: http://svn.apache.org/viewcvs?rev=290979&view=rev
Log:
change in r290681 breaks UIColumns

Modified:
    myfaces/api/trunk/src/java/javax/faces/component/UIData.java
    myfaces/api/trunk/src/java/javax/faces/component/html/HtmlDataTable.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

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=290979&r1=290978&r2=290979&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/UIData.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/component/UIData.java Thu Sep 22 09:52:51 2005
@@ -350,7 +350,6 @@
 
     public void encodeBegin(FacesContext context) throws IOException
     {
-        setRowIndex(-1);
         _initialDescendantComponentState = null;
         if (_isValidChilds)
         {

Modified: myfaces/api/trunk/src/java/javax/faces/component/html/HtmlDataTable.java
URL: http://svn.apache.org/viewcvs/myfaces/api/trunk/src/java/javax/faces/component/html/HtmlDataTable.java?rev=290979&r1=290978&r2=290979&view=diff
==============================================================================
--- myfaces/api/trunk/src/java/javax/faces/component/html/HtmlDataTable.java (original)
+++ myfaces/api/trunk/src/java/javax/faces/component/html/HtmlDataTable.java Thu Sep 22 09:52:51 2005
@@ -15,6 +15,8 @@
  */
 package javax.faces.component.html;
 
+import java.io.IOException;
+
 import javax.faces.component.UIData;
 import javax.faces.context.FacesContext;
 import javax.faces.el.ValueBinding;
@@ -25,6 +27,15 @@
  */
 public class HtmlDataTable extends UIData
 {
+    /**
+     * @see javax.faces.component.UIData#encodeBegin(javax.faces.context.FacesContext)
+     */
+    public void encodeBegin(FacesContext context) throws IOException
+    {
+        setRowIndex(-1);
+        super.encodeBegin(context);
+    }
+    
     //------------------ GENERATED CODE BEGIN (do not modify!) --------------------
 
     public static final String COMPONENT_TYPE = "javax.faces.HtmlDataTable";

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=290979&r1=290978&r2=290979&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 Thu Sep 22 09:52:51 2005
@@ -292,8 +292,6 @@
     
     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=290979&r1=290978&r2=290979&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 Thu Sep 22 09:52:51 2005
@@ -116,7 +116,6 @@
      */
     public void encodeBegin(FacesContext context) throws IOException
     {
-        setRowIndex(-1);
         if (_isValidChilds)
         {
             //Refresh DataModel for rendering: