Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 759BF18828 for ; Mon, 17 Aug 2015 18:44:48 +0000 (UTC) Received: (qmail 36650 invoked by uid 500); 17 Aug 2015 18:44:48 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 36629 invoked by uid 500); 17 Aug 2015 18:44:48 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 36620 invoked by uid 99); 17 Aug 2015 18:44:48 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Aug 2015 18:44:48 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 2006AAC0354 for ; Mon, 17 Aug 2015 18:44:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1696326 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form: AppearanceGeneratorHelper.java PDDefaultAppearanceString.java Date: Mon, 17 Aug 2015 18:44:47 -0000 To: commits@pdfbox.apache.org From: msahyoun@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150817184448.2006AAC0354@hades.apache.org> Author: msahyoun Date: Mon Aug 17 18:44:47 2015 New Revision: 1696326 URL: http://svn.apache.org/r1696326 Log: PDFBOX-2852: properly declare constants Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java?rev=1696326&r1=1696325&r2=1696326&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java Mon Aug 17 18:44:47 2015 @@ -47,7 +47,7 @@ class AppearanceGeneratorHelper { private static final Operator BMC = Operator.getOperator("BMC"); private static final Operator EMC = Operator.getOperator("EMC"); - + private final PDVariableText field; private final PDDefaultAppearanceString defaultAppearance; private String value; @@ -71,6 +71,10 @@ class AppearanceGeneratorHelper */ private static final float DEFAULT_FONT_SIZE = 12; + /** + * The default padding applied by Acrobat to the fields bbox. + */ + private static final float DEFAULT_PADDING = 0.5f; /** * Constructs a COSAppearance from the given field. @@ -179,7 +183,7 @@ class AppearanceGeneratorHelper { contents.setLineWidth(lineWidth); PDRectangle bbox = resolveBoundingBox(widget, appearanceStream); - PDRectangle clipRect = applyPadding(bbox, Math.max(0.5f, lineWidth/2)); + PDRectangle clipRect = applyPadding(bbox, Math.max(DEFAULT_PADDING, lineWidth/2)); contents.addRect(clipRect.getLowerLeftX(),clipRect.getLowerLeftY(),clipRect.getWidth(), clipRect.getHeight()); contents.closeAndStroke(); } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java?rev=1696326&r1=1696325&r2=1696326&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDDefaultAppearanceString.java Mon Aug 17 18:44:47 2015 @@ -40,6 +40,11 @@ import org.apache.pdfbox.pdmodel.interac */ class PDDefaultAppearanceString { + /** + * The default font size used by Acrobat. + */ + private static final float DEFAULT_FONT_SIZE = 12; + private final List tokens; private final PDResources defaultResources; @@ -84,9 +89,8 @@ class PDDefaultAppearanceString return ((COSNumber) tokens.get(fontIndex - 1)).floatValue(); } } - - // default font size is 12 in Acrobat - return 12; + + return DEFAULT_FONT_SIZE; } /**