Author: tilman
Date: Tue Sep 16 12:51:00 2025
New Revision: 1928510
Log:
PDFBOX-5660: refactor, as suggested by Valery Bokov
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
Tue Sep 16 12:46:47 2025 (r1928509)
+++
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
Tue Sep 16 12:51:00 2025 (r1928510)
@@ -491,8 +491,13 @@ public abstract class FDFAnnotation impl
*/
public Color getColor()
{
+ return getColor(COSName.C);
+ }
+
+ final Color getColor(COSName colorName)
+ {
Color retval = null;
- COSArray array = (COSArray) annot.getDictionaryObject(COSName.C);
+ COSArray array = annot.getCOSArray(colorName);
if (array != null)
{
float[] rgb = array.toFloatArray();
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java
Tue Sep 16 12:46:47 2025 (r1928509)
+++
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationCircle.java
Tue Sep 16 12:51:00 2025 (r1928510)
@@ -113,17 +113,7 @@ public class FDFAnnotationCircle extends
*/
public Color getInteriorColor()
{
- Color retval = null;
- COSArray array = (COSArray) annot.getDictionaryObject(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/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java
Tue Sep 16 12:46:47 2025 (r1928509)
+++
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationLine.java
Tue Sep 16 12:51:00 2025 (r1928510)
@@ -283,17 +283,7 @@ public class FDFAnnotationLine extends F
*/
public Color getInteriorColor()
{
- Color retval = null;
- COSArray array = (COSArray) annot.getDictionaryObject(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/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
Tue Sep 16 12:46:47 2025 (r1928509)
+++
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
Tue Sep 16 12:51:00 2025 (r1928510)
@@ -158,16 +158,6 @@ public class FDFAnnotationPolygon extend
*/
public Color getInteriorColor()
{
- Color retval = null;
- COSArray array = (COSArray) annot.getDictionaryObject(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/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
Tue Sep 16 12:46:47 2025 (r1928509)
+++
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
Tue Sep 16 12:51:00 2025 (r1928510)
@@ -259,16 +259,6 @@ public class FDFAnnotationPolyline exten
*/
public Color getInteriorColor()
{
- Color retval = null;
- COSArray array = (COSArray) annot.getDictionaryObject(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/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java
==============================================================================
---
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java
Tue Sep 16 12:46:47 2025 (r1928509)
+++
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationSquare.java
Tue Sep 16 12:51:00 2025 (r1928510)
@@ -114,17 +114,7 @@ public class FDFAnnotationSquare extends
*/
public Color getInteriorColor()
{
- Color retval = null;
- COSArray array = (COSArray) annot.getDictionaryObject(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);
}
/**
