You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2014/12/19 12:19:47 UTC
svn commit: r1646672 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox:
pdfparser/PDFParser.java pdfwriter/COSWriter.java
pdmodel/graphics/shading/Line.java
pdmodel/graphics/shading/ShadedTriangle.java
Author: tilman
Date: Fri Dec 19 11:19:46 2014
New Revision: 1646672
URL: http://svn.apache.org/r1646672
Log:
PDFBOX-2576: avoid using implementation types, use the interface instead
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Line.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java?rev=1646672&r1=1646671&r2=1646672&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java Fri Dec 19 11:19:46 2014
@@ -24,6 +24,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import java.util.regex.Pattern;
import org.apache.commons.logging.Log;
@@ -80,7 +81,7 @@ public class PDFParser extends BaseParse
/**
* COSStream objects to check for length correctness.
*/
- private final HashSet<COSStream> streamLengthCheckSet = new HashSet<COSStream>();
+ private final Set<COSStream> streamLengthCheckSet = new HashSet<COSStream>();
/** Collects all Xref/trailer objects and resolves them into single
* object using startxref reference.
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java?rev=1646672&r1=1646671&r2=1646672&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java Fri Dec 19 11:19:46 2014
@@ -181,7 +181,7 @@ public class COSWriter implements ICOSVi
// the list of x ref entries to be made so far
private List<COSWriterXRefEntry> xRefEntries = new ArrayList<COSWriterXRefEntry>();
- private HashSet<COSBase> objectsToWriteSet = new HashSet<COSBase>();
+ private Set<COSBase> objectsToWriteSet = new HashSet<COSBase>();
//A list of objects to write.
private LinkedList<COSBase> objectsToWrite = new LinkedList<COSBase>();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Line.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Line.java?rev=1646672&r1=1646671&r2=1646672&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Line.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Line.java Fri Dec 19 11:19:46 2014
@@ -17,6 +17,7 @@ package org.apache.pdfbox.pdmodel.graphi
import java.awt.Point;
import java.util.HashSet;
+import java.util.Set;
/**
* This class describes a rasterized line. This was done as part of GSoC2014,
@@ -31,7 +32,7 @@ class Line
private final float[] color0;
private final float[] color1;
- protected final HashSet<Point> linePoints; // all the points in this rasterized line
+ protected final Set<Point> linePoints; // all the points in this rasterized line
/**
* Constructor of class Line.
@@ -62,9 +63,9 @@ class Line
* @param y1 coordinate
* @return all the points on the rasterized line from (x0, y0) to (x1, y1)
*/
- private HashSet<Point> calcLine(int x0, int y0, int x1, int y1)
+ private Set<Point> calcLine(int x0, int y0, int x1, int y1)
{
- HashSet<Point> points = new HashSet<Point>(3);
+ Set<Point> points = new HashSet<Point>(3);
int dx = (int) Math.round(Math.abs(x1 - x0));
int dy = (int) Math.round(Math.abs(y1 - y0));
int sx = x0 < x1 ? 1 : -1;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java?rev=1646672&r1=1646671&r2=1646672&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/ShadedTriangle.java Fri Dec 19 11:19:46 2014
@@ -18,6 +18,7 @@ package org.apache.pdfbox.pdmodel.graphi
import java.awt.Point;
import java.awt.geom.Point2D;
import java.util.HashSet;
+import java.util.Set;
/**
* This is an assistant class for accomplishing type 4, 5, 6 and 7 shading. It
@@ -99,7 +100,7 @@ class ShadedTriangle
*/
private int calcDeg(Point2D[] p)
{
- HashSet<Point> set = new HashSet<Point>();
+ Set<Point> set = new HashSet<Point>();
for (Point2D itp : p)
{
Point np = new Point((int) Math.round(itp.getX() * 1000), (int) Math.round(itp.getY() * 1000));