You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2018/02/03 20:20:33 UTC

svn commit: r1823061 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/

Author: msahyoun
Date: Sat Feb  3 20:20:33 2018
New Revision: 1823061

URL: http://svn.apache.org/viewvc?rev=1823061&view=rev
Log:
PDFBOX-4096: use setCustomAppearanceHandler for all implementing classes; make code similar; shall be moved up at a later stage

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationCaret.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationCircle.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationFreeText.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationHighlight.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationInk.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLine.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLink.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPolygon.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPolyline.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSound.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquare.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquiggly.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationStrikeout.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationUnderline.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationCaret.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationCaret.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationCaret.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationCaret.java Sat Feb  3 20:20:33 2018
@@ -35,7 +35,7 @@ public class PDAnnotationCaret extends P
      */
     public static final String SUB_TYPE = "Caret";
 
-    private PDAppearanceHandler caretAppearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
 
     public PDAnnotationCaret()
     {
@@ -103,24 +103,24 @@ public class PDAnnotationCaret extends P
     /**
      * Set a custom appearance handler for generating the annotations appearance streams.
      * 
-     * @param caretAppearanceHandler
+     * @param appearanceHandler
      */
-    public void setCustomCaretAppearanceHandler(PDAppearanceHandler caretAppearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.caretAppearanceHandler = caretAppearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (caretAppearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDCaretAppearanceHandler appearanceHandler = new PDCaretAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            caretAppearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationCircle.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationCircle.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationCircle.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationCircle.java Sat Feb  3 20:20:33 2018
@@ -31,7 +31,7 @@ public class PDAnnotationCircle extends
      */
     public static final String SUB_TYPE = "Circle";
 
-    private PDAppearanceHandler circleAppearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
 
     public PDAnnotationCircle()
     {
@@ -51,24 +51,24 @@ public class PDAnnotationCircle extends
     /**
      * Set a custom appearance handler for generating the annotations appearance streams.
      * 
-     * @param circleAppearanceHandler
+     * @param appearanceHandler
      */
-    public void setCustomCircleAppearanceHandler(PDAppearanceHandler circleAppearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.circleAppearanceHandler = circleAppearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (circleAppearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDCircleAppearanceHandler appearanceHandler = new PDCircleAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            circleAppearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationFreeText.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationFreeText.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationFreeText.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationFreeText.java Sat Feb  3 20:20:33 2018
@@ -36,7 +36,7 @@ public class PDAnnotationFreeText extend
      */
     public static final String SUB_TYPE = "FreeText";
 
-    private PDAppearanceHandler freeTextAppearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
 
     public PDAnnotationFreeText()
     {
@@ -174,24 +174,24 @@ public class PDAnnotationFreeText extend
     /**
      * Set a custom appearance handler for generating the annotations appearance streams.
      * 
-     * @param freeTextAppearanceHandler
+     * @param appearanceHandler
      */
-    public void setCustomFreeTextAppearanceHandler(PDAppearanceHandler freeTextAppearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.freeTextAppearanceHandler = freeTextAppearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (freeTextAppearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDFreeTextAppearanceHandler appearanceHandler = new PDFreeTextAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            freeTextAppearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationHighlight.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationHighlight.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationHighlight.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationHighlight.java Sat Feb  3 20:20:33 2018
@@ -32,7 +32,7 @@ public class PDAnnotationHighlight exten
      */
     public static final String SUB_TYPE = "Highlight";
 
-    private PDAppearanceHandler appearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
 
      /**
      * Constructor.
@@ -57,22 +57,22 @@ public class PDAnnotationHighlight exten
      * 
      * @param appearanceHandler
      */
-    public void setCustomHighlightAppearanceHandler(PDAppearanceHandler appearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.appearanceHandler = appearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (appearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDHighlightAppearanceHandler appearanceHandler = new PDHighlightAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            appearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationInk.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationInk.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationInk.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationInk.java Sat Feb  3 20:20:33 2018
@@ -35,7 +35,7 @@ public class PDAnnotationInk extends PDA
      */
     public static final String SUB_TYPE = "Ink";
 
-    private PDAppearanceHandler inkAppearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
 
     /**
      * Constructor.
@@ -112,24 +112,24 @@ public class PDAnnotationInk extends PDA
     /**
      * Set a custom appearance handler for generating the annotations appearance streams.
      * 
-     * @param inkAppearanceHandler
+     * @param appearanceHandler
      */
-    public void setCustomInkAppearanceHandler(PDAppearanceHandler inkAppearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.inkAppearanceHandler = inkAppearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (inkAppearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDInkAppearanceHandler appearanceHandler = new PDInkAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            inkAppearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLine.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLine.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLine.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLine.java Sat Feb  3 20:20:33 2018
@@ -33,7 +33,7 @@ import org.apache.pdfbox.pdmodel.interac
  */
 public class PDAnnotationLine extends PDAnnotationMarkup
 {
-    private PDAppearanceHandler lineAppearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
 
     /*
      * The various values for intent (get/setIT, see the PDF 1.6 reference Table 8.22
@@ -460,24 +460,24 @@ public class PDAnnotationLine extends PD
     /**
      * Set a custom appearance handler for generating the annotations appearance streams.
      * 
-     * @param lineAppearanceHandler
+     * @param appearanceHandler
      */
-    public void setCustomLineAppearanceHandler(PDAppearanceHandler lineAppearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.lineAppearanceHandler = lineAppearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (lineAppearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDLineAppearanceHandler appearanceHandler = new PDLineAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            lineAppearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLink.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLink.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLink.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationLink.java Sat Feb  3 20:20:33 2018
@@ -237,11 +237,11 @@ public class PDAnnotationLink extends PD
     /**
      * Set a custom appearance handler for generating the annotations appearance streams.
      * 
-     * @param customAppearanceHandler
+     * @param appearanceHandler
      */
-    public void setCustomAppearanceHandler(PDAppearanceHandler customAppearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.customAppearanceHandler = customAppearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
     
     @Override

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPolygon.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPolygon.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPolygon.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPolygon.java Sat Feb  3 20:20:33 2018
@@ -35,7 +35,7 @@ public class PDAnnotationPolygon extends
      */
     public static final String SUB_TYPE = "Polygon";
 
-    private PDAppearanceHandler polygonAppearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
     
     /**
      * Constructor.
@@ -142,24 +142,24 @@ public class PDAnnotationPolygon extends
     /**
      * Set a custom appearance handler for generating the annotations appearance streams.
      * 
-     * @param polygonAppearanceHandler
+     * @param appearanceHandler
      */
-    public void setCustomPolygonAppearanceHandler(PDAppearanceHandler polygonAppearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.polygonAppearanceHandler = polygonAppearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (polygonAppearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDPolygonAppearanceHandler appearanceHandler = new PDPolygonAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            polygonAppearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPolyline.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPolyline.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPolyline.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPolyline.java Sat Feb  3 20:20:33 2018
@@ -35,7 +35,7 @@ public class PDAnnotationPolyline extend
      */
     public static final String SUB_TYPE = "PolyLine";
 
-    private PDAppearanceHandler polylineAppearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
     
     /**
      * Constructor.
@@ -108,24 +108,24 @@ public class PDAnnotationPolyline extend
     /**
      * Set a custom appearance handler for generating the annotations appearance streams.
      * 
-     * @param polylineAppearanceHandler
+     * @param appearanceHandler
      */
-    public void setCustomPolylineAppearanceHandler(PDAppearanceHandler polylineAppearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.polylineAppearanceHandler = polylineAppearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (polylineAppearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDPolylineAppearanceHandler appearanceHandler = new PDPolylineAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            polylineAppearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSound.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSound.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSound.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSound.java Sat Feb  3 20:20:33 2018
@@ -32,7 +32,7 @@ public class PDAnnotationSound extends P
      */
     public static final String SUB_TYPE = "Sound";
 
-    private PDAppearanceHandler soundAppearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
 
     public PDAnnotationSound()
     {
@@ -52,24 +52,24 @@ public class PDAnnotationSound extends P
     /**
      * Set a custom appearance handler for generating the annotations appearance streams.
      * 
-     * @param soundAppearanceHandler
+     * @param appearanceHandler
      */
-    public void setCustomSoundAppearanceHandler(PDAppearanceHandler soundAppearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.soundAppearanceHandler = soundAppearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (soundAppearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDSoundAppearanceHandler appearanceHandler = new PDSoundAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            soundAppearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquare.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquare.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquare.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquare.java Sat Feb  3 20:20:33 2018
@@ -32,7 +32,7 @@ public class PDAnnotationSquare extends
      */
     public static final String SUB_TYPE = "Square";
 
-    private PDAppearanceHandler squareAppearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
     
     public PDAnnotationSquare()
     {
@@ -52,24 +52,24 @@ public class PDAnnotationSquare extends
     /**
      * Set a custom appearance handler for generating the annotations appearance streams.
      * 
-     * @param squareAppearanceHandler
+     * @param appearanceHandler
      */
-    public void setCustomSquareAppearanceHandler(PDAppearanceHandler squareAppearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.squareAppearanceHandler = squareAppearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (squareAppearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDSquareAppearanceHandler appearanceHandler = new PDSquareAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            squareAppearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquiggly.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquiggly.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquiggly.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationSquiggly.java Sat Feb  3 20:20:33 2018
@@ -32,7 +32,7 @@ public class PDAnnotationSquiggly extend
      */
     public static final String SUB_TYPE = "Squiggly";
 
-    private PDAppearanceHandler appearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
 
      /**
      * Constructor.
@@ -57,22 +57,22 @@ public class PDAnnotationSquiggly extend
      * 
      * @param appearanceHandler
      */
-    public void setCustomSquigglyAppearanceHandler(PDAppearanceHandler appearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.appearanceHandler = appearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (appearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDSquigglyAppearanceHandler appearanceHandler = new PDSquigglyAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            appearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationStrikeout.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationStrikeout.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationStrikeout.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationStrikeout.java Sat Feb  3 20:20:33 2018
@@ -32,7 +32,7 @@ public class PDAnnotationStrikeout exten
      */
     public static final String SUB_TYPE = "StrikeOut";
 
-    private PDAppearanceHandler appearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
 
      /**
      * Constructor.
@@ -57,22 +57,22 @@ public class PDAnnotationStrikeout exten
      * 
      * @param appearanceHandler
      */
-    public void setCustomStrikeoutAppearanceHandler(PDAppearanceHandler appearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.appearanceHandler = appearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (appearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDStrikeoutAppearanceHandler appearanceHandler = new PDStrikeoutAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            appearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationUnderline.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationUnderline.java?rev=1823061&r1=1823060&r2=1823061&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationUnderline.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationUnderline.java Sat Feb  3 20:20:33 2018
@@ -32,7 +32,7 @@ public class PDAnnotationUnderline exten
      */
     public static final String SUB_TYPE = "Underline";
 
-    private PDAppearanceHandler appearanceHandler;
+    private PDAppearanceHandler customAppearanceHandler;
 
      /**
      * Constructor.
@@ -57,22 +57,22 @@ public class PDAnnotationUnderline exten
      * 
      * @param appearanceHandler
      */
-    public void setCustomUnderlineAppearanceHandler(PDAppearanceHandler appearanceHandler)
+    public void setCustomAppearanceHandler(PDAppearanceHandler appearanceHandler)
     {
-        this.appearanceHandler = appearanceHandler;
+        customAppearanceHandler = appearanceHandler;
     }
 
     @Override
     public void constructAppearances(ScratchFile scratchFile)
     {
-        if (appearanceHandler == null)
+        if (customAppearanceHandler == null)
         {
             PDUnderlineAppearanceHandler appearanceHandler = new PDUnderlineAppearanceHandler(this);
             appearanceHandler.generateAppearanceStreams();
         }
         else
         {
-            appearanceHandler.generateAppearanceStreams();
+            customAppearanceHandler.generateAppearanceStreams();
         }
     }
 }