Return-Path: Delivered-To: apmail-xmlgraphics-fop-commits-archive@www.apache.org Received: (qmail 1422 invoked from network); 19 Apr 2007 15:13:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 19 Apr 2007 15:13:13 -0000 Received: (qmail 4220 invoked by uid 500); 19 Apr 2007 15:13:20 -0000 Delivered-To: apmail-xmlgraphics-fop-commits-archive@xmlgraphics.apache.org Received: (qmail 4198 invoked by uid 500); 19 Apr 2007 15:13:19 -0000 Mailing-List: contact fop-commits-help@xmlgraphics.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: fop-dev@xmlgraphics.apache.org Delivered-To: mailing list fop-commits@xmlgraphics.apache.org Received: (qmail 4187 invoked by uid 99); 19 Apr 2007 15:13:19 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Apr 2007 08:13:19 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Apr 2007 08:13:12 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 8DBC71A9838; Thu, 19 Apr 2007 08:12:52 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r530445 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr: TraitSetter.java table/TableCellLayoutManager.java Date: Thu, 19 Apr 2007 15:12:51 -0000 To: fop-commits@xmlgraphics.apache.org From: vhennebert@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070419151252.8DBC71A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vhennebert Date: Thu Apr 19 08:12:50 2007 New Revision: 530445 URL: http://svn.apache.org/viewvc?view=rev&rev=530445 Log: - remove call to addPadding in TraitSetter.addCollapsingBorders - make the call explicit in TableCellLM, only when necessary. That is, areas holding borders for spanning cells in collapsing mode don't need to have padding set Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java?view=diff&rev=530445&r1=530444&r2=530445 ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/TraitSetter.java Thu Apr 19 08:12:50 2007 @@ -208,8 +208,6 @@ if (bps != null) { area.addTrait(Trait.BORDER_END, bps); } - - addPadding(area, bordProps, context); } private static void addPadding(Area area, CommonBorderPaddingBackground bordProps, Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java?view=diff&rev=530445&r1=530444&r2=530445 ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java Thu Apr 19 08:12:50 2007 @@ -380,6 +380,8 @@ primaryGridUnit.getFlag(GridUnit.IN_LAST_COLUMN)}; TraitSetter.addCollapsingBorders(curBlockArea, primaryGridUnit.getBorders(), outer, this); + TraitSetter.addPadding(curBlockArea, primaryGridUnit.getBorders(), + false, false, false, false, this); } else { boolean[] outer = new boolean[4]; int dy = yoffset; --------------------------------------------------------------------- To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org