Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1C672200D67 for ; Sun, 24 Dec 2017 13:09:12 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 12383160C2F; Sun, 24 Dec 2017 12:09:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 3947C160C0B for ; Sun, 24 Dec 2017 13:09:11 +0100 (CET) Received: (qmail 33678 invoked by uid 500); 24 Dec 2017 12:09:10 -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 33666 invoked by uid 99); 24 Dec 2017 12:09:10 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Dec 2017 12:09:10 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 412413A0316 for ; Sun, 24 Dec 2017 12:09:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1819216 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible: PDFTemplateBuilder.java PDFTemplateCreator.java PDVisibleSigBuilder.java Date: Sun, 24 Dec 2017 12:09:06 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20171224120908.412413A0316@svn01-us-west.apache.org> archived-at: Sun, 24 Dec 2017 12:09:12 -0000 Author: tilman Date: Sun Dec 24 12:09:05 2017 New Revision: 1819216 URL: http://svn.apache.org/viewvc?rev=1819216&view=rev Log: PDFBOX-2852: clarify parameter names Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateBuilder.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateBuilder.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateBuilder.java?rev=1819216&r1=1819215&r2=1819216&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateBuilder.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateBuilder.java Sun Dec 24 12:09:05 2017 @@ -166,10 +166,10 @@ public interface PDFTemplateBuilder * * @param holderFormResources * @param holderFormStream - * @param formrect + * @param bbox */ void createHolderForm(PDResources holderFormResources, PDStream holderFormStream, - PDRectangle formrect); + PDRectangle bbox); /** * Creates appearance dictionary @@ -196,10 +196,9 @@ public interface PDFTemplateBuilder * * @param innerFormResources * @param innerFormStream - * @param formrect + * @param bbox */ - void createInnerForm(PDResources innerFormResources, PDStream innerFormStream, - PDRectangle formrect); + void createInnerForm(PDResources innerFormResources, PDStream innerFormStream, PDRectangle bbox); /** * @@ -226,23 +225,23 @@ public interface PDFTemplateBuilder * @param imageFormResources * @param innerFormResource * @param imageFormStream - * @param formrect + * @param bbox * @param affineTransform * @param img * @throws IOException */ void createImageForm(PDResources imageFormResources, PDResources innerFormResource, - PDStream imageFormStream, PDRectangle formrect, AffineTransform affineTransform, + PDStream imageFormStream, PDRectangle bbox, AffineTransform affineTransform, PDImageXObject img) throws IOException; /** * Creates the background layer form (n0). * * @param innerFormResource - * @param formatter + * @param bbox * @throws IOException */ - void createBackgroundLayerForm(PDResources innerFormResource, PDRectangle formatter) + void createBackgroundLayerForm(PDResources innerFormResource, PDRectangle bbox) throws IOException; /** Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java?rev=1819216&r1=1819215&r2=1819216&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java Sun Dec 24 12:09:05 2017 @@ -114,7 +114,7 @@ public class PDFTemplateCreator // rectangle, formatter, image. /AcroForm/DR/XObject contains that form pdfBuilder.createSignatureRectangle(pdSignatureField, properties); pdfBuilder.createFormatterRectangle(properties.getFormatterRectangleParameters()); - PDRectangle formatter = pdfStructure.getFormatterRectangle(); + PDRectangle bbox = pdfStructure.getFormatterRectangle(); pdfBuilder.createSignatureImage(template, properties.getImage()); // create form stream, form and resource. @@ -122,7 +122,7 @@ public class PDFTemplateCreator PDStream holderFormStream = pdfStructure.getHolderFormStream(); pdfBuilder.createHolderFormResources(); PDResources holderFormResources = pdfStructure.getHolderFormResources(); - pdfBuilder.createHolderForm(holderFormResources, holderFormStream, formatter); + pdfBuilder.createHolderForm(holderFormResources, holderFormStream, bbox); // that is /AP entry the appearance dictionary. pdfBuilder.createAppearanceDictionary(pdfStructure.getHolderForm(), pdSignatureField); @@ -131,7 +131,7 @@ public class PDFTemplateCreator pdfBuilder.createInnerFormStream(template); pdfBuilder.createInnerFormResource(); PDResources innerFormResource = pdfStructure.getInnerFormResources(); - pdfBuilder.createInnerForm(innerFormResource, pdfStructure.getInnerFormStream(), formatter); + pdfBuilder.createInnerForm(innerFormResource, pdfStructure.getInnerFormStream(), bbox); PDFormXObject innerForm = pdfStructure.getInnerForm(); // inner form must be in the holder form as we wrote @@ -142,10 +142,10 @@ public class PDFTemplateCreator PDStream imageFormStream = pdfStructure.getImageFormStream(); pdfBuilder.createImageFormResources(); PDResources imageFormResources = pdfStructure.getImageFormResources(); - pdfBuilder.createImageForm(imageFormResources, innerFormResource, imageFormStream, formatter, + pdfBuilder.createImageForm(imageFormResources, innerFormResource, imageFormStream, bbox, transform, pdfStructure.getImage()); - pdfBuilder.createBackgroundLayerForm(innerFormResource, formatter); + pdfBuilder.createBackgroundLayerForm(innerFormResource, bbox); // now inject procSetArray pdfBuilder.injectProcSetArray(innerForm, page, innerFormResource, imageFormResources, Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java?rev=1819216&r1=1819215&r2=1819216&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java Sun Dec 24 12:09:05 2017 @@ -253,11 +253,11 @@ public class PDVisibleSigBuilder impleme @Override public void createHolderForm(PDResources holderFormResources, PDStream holderFormStream, - PDRectangle formrect) + PDRectangle bbox) { PDFormXObject holderForm = new PDFormXObject(holderFormStream); holderForm.setResources(holderFormResources); - holderForm.setBBox(formrect); + holderForm.setBBox(bbox); holderForm.setFormType(1); pdfStructure.setHolderForm(holderForm); LOG.info("Holder form has been created"); @@ -300,11 +300,11 @@ public class PDVisibleSigBuilder impleme @Override public void createInnerForm(PDResources innerFormResources, PDStream innerFormStream, - PDRectangle formrect) + PDRectangle bbox) { PDFormXObject innerForm = new PDFormXObject(innerFormStream); innerForm.setResources(innerFormResources); - innerForm.setBBox(formrect); + innerForm.setBBox(bbox); innerForm.setFormType(1); pdfStructure.setInnerForm(innerForm); LOG.info("Another form (inner form - it will be inside holder form) has been created"); @@ -337,11 +337,11 @@ public class PDVisibleSigBuilder impleme @Override public void createImageForm(PDResources imageFormResources, PDResources innerFormResource, - PDStream imageFormStream, PDRectangle formrect, AffineTransform at, + PDStream imageFormStream, PDRectangle bbox, AffineTransform at, PDImageXObject img) throws IOException { PDFormXObject imageForm = new PDFormXObject(imageFormStream); - imageForm.setBBox(formrect); + imageForm.setBBox(bbox); imageForm.setMatrix(at); imageForm.setResources(imageFormResources); imageForm.setFormType(1); @@ -358,12 +358,12 @@ public class PDVisibleSigBuilder impleme } @Override - public void createBackgroundLayerForm(PDResources innerFormResource, PDRectangle formatter) + public void createBackgroundLayerForm(PDResources innerFormResource, PDRectangle bbox) throws IOException { // create blank n0 background layer form PDFormXObject n0Form = new PDFormXObject(pdfStructure.getTemplate().getDocument().createCOSStream()); - n0Form.setBBox(formatter); + n0Form.setBBox(bbox); n0Form.setResources(new PDResources()); n0Form.setFormType(1); innerFormResource.put(COSName.getPDFName("n0"), n0Form);