Return-Path: Delivered-To: apmail-xmlgraphics-fop-commits-archive@www.apache.org Received: (qmail 1057 invoked from network); 15 Feb 2006 13:08:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 15 Feb 2006 13:08:22 -0000 Received: (qmail 27293 invoked by uid 500); 15 Feb 2006 13:08:21 -0000 Delivered-To: apmail-xmlgraphics-fop-commits-archive@xmlgraphics.apache.org Received: (qmail 27262 invoked by uid 500); 15 Feb 2006 13:08:21 -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 27251 invoked by uid 99); 15 Feb 2006 13:08:21 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Feb 2006 05:08:21 -0800 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; Wed, 15 Feb 2006 05:08:21 -0800 Received: (qmail 946 invoked by uid 65534); 15 Feb 2006 13:07:59 -0000 Message-ID: <20060215130759.945.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r378003 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java Date: Wed, 15 Feb 2006 13:07:59 -0000 To: fop-commits@xmlgraphics.apache.org From: adelmelle@apache.org X-Mailer: svnmailer-1.0.6 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: adelmelle Date: Wed Feb 15 05:07:57 2006 New Revision: 378003 URL: http://svn.apache.org/viewcvs?rev=378003&view=rev Log: Added default empty String to the border shorthand. Avoids NPE mentioned in Bugzilla 38648. Still need to add a warning, since property now silently falls back to the default(s). Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java?rev=378003&r1=378002&r2=378003&view=diff ============================================================================== --- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java (original) +++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOPropertyMapping.java Wed Feb 15 05:07:57 2006 @@ -2623,6 +2623,9 @@ // background-position m = new ListProperty.Maker(PR_BACKGROUND_POSITION); m.setInherited(false); + m.addKeyword("left", "0% 50%"); + m.addKeyword("center", "50% 50%"); + m.addKeyword("right", "100% 50%"); m.setDefault("0% 0%"); m.setDatatypeParser(new BackgroundPositionShorthandParser()); addPropertyMaker("background-position", m); @@ -2630,6 +2633,7 @@ // border m = new ListProperty.Maker(PR_BORDER); m.setInherited(false); + m.setDefault(""); m.setDatatypeParser(new GenericShorthandParser()); addPropertyMaker("border", m); --------------------------------------------------------------------- To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org