From 6c14a96db118497061c60db18eea644785b75445 Mon Sep 17 00:00:00 2001 From: Emina Ahmetovic Date: Wed, 20 Jan 2021 16:11:58 +0100 Subject: preparing 4.1.7 RC --- .../impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java | 7 ------- .../gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java | 4 +--- 2 files changed, 1 insertion(+), 10 deletions(-) (limited to 'pdf-as-pdfbox-2') diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java index 0998a2eb..8a2c1cff 100644 --- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java +++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/pdfbox2/placeholder/SignaturePlaceholderExtractor.java @@ -130,13 +130,6 @@ public class SignaturePlaceholderExtractor extends PDFStreamEngine implements Pl return placeholders; } - public void setPlaceholders(List placeholders) { - this.placeholders = placeholders; - } - - public static void clearPlaceholders() { - placeholders.clear(); - } /** * Search the document for placeholder images and possibly included diff --git a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java index cff5fc7f..09f1a7ee 100644 --- a/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java +++ b/pdf-as-pdfbox-2/src/main/java/at/gv/egiz/pdfas/lib/impl/signing/pdfbox2/PADESPDFBOXSigner.java @@ -158,7 +158,6 @@ public class PADESPDFBOXSigner implements IPdfSigner, IConfigurationConstants { placeholders = SignaturePlaceholderExtractor.getPlaceholders(); - if(placeholder_id.equalsIgnoreCase("")){ if(checkAvailablePlaceholders(placeholders,existingSignatureLocations(doc))!=null) { @@ -176,7 +175,6 @@ public class PADESPDFBOXSigner implements IPdfSigner, IConfigurationConstants { if (signaturePlaceholderData != null) { // Placeholder found! - placeholders.clear(); logger.info("Placeholder data found."); if (signaturePlaceholderData.getProfile() != null) { logger.debug("Placeholder Profile set to: " + signaturePlaceholderData.getProfile()); @@ -901,7 +899,7 @@ public class PADESPDFBOXSigner implements IPdfSigner, IConfigurationConstants { public SignaturePlaceholderData checkAvailablePlaceholders(List placeholders, List existingPlaceholders) { SignaturePlaceholderData result = null; - if(placeholders!=null){ + if(placeholders!=null) { for(int i = 0; i < placeholders.size(); ++i) { if(!existingPlaceholders.contains(placeholders.get(i).getPlaceholderName())) { result = placeholders.get(i); -- cgit v1.2.3