Return-Path: Delivered-To: apmail-myfaces-commits-archive@www.apache.org Received: (qmail 74648 invoked from network); 10 Apr 2006 01:26:02 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 10 Apr 2006 01:26:02 -0000 Received: (qmail 23782 invoked by uid 500); 10 Apr 2006 01:26:01 -0000 Delivered-To: apmail-myfaces-commits-archive@myfaces.apache.org Received: (qmail 23692 invoked by uid 500); 10 Apr 2006 01:26:00 -0000 Mailing-List: contact commits-help@myfaces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "MyFaces Development" Delivered-To: mailing list commits@myfaces.apache.org Received: (qmail 23681 invoked by uid 99); 10 Apr 2006 01:26:00 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Apr 2006 18:26:00 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 09 Apr 2006 18:26:00 -0700 Received: (qmail 74370 invoked by uid 65534); 10 Apr 2006 01:25:39 -0000 Message-ID: <20060410012539.74367.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r392868 - /myfaces/core/branches/1_1_2/api/src/main/java/javax/faces/component/_ComponentChildrenList.java Date: Mon, 10 Apr 2006 01:25:38 -0000 To: commits@myfaces.apache.org From: schof@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: schof Date: Sun Apr 9 18:25:37 2006 New Revision: 392868 URL: http://svn.apache.org/viewcvs?rev=392868&view=rev Log: Reverted fix related to MYFACES-765. Fix caused massive problems with the TCK. Revisit this after the 1.1.2 release. Modified: myfaces/core/branches/1_1_2/api/src/main/java/javax/faces/component/_ComponentChildrenList.java Modified: myfaces/core/branches/1_1_2/api/src/main/java/javax/faces/component/_ComponentChildrenList.java URL: http://svn.apache.org/viewcvs/myfaces/core/branches/1_1_2/api/src/main/java/javax/faces/component/_ComponentChildrenList.java?rev=392868&r1=392867&r2=392868&view=diff ============================================================================== --- myfaces/core/branches/1_1_2/api/src/main/java/javax/faces/component/_ComponentChildrenList.java (original) +++ myfaces/core/branches/1_1_2/api/src/main/java/javax/faces/component/_ComponentChildrenList.java Sun Apr 9 18:25:37 2006 @@ -50,20 +50,6 @@ public Object set(int index, Object value) { checkValue(value); - - UIComponent newChild = (UIComponent) value; - - for (int i = 0; i < _list.size(); i++) - { - UIComponent component = (UIComponent) _list.get(i); - if(component.getId()!=null && component.getId().equals(newChild.getId())) - { - if(i!=index) - throw new IllegalStateException( - "Duplicate id : "+newChild.getId()+". Child could not be added."); - } - } - setNewParent((UIComponent)value); UIComponent child = (UIComponent) _list.set(index, value); if (child != null) child.setParent(null); @@ -73,7 +59,6 @@ public boolean add(Object value) { checkValue(value); - checkAddAllowed((UIComponent) value); setNewParent((UIComponent)value); return _list.add(value); } @@ -81,21 +66,10 @@ public void add(int index, Object value) { checkValue(value); - checkAddAllowed((UIComponent) value); setNewParent((UIComponent)value); _list.add(index, value); } - private void checkAddAllowed(UIComponent newChild) - { - for (int i = 0; i < _list.size(); i++) - { - UIComponent component = (UIComponent) _list.get(i); - if(component.getId()!=null && component.getId().equals(newChild.getId())) - throw new IllegalStateException("Duplicate id : "+newChild.getId()+". Child could not be added."); - } - } - public Object remove(int index) { UIComponent child = (UIComponent) _list.remove(index); @@ -119,7 +93,5 @@ if (value == null) throw new NullPointerException("value"); if (!(value instanceof UIComponent)) throw new ClassCastException("value is not a UIComponent"); } - - }