svn commit: r1883030 - in /pdfbox/branches/2.0: debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/ pdfbox/src/main/java/org/apache/pdfbox/pdmodel/ pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fixup/ pdfbox/src/test/java/org/apache/pdfbox/pdm...

[ms...@apache.org]

Author: msahyoun
Date: Sun Nov  1 07:08:41 2020
New Revision: 1883030

URL: http://svn.apache.org/viewvc?rev=1883030&view=rev
Log:
PDFBOX-4985: better name for default fixup applied to AcroForm

Added:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fixup/AcroFormDefaultFixup.java
      - copied, changed from r1883029, pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fixup/AcroFormFixup.java
Removed:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fixup/AcroFormFixup.java
Modified:
    pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java
    pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java

Modified: pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java?rev=1883030&r1=1883029&r2=1883030&view=diff
==============================================================================
--- pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java (original)
+++ pdfbox/branches/2.0/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java Sun Nov  1 07:08:41 2020
@@ -53,7 +53,7 @@ import org.apache.pdfbox.debugger.ui.Hig
 import org.apache.pdfbox.debugger.ui.ImageTypeMenu;
 import org.apache.pdfbox.debugger.ui.RenderDestinationMenu;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
-import org.apache.pdfbox.pdmodel.fixup.AcroFormFixup;
+import org.apache.pdfbox.pdmodel.fixup.AcroFormDefaultFixup;
 import org.apache.pdfbox.pdmodel.fixup.PDDocumentFixup;
 import org.apache.pdfbox.pdmodel.interactive.action.PDAction;
 import org.apache.pdfbox.pdmodel.interactive.action.PDActionGoTo;
@@ -164,7 +164,7 @@ public class PagePane implements ActionL
     {
         // get Acroform without applying fixups to enure that we get the original content
         boolean repairSelected = PDFDebugger.repairAcroFormMenuItem.isSelected();
-        PDDocumentFixup fixup = repairSelected ? new AcroFormFixup(document) : null;
+        PDDocumentFixup fixup = repairSelected ? new AcroFormDefaultFixup(document) : null;
         PDAcroForm acroForm = document.getDocumentCatalog().getAcroForm(fixup);
 
         if (acroForm == null)
@@ -240,7 +240,7 @@ public class PagePane implements ActionL
         if (actionEvent.getSource() == PDFDebugger.repairAcroFormMenuItem)
         {
             boolean repairSelected = PDFDebugger.repairAcroFormMenuItem.isSelected();
-            PDDocumentFixup fixup = repairSelected ? new AcroFormFixup(document) : null;
+            PDDocumentFixup fixup = repairSelected ? new AcroFormDefaultFixup(document) : null;
             document.getDocumentCatalog().getAcroForm(fixup);
             startRendering();
         }

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java?rev=1883030&r1=1883029&r2=1883030&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java Sun Nov  1 07:08:41 2020
@@ -36,7 +36,7 @@ import org.apache.pdfbox.pdmodel.common.
 import org.apache.pdfbox.pdmodel.common.PDPageLabels;
 import org.apache.pdfbox.pdmodel.documentinterchange.logicalstructure.PDMarkInfo;
 import org.apache.pdfbox.pdmodel.documentinterchange.logicalstructure.PDStructureTreeRoot;
-import org.apache.pdfbox.pdmodel.fixup.AcroFormFixup;
+import org.apache.pdfbox.pdmodel.fixup.AcroFormDefaultFixup;
 import org.apache.pdfbox.pdmodel.fixup.PDDocumentFixup;
 import org.apache.pdfbox.pdmodel.graphics.color.PDOutputIntent;
 import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties;
@@ -110,7 +110,7 @@ public class PDDocumentCatalog implement
      */
     public PDAcroForm getAcroForm()
     {
-        return getAcroForm(new AcroFormFixup(document));
+        return getAcroForm(new AcroFormDefaultFixup(document));
     }
 
     /**

Copied: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fixup/AcroFormDefaultFixup.java (from r1883029, pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fixup/AcroFormFixup.java)
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fixup/AcroFormDefaultFixup.java?p2=pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fixup/AcroFormDefaultFixup.java&p1=pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fixup/AcroFormFixup.java&r1=1883029&r2=1883030&rev=1883030&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fixup/AcroFormFixup.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fixup/AcroFormDefaultFixup.java Sun Nov  1 07:08:41 2020
@@ -21,9 +21,9 @@ import org.apache.pdfbox.pdmodel.fixup.p
 import org.apache.pdfbox.pdmodel.fixup.processor.AcroFormGenerateAppearancesProcessor;
 import org.apache.pdfbox.pdmodel.fixup.processor.AcroFormOrphanWidgetsProcessor;
 
-public class AcroFormFixup extends AbstractFixup
+public class AcroFormDefaultFixup extends AbstractFixup
 { 
-    public AcroFormFixup(PDDocument document)
+    public AcroFormDefaultFixup(PDDocument document)
     { 
         super(document); 
     }

Modified: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java?rev=1883030&r1=1883029&r2=1883030&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFromAnnotsTest.java Sun Nov  1 07:08:41 2020
@@ -27,7 +27,7 @@ import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.io.IOUtils;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.fixup.AcroFormFixup;
+import org.apache.pdfbox.pdmodel.fixup.AcroFormDefaultFixup;
 import org.junit.Test;
 
 /**
@@ -119,7 +119,7 @@ public class PDAcroFormFromAnnotsTest
             COSDictionary cosAcroForm = (COSDictionary) catalog.getCOSObject().getDictionaryObject(COSName.ACRO_FORM);
             COSArray cosFields = (COSArray) cosAcroForm.getDictionaryObject(COSName.FIELDS);
             assertEquals("Initially there shall be 0 fields", 0, cosFields.size());
-            PDAcroForm acroForm = catalog.getAcroForm(new AcroFormFixup(testPdf));
+            PDAcroForm acroForm = catalog.getAcroForm(new AcroFormDefaultFixup(testPdf));
             assertEquals("After rebuild there shall be " + numFormFieldsByAcrobat + " fields", numFormFieldsByAcrobat, acroForm.getFields().size());
         }
         finally