Author: tilman
Date: Wed Sep 10 10:05:15 2025
New Revision: 1928329
Log:
PDFBOX-5660: refactor, as suggested by Valery Bokov
Modified:
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationFreeText.java
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationInk.java
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationTextMarkup.java
Modified:
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
==============================================================================
---
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
Wed Sep 10 09:57:47 2025 (r1928328)
+++
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotation.java
Wed Sep 10 10:05:15 2025 (r1928329)
@@ -322,6 +322,16 @@ public abstract class FDFAnnotation impl
return values;
}
+ final float[] parseFloats(String[] srcValues)
+ {
+ float[] values = new float[srcValues.length];
+ for (int i = 0; i < srcValues.length; i++)
+ {
+ values[i] = Float.parseFloat(srcValues[i]);
+ }
+ return values;
+ }
+
final PDRectangle createRectangleFromAttributes(String rect, String
errorMessage) throws IOException
{
String[] rectValues = rect.split(",");
Modified:
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationFreeText.java
==============================================================================
---
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationFreeText.java
Wed Sep 10 09:57:47 2025 (r1928328)
+++
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationFreeText.java
Wed Sep 10 10:05:15 2025 (r1928329)
@@ -116,11 +116,7 @@ public class FDFAnnotationFreeText exten
if (callout != null && !callout.isEmpty())
{
String[] calloutValues = callout.split(",");
- float[] values = new float[calloutValues.length];
- for (int i = 0; i < calloutValues.length; i++)
- {
- values[i] = Float.parseFloat(calloutValues[i]);
- }
+ float[] values = parseFloats(calloutValues);
setCallout(values);
}
}
Modified:
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationInk.java
==============================================================================
---
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationInk.java
Wed Sep 10 09:57:47 2025 (r1928328)
+++
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationInk.java
Wed Sep 10 10:05:15 2025 (r1928329)
@@ -96,11 +96,7 @@ public class FDFAnnotationInk extends FD
{
String gesture = node.getFirstChild().getNodeValue();
String[] gestureValues = gesture.split("[,;]");
- float[] values = new float[gestureValues.length];
- for (int j = 0; j < gestureValues.length; j++)
- {
- values[j] = Float.parseFloat(gestureValues[j]);
- }
+ float[] values = parseFloats(gestureValues);
inklist.add(values);
}
}
Modified:
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
==============================================================================
---
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
Wed Sep 10 09:57:47 2025 (r1928328)
+++
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolygon.java
Wed Sep 10 10:05:15 2025 (r1928329)
@@ -94,12 +94,8 @@ public class FDFAnnotationPolygon extend
{
throw new IOException("Error: missing element 'vertices'");
}
- String[] verticesValues = vertices.split("[,;]");
- float[] values = new float[verticesValues.length];
- for (int i = 0; i < verticesValues.length; i++)
- {
- values[i] = Float.parseFloat(verticesValues[i]);
- }
+ String[] verticesValues = vertices.split(",|;");
+ float[] values = parseFloats(verticesValues);
setVertices(values);
}
catch (XPathExpressionException e)
Modified:
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
==============================================================================
---
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
Wed Sep 10 09:57:47 2025 (r1928328)
+++
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationPolyline.java
Wed Sep 10 10:05:15 2025 (r1928329)
@@ -91,11 +91,7 @@ public class FDFAnnotationPolyline exten
throw new IOException("Error: missing element 'vertices'");
}
String[] verticesValues = vertices.split("[,;]");
- float[] values = new float[verticesValues.length];
- for (int i = 0; i < verticesValues.length; i++)
- {
- values[i] = Float.parseFloat(verticesValues[i]);
- }
+ float[] values = parseFloats(verticesValues);
setVertices(values);
}
catch (XPathExpressionException e)
Modified:
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationTextMarkup.java
==============================================================================
---
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationTextMarkup.java
Wed Sep 10 09:57:47 2025 (r1928328)
+++
pdfbox/branches/3.0/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/fdf/FDFAnnotationTextMarkup.java
Wed Sep 10 10:05:15 2025 (r1928329)
@@ -69,11 +69,7 @@ public abstract class FDFAnnotationTextM
{
throw new IOException("Error: too little numbers in attribute
'coords'");
}
- float[] values = new float[coordsValues.length];
- for (int i = 0; i < coordsValues.length; i++)
- {
- values[i] = Float.parseFloat(coordsValues[i]);
- }
+ float[] values = parseFloats(coordsValues);
setCoords(values);
}
