PDFBOX-5660: optimize, as suggested by Valery Bokov; improve javadoc; closes #257

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1928702 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDBorderStyleDictionary.java

@@ -145,7 +145,7 @@ public void setStyle(String s)
     /**
      * This will retrieve the border style, see the STYLE_* constants for valid values.
      *
-     * @return the style of the border
+     * @return the style of the border, never null.
      */
     public String getStyle()
     {

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/AnnotationBorder.java

@@ -42,9 +42,13 @@ static AnnotationBorder getAnnotationBorder(PDAnnotation annotation,
         if (borderStyle == null)
         {
             COSArray border = annotation.getBorder();
-            if (border.size() >= 3 && border.getObject(2) instanceof COSNumber)
+            if (border.size() >= 3)
             {
-                ab.width = ((COSNumber) border.getObject(2)).floatValue();
+                COSBase base = border.getObject(2);
+                if (base instanceof COSNumber)
+                {
+                    ab.width = ((COSNumber) base).floatValue();
+                }
             }
             if (border.size() > 3)
             {
@@ -58,11 +62,12 @@ static AnnotationBorder getAnnotationBorder(PDAnnotation annotation,
         else
         {
             ab.width = borderStyle.getWidth();
-            if (borderStyle.getStyle().equals(PDBorderStyleDictionary.STYLE_DASHED))
+            String style = borderStyle.getStyle();
+            if (style.equals(PDBorderStyleDictionary.STYLE_DASHED))
             {
                 ab.dashArray = borderStyle.getDashStyle().getDashArray();
             }
-            if (borderStyle.getStyle().equals(PDBorderStyleDictionary.STYLE_UNDERLINE))
+            if (style.equals(PDBorderStyleDictionary.STYLE_UNDERLINE))
             {
                 ab.underline = true;
             }