Return-Path: Delivered-To: apmail-myfaces-commits-archive@www.apache.org Received: (qmail 3499 invoked from network); 28 Sep 2009 16:06:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Sep 2009 16:06:27 -0000 Received: (qmail 47387 invoked by uid 500); 28 Sep 2009 16:06:27 -0000 Delivered-To: apmail-myfaces-commits-archive@myfaces.apache.org Received: (qmail 47269 invoked by uid 500); 28 Sep 2009 16:06:27 -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 47260 invoked by uid 99); 28 Sep 2009 16:06:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Sep 2009 16:06:26 +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; Mon, 28 Sep 2009 16:06:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9ABDA2388892; Mon, 28 Sep 2009 16:06:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r819625 - in /myfaces/trinidad/branches/1.2.12.2-branch: ./ trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/ trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/ trinidad-sandb... Date: Mon, 28 Sep 2009 16:06:02 -0000 To: commits@myfaces.apache.org From: arobinson74@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090928160602.9ABDA2388892@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: arobinson74 Date: Mon Sep 28 16:06:01 2009 New Revision: 819625 URL: http://svn.apache.org/viewvc?rev=819625&view=rev Log: TRINIDAD-1580 Applying patch from Venkata Modified: myfaces/trinidad/branches/1.2.12.2-branch/ (props changed) myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/TableUtils.java myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/ (props changed) myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/ (props changed) Propchange: myfaces/trinidad/branches/1.2.12.2-branch/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 28 16:06:01 2009 @@ -3,4 +3,4 @@ /myfaces/trinidad/branches/1.2.9.1-branch:697924,699406,699496 /myfaces/trinidad/branches/TRINIDAD-1402:745675 /myfaces/trinidad/branches/jwaldman_StyleMap:754977-770778 -/myfaces/trinidad/trunk:819601 +/myfaces/trinidad/trunk:819601,819622 Modified: myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/TableUtils.java URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/TableUtils.java?rev=819625&r1=819624&r2=819625&view=diff ============================================================================== --- myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/TableUtils.java (original) +++ myfaces/trinidad/branches/1.2.12.2-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/TableUtils.java Mon Sep 28 16:06:01 2009 @@ -256,7 +256,7 @@ @Override protected void process(FacesContext context, UIComponent child) { - if (child instanceof UIXColumn) + if (child instanceof UIXColumn && child.isRendered()) { // process any facets of the child column: __processFacets(context, table, child, phaseId, null); Propchange: myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 28 16:06:01 2009 @@ -2,4 +2,4 @@ /myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:794062,794792,798299 /myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:699406,699496 /myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:745675 -/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:819601 +/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java-templates/org/apache/myfaces/trinidad/sandbox/component:819601,819622 Propchange: myfaces/trinidad/branches/1.2.12.2-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Sep 28 16:06:01 2009 @@ -2,4 +2,4 @@ /myfaces/trinidad/branches/1.2.11.4-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:794062,794792,798299 /myfaces/trinidad/branches/1.2.9.1-branch/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:699406,699496 /myfaces/trinidad/branches/TRINIDAD-1402/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:745675 -/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:819601 +/myfaces/trinidad/trunk/trinidad-sandbox/sandbox-api/src/main/java/org/apache/myfaces/trinidad/sandbox/event:819601,819622