svn commit: r1929965 - in pdfbox/branches/2.0/pdfbox/src: main/java/org/apache/pdfbox/pdmodel/fdf test/java/org/apache/pdfbox/pdmodel/fdf

Tue, 25 Nov 2025 01:29:19 -0800 

Author: tilman
Date: Tue Nov 25 09:29:13 2025
New Revision: 1929965

Log:
PDFBOX-6104: fix border style initialization + add test, by Kai Keggenhoff

Modified:
   
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
   
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationTest.java

Modified: 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
==============================================================================
--- 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
   Tue Nov 25 09:29:07 2025        (r1929964)
+++ 
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
   Tue Nov 25 09:29:13 2025        (r1929965)
@@ -310,8 +310,8 @@ public abstract class FDFAnnotation impl
                 }
                 borderStyle.setDashStyle(dashPattern);
             }
-            setBorderStyle(borderStyle);
         }
+        setBorderStyle(borderStyle);
     }
 
     final float[] parseRectangleAttributes(String rect, String errorMessage) 
throws IOException

Modified: 
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationTest.java
==============================================================================
--- 
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationTest.java
       Tue Nov 25 09:29:07 2025        (r1929964)
+++ 
pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationTest.java
       Tue Nov 25 09:29:13 2025        (r1929965)
@@ -16,14 +16,17 @@
  */
 package org.apache.pdfbox.pdmodel.fdf;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
-import static org.junit.Assert.assertEquals;
-
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.List;
 
-import org.junit.Assert;
+import org.apache.pdfbox.util.Charsets;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
 /**
@@ -52,7 +55,7 @@ public class FDFAnnotationTest
                 if ("P&1 P&2 P&3".equals(annotationFreeText.getContents()))
                 {
                     testedPDFBox4345andPDFBox3646 = true;
-                    Assert.assertEquals("<body style=\"font:12pt Helvetica; "
+                    assertEquals("<body style=\"font:12pt Helvetica; "
                             + "color:#D66C00;\" 
xfa:APIVersion=\"Acrobat:7.0.8\" "
                             + "xfa:spec=\"2.0.2\" 
xmlns=\"http://www.w3.org/1999/xhtml\"; "
                             + 
"xmlns:xfa=\"http://www.xfa.org/schema/xfa-data/1.0/\";>\n" 
@@ -63,7 +66,48 @@ public class FDFAnnotationTest
                 }
             }
         }
-        Assert.assertTrue(testedPDFBox4345andPDFBox3646);
+        assertTrue(testedPDFBox4345andPDFBox3646);
         fdfDoc.close();
     }
+
+    @Test
+    public void testAnnotationWidth() throws IOException
+    {
+        String xfdf =
+            "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
+            "<xfdf xmlns=\"http://ns.adobe.com/xfdf/\"; 
xml:space=\"preserve\">" +
+            "<annots>" +
+            "<freetext" +
+            " width=\"0.00\"" +
+            " justification=\"left\" page=\"0\"" +
+            " date=\"D:20251124141013+01'00'\"" +
+            " flags=\"print\"" +
+            " name=\"b525be7e-4735-4598-ab7f-163cd0c7e48b\"" +
+            " rect=\"372.339325,722.633545,531.075317,736.673523\"" +
+            " title=\"Username\"" +
+            " BBox=\"372.339325,722.633545,531.075317,736.673523\"" +
+            " 
Matrix=\"1.000000,0.000000,0.000000,1.000000,0.000000,0.000000\"" +
+            " creationdate=\"D:20251124141003+01'00'\"" +
+            " opacity=\"1\"" +
+            " subject=\"Texteingabe\"" +
+            " intent=\"FreeTextTypewriter\"" +
+            " IT=\"FreeTextTypewriter\">" +
+            "<defaultappearance>&#x20;/Helv 12 Tf 0.415686 0.756863 0.690196 
rg</defaultappearance>" +
+            "<defaultstyle>font: &apos;Helvetica&apos; ,sans-serif 
12.00pt;color:#3049D1</defaultstyle>" +
+            "<contents>Your text is here.</contents>" +
+            "</freetext>" +
+            "</annots>" +
+            "<f href=\".xfdf\"/>" +
+            "</xfdf>";
+
+        ByteArrayInputStream inputStream = new 
ByteArrayInputStream(xfdf.getBytes(Charsets.UTF_8));
+
+        FDFDocument fdfDoc = FDFDocument.loadXFDF(inputStream);
+        List<FDFAnnotation> fdfAnnots = 
fdfDoc.getCatalog().getFDF().getAnnotations();
+        assertEquals(1, fdfAnnots.size());
+
+        FDFAnnotation annot = fdfAnnots.get(0);
+        assertNotNull(annot.getBorderStyle());
+        assertEquals(0f, annot.getBorderStyle().getWidth(), 0.01f);
+    }
 }
\ No newline at end of file

Reply via email to