Return-Path: Delivered-To: apmail-myfaces-commits-archive@www.apache.org Received: (qmail 91984 invoked from network); 4 Mar 2010 04:32:40 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 4 Mar 2010 04:32:40 -0000 Received: (qmail 43600 invoked by uid 500); 4 Mar 2010 04:32:31 -0000 Delivered-To: apmail-myfaces-commits-archive@myfaces.apache.org Received: (qmail 43546 invoked by uid 500); 4 Mar 2010 04:32:30 -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 43539 invoked by uid 99); 4 Mar 2010 04:32:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Mar 2010 04:32:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Mar 2010 04:32:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DC42623889B8; Thu, 4 Mar 2010 04:32:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r918849 - in /myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component: UIXCollection.java UIXComponent.java Date: Thu, 04 Mar 2010 04:32:07 -0000 To: commits@myfaces.apache.org From: bsullivan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100304043207.DC42623889B8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bsullivan Date: Thu Mar 4 04:32:07 2010 New Revision: 918849 URL: http://svn.apache.org/viewvc?rev=918849&view=rev Log: Fixes for TRINIDAD-1740 Replace Trinidad TreeVisiting APIs with JSF 2 TreeVisiting APIs TRINIDAD-1669 Improve transient memory consumption of UIXComponentBase.getClientId() UIXComponent was accidentally calling the wrong CoreRenderer versions of setup/tearDownEncoding context (the deprecated ones that take UIXComponents, rather than the correct ones that take UIComponents) Speed up clientId clearing when stamping in UIXCollection Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java?rev=918849&r1=918848&r2=918849&view=diff ============================================================================== --- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java (original) +++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXCollection.java Thu Mar 4 04:32:07 2010 @@ -811,7 +811,10 @@ // ensure the client IDs are reset on the component, otherwise they will not get the // proper stamped IDs. This mirrors the behavior in UIData and follows the JSF specification // on when client IDs are allowed to be cached and when they must be reset - clearCachedClientIds(); + List stamps = getStamps(); + + for (UIComponent stamp : stamps) + UIXComponent.clearCachedClientIds(stamp); } /** Modified: myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java?rev=918849&r1=918848&r2=918849&view=diff ============================================================================== --- myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java (original) +++ myfaces/trinidad/trunk/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponent.java Thu Mar 4 04:32:07 2010 @@ -858,7 +858,7 @@ { CoreRenderer coreRenderer = (CoreRenderer)renderer; - coreRenderer.setupEncodingContext(context, rc, this); + coreRenderer.setupEncodingContext(context, rc, (UIComponent)this); } } @@ -912,7 +912,7 @@ { CoreRenderer coreRenderer = (CoreRenderer)renderer; - coreRenderer.tearDownEncodingContext(context, rc, this); + coreRenderer.tearDownEncodingContext(context, rc, (UIComponent)this); } } finally