PDFBOX-5660: refactor, as suggested by Valery Bokov; closes #252

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

Author: THausherr

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java

@@ -478,9 +478,14 @@ public final void setPage(int page)
      * @return The annotation color, or null if there is none.
      */
     public Color getColor()
+    {
+        return getColor(COSName.C);
+    }
+
+    final Color getColor(COSName colorName)
     {
         Color retval = null;
-        COSArray array = annot.getCOSArray(COSName.C);
+        COSArray array = annot.getCOSArray(colorName);
         if (array != null)
         {
             float[] rgb = array.toFloatArray();

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java

@@ -111,17 +111,7 @@ public final void setInteriorColor(Color color)
      */
     public Color getInteriorColor()
     {
-        Color retval = null;
-        COSArray array = annot.getCOSArray(COSName.IC);
-        if (array != null)
-        {
-            float[] rgb = array.toFloatArray();
-            if (rgb.length >= 3)
-            {
-                retval = new Color(rgb[0], rgb[1], rgb[2]);
-            }
-        }
-        return retval;
+        return getColor(COSName.IC);
     }
 
     /**

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java

@@ -257,17 +257,7 @@ public final void setInteriorColor(Color color)
      */
     public Color getInteriorColor()
     {
-        Color retval = null;
-        COSArray array = annot.getCOSArray(COSName.IC);
-        if (array != null)
-        {
-            float[] rgb = array.toFloatArray();
-            if (rgb.length >= 3)
-            {
-                retval = new Color(rgb[0], rgb[1], rgb[2]);
-            }
-        }
-        return retval;
+        return getColor(COSName.IC);
     }
 
     /**

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java

@@ -147,16 +147,6 @@ public final void setInteriorColor(Color color)
      */
     public Color getInteriorColor()
     {
-        Color retval = null;
-        COSArray array = annot.getCOSArray(COSName.IC);
-        if (array != null)
-        {
-            float[] rgb = array.toFloatArray();
-            if (rgb.length >= 3)
-            {
-                retval = new Color(rgb[0], rgb[1], rgb[2]);
-            }
-        }
-        return retval;
+        return getColor(COSName.IC);
     }
 }

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java

@@ -230,16 +230,6 @@ public void setInteriorColor(Color color)
      */
     public Color getInteriorColor()
     {
-        Color retval = null;
-        COSArray array = annot.getCOSArray(COSName.IC);
-        if (array != null)
-        {
-            float[] rgb = array.toFloatArray();
-            if (rgb.length >= 3)
-            {
-                retval = new Color(rgb[0], rgb[1], rgb[2]);
-            }
-        }
-        return retval;
+        return getColor(COSName.IC);
     }
 }

pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java

@@ -112,17 +112,7 @@ public final void setInteriorColor(Color color)
      */
     public Color getInteriorColor()
     {
-        Color retval = null;
-        COSArray array = annot.getCOSArray(COSName.IC);
-        if (array != null)
-        {
-            float[] rgb = array.toFloatArray();
-            if (rgb.length >= 3)
-            {
-                retval = new Color(rgb[0], rgb[1], rgb[2]);
-            }
-        }
-        return retval;
+        return getColor(COSName.IC);
     }
 
     /**