svn commit: r964143 - in /myfaces/core/trunk/api/src: main/java/javax/faces/component/UIData.java test/java/javax/faces/component/UIDataTest.java

[lu...@apache.org]

Author: lu4242
Date: Wed Jul 14 19:22:20 2010
New Revision: 964143

URL: http://svn.apache.org/viewvc?rev=964143&view=rev
Log:
MYFACES-2744 UIData.getClientId() should not append rowIndex, instead use UIData.getContainerClientId() (temporally commented)

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
    myfaces/core/trunk/api/src/test/java/javax/faces/component/UIDataTest.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java?rev=964143&r1=964142&r2=964143&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java Wed Jul 14 19:22:20 2010
@@ -302,7 +302,7 @@ public class UIData extends UIComponentB
             throw new NullPointerException();
         }
         
-        final String baseClientId = getClientId(context);
+        final String baseClientId = super.getClientId(context);
 
         // searching for this component?
         boolean returnValue = baseClientId.equals(clientId);
@@ -684,7 +684,6 @@ public class UIData extends UIComponentB
         super.setValueExpression(name, binding);
     }
 
-    /*
     @Override
     public String getClientId(FacesContext context)
     {
@@ -697,8 +696,11 @@ public class UIData extends UIComponentB
 
         StringBuilder bld = __getSharedStringBuilder();
         return bld.append(clientId).append(UINamingContainer.getSeparatorChar(context)).append(rowIndex).toString();
-    }*/
+    }
 
+    /* -= Leonardo Uribe =- Temporally commented, because it is not confirmed
+     * if this will be included in jsf 2.0 rev A. Note super.getContainerClientId(context)
+     * call getClientId()
     @Override
     public String getContainerClientId(FacesContext context)
     {
@@ -713,7 +715,7 @@ public class UIData extends UIComponentB
 
         StringBuilder bld = __getSharedStringBuilder();
         return bld.append(clientId).append(UINamingContainer.getSeparatorChar(context)).append(rowIndex).toString();        
-    }
+    }*/
 
     /**
      * Modify events queued for any child components so that the UIData state will be correctly configured before the

Modified: myfaces/core/trunk/api/src/test/java/javax/faces/component/UIDataTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/test/java/javax/faces/component/UIDataTest.java?rev=964143&r1=964142&r2=964143&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/test/java/javax/faces/component/UIDataTest.java (original)
+++ myfaces/core/trunk/api/src/test/java/javax/faces/component/UIDataTest.java Wed Jul 14 19:22:20 2010
@@ -92,7 +92,7 @@ public class UIDataTest extends Abstract
         assertEquals("xxx", _testImpl.getClientId(facesContext));
         _testImpl.setRowIndex(99);
         //MYFACES-2744 UIData.getClientId() should not append rowIndex, instead use UIData.getContainerClientId()
-        assertEquals("xxx", _testImpl.getClientId(facesContext));
+        //assertEquals("xxx", _testImpl.getClientId(facesContext)); Temporally commented, waiting for jsf 2.1
         assertEquals("xxx:99", _testImpl.getContainerClientId(facesContext));
     }