fix(placeholder): generate placeholderId using name and object reference

Reason: according to the PDF specification, a name only needs to be unique within a specific resource list, and multiple resource lists may exist within a document

2 files changed, 11 insertions, 11 deletions

diff --git a/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/PDFBoxPlaceholderExtractorTest.java b/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/PDFBoxPlaceholderExtractorTest.java
index 80e3eb4d..d0c215ae 100644
--- a/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/PDFBoxPlaceholderExtractorTest.java
+++ b/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/PDFBoxPlaceholderExtractorTest.java
@@ -21,7 +21,7 @@ public class PDFBoxPlaceholderExtractorTest {
   @SneakyThrows
   public void nextPlaceholder() {
     SignaturePlaceholderData result = getNextSignaturePlaceHolder("/data/platzhalter_en_de_test.pdf");
-    assertEquals("Im48", result.getPlaceholderName());
+    assertEquals("Im48_48", result.getPlaceholderName());
 
   }
 
diff --git a/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/SignatureFieldsAndPlaceHolderExtractorTest.java b/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/SignatureFieldsAndPlaceHolderExtractorTest.java
index 0ed05eb5..2e5e475c 100644
--- a/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/SignatureFieldsAndPlaceHolderExtractorTest.java
+++ b/pdf-as-pdfbox-2/src/test/java/at/gv/egiz/pdfas/lib/testpdfbox/SignatureFieldsAndPlaceHolderExtractorTest.java
@@ -29,12 +29,12 @@ public class SignatureFieldsAndPlaceHolderExtractorTest {
   @Test
   public void notSigned(){
     SignaturePlaceholderData result = getNextSignaturePlaceHolder(getPath("new_qr_2-2.pdf"));
-    Assert.assertEquals("Image5",result.getPlaceholderName());
+    Assert.assertEquals("Image5_5",result.getPlaceholderName());
   }
   @Test
   public void signedOnce(){
     SignaturePlaceholderData result = getNextSignaturePlaceHolder(getPath("new_qr_2_signed.pdf"));
-    Assert.assertEquals("Image8",result.getPlaceholderName());
+    Assert.assertEquals("Image8_8",result.getPlaceholderName());
   }
   @Test
   public void signedTwice(){
@@ -56,7 +56,7 @@ public class SignatureFieldsAndPlaceHolderExtractorTest {
   @Test
   public void firstQrCodeOnUnsignedDoc() {
     SignaturePlaceholderData result = getNextSignaturePlaceHolder(getPath("new_qr_2-2.pdf"));
-    Assert.assertEquals("Image5",result.getPlaceholderName());
+    Assert.assertEquals("Image5_5",result.getPlaceholderName());
     
   }
   
@@ -66,28 +66,28 @@ public class SignatureFieldsAndPlaceHolderExtractorTest {
     Assert.assertEquals(null,result);
 
     result = getNextSignaturePlaceHolder(getPath("new_qr_2_signed.pdf"));
-    Assert.assertEquals("Image8",result.getPlaceholderName());
+    Assert.assertEquals("Image8_8",result.getPlaceholderName());
 
     result = getNextSignaturePlaceHolder(getPath("new_qr_2-2.pdf"));
-    Assert.assertEquals("Image5",result.getPlaceholderName());
+    Assert.assertEquals("Image5_5",result.getPlaceholderName());
 
     result = getNextSignaturePlaceHolder(getPath("new_qr_2-2.pdf"));
-    Assert.assertEquals("Image5",result.getPlaceholderName());
+    Assert.assertEquals("Image5_5",result.getPlaceholderName());
 
     result = getNextSignaturePlaceHolder(getPath("new_qr_2-2.pdf"));
-    Assert.assertEquals("Image5",result.getPlaceholderName());
+    Assert.assertEquals("Image5_5",result.getPlaceholderName());
 
     result = getNextSignaturePlaceHolder(getPath("new_qr_2_signed.pdf"));
-    Assert.assertEquals("Image8",result.getPlaceholderName());
+    Assert.assertEquals("Image8_8",result.getPlaceholderName());
 
     result = getNextSignaturePlaceHolder(getPath("new_qr_2_signed_signed_signed.pdf"));
     Assert.assertEquals(null,result);
 
     result = getNextSignaturePlaceHolder(getPath("new_qr_2-2.pdf"));
-    Assert.assertEquals("Image5",result.getPlaceholderName());
+    Assert.assertEquals("Image5_5",result.getPlaceholderName());
 
     result = getNextSignaturePlaceHolder(getPath("new_qr_2_signed.pdf"));
-    Assert.assertEquals("Image8",result.getPlaceholderName());
+    Assert.assertEquals("Image8_8",result.getPlaceholderName());
   }
   @Test
   public void notSignedAndNoFields(){