Author: tilman
Date: Tue Sep 16 12:45:32 2025
New Revision: 1928508
Log:
PDFBOX-5660: refactor, as suggested by Valery Bokov; closes #252
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
Tue Sep 16 11:11:08 2025 (r1928507)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
Tue Sep 16 12:45:32 2025 (r1928508)
@@ -479,8 +479,13 @@ public abstract class FDFAnnotation impl
*/
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();
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java
Tue Sep 16 11:11:08 2025 (r1928507)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java
Tue Sep 16 12:45:32 2025 (r1928508)
@@ -111,17 +111,7 @@ public class FDFAnnotationCircle extends
*/
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);
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java
Tue Sep 16 11:11:08 2025 (r1928507)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java
Tue Sep 16 12:45:32 2025 (r1928508)
@@ -257,17 +257,7 @@ public class FDFAnnotationLine extends F
*/
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);
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
Tue Sep 16 11:11:08 2025 (r1928507)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
Tue Sep 16 12:45:32 2025 (r1928508)
@@ -147,16 +147,6 @@ public class FDFAnnotationPolygon extend
*/
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);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
Tue Sep 16 11:11:08 2025 (r1928507)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
Tue Sep 16 12:45:32 2025 (r1928508)
@@ -230,16 +230,6 @@ public class FDFAnnotationPolyline exten
*/
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);
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java
Tue Sep 16 11:11:08 2025 (r1928507)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java
Tue Sep 16 12:45:32 2025 (r1928508)
@@ -112,17 +112,7 @@ public class FDFAnnotationSquare extends
*/
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);
}
/**
