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/06/19 19:10:05 UTC
svn commit: r1603945 - in /pdfbox/trunk/pdfbox/src:
main/java/org/apache/pdfbox/cos/ main/java/org/apache/pdfbox/encoding/
main/java/org/apache/pdfbox/encoding/conversion/
main/java/org/apache/pdfbox/filter/
main/java/org/apache/pdfbox/filter/ccitt/ ma...
Author: tilman
Date: Thu Jun 19 17:10:04 2014
New Revision: 1603945
URL: http://svn.apache.org/r1603945
Log:
PDFBOX-2147: remove public constructor from non-public class; remove unused imports; remove some unneeded casts
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/UnmodifiableCOSDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/conversion/CMapSubstitution.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85InputStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85OutputStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxG31DDecodeInputStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/PackedBitArray.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/EndstreamOutputStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFParser.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefEntry.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/font/TTFGlyph2D.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDPageLabels.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/PDFunctionType0.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/RC4Cipher.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendComposite.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/SoftMaskPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudTriangle.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Vertex.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/ParallelParameterized.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestPDFToImage.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/UnmodifiableCOSDictionary.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/UnmodifiableCOSDictionary.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/UnmodifiableCOSDictionary.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/cos/UnmodifiableCOSDictionary.java Thu Jun 19 17:10:04 2014
@@ -30,7 +30,7 @@ final class UnmodifiableCOSDictionary ex
/**
* @inheritDoc
*/
- public UnmodifiableCOSDictionary(COSDictionary dict)
+ UnmodifiableCOSDictionary(COSDictionary dict)
{
super();
items = dict.items;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/AFMEncoding.java Thu Jun 19 17:10:04 2014
@@ -42,7 +42,7 @@ public class AFMEncoding extends Encodin
Iterator<CharMetric> characters = fontInfo.getCharMetrics().iterator();
while( characters.hasNext() )
{
- CharMetric nextMetric = (CharMetric)characters.next();
+ CharMetric nextMetric = characters.next();
addCharacterEncoding( nextMetric.getCharacterCode(), nextMetric.getName() );
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/conversion/CMapSubstitution.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/conversion/CMapSubstitution.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/conversion/CMapSubstitution.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/encoding/conversion/CMapSubstitution.java Thu Jun 19 17:10:04 2014
@@ -77,7 +77,7 @@ public class CMapSubstitution
{
if (cmapSubstitutions.containsKey(cmapName))
{
- return (String)cmapSubstitutions.get(cmapName);
+ return cmapSubstitutions.get(cmapName);
}
return cmapName;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85InputStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85InputStream.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85InputStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85InputStream.java Thu Jun 19 17:10:04 2014
@@ -48,7 +48,7 @@ final class ASCII85InputStream extends F
*
* @param is The input stream to actually read from.
*/
- public ASCII85InputStream(InputStream is)
+ ASCII85InputStream(InputStream is)
{
super(is);
index = 0;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85OutputStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85OutputStream.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85OutputStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85OutputStream.java Thu Jun 19 17:10:04 2014
@@ -51,7 +51,7 @@ final class ASCII85OutputStream extends
*
* @param out The output stream to write to.
*/
- public ASCII85OutputStream(OutputStream out)
+ ASCII85OutputStream(OutputStream out)
{
super(out);
lineBreak = 36 * 2;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxG31DDecodeInputStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxG31DDecodeInputStream.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxG31DDecodeInputStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxG31DDecodeInputStream.java Thu Jun 19 17:10:04 2014
@@ -370,7 +370,7 @@ public final class CCITTFaxG31DDecodeInp
private final int bit;
private final int length;
- public RunLengthTreeNode(int bit, int length)
+ RunLengthTreeNode(int bit, int length)
{
this.bit = bit;
this.length = length;
@@ -405,7 +405,7 @@ public final class CCITTFaxG31DDecodeInp
private final int length;
- public MakeUpTreeNode(int length)
+ MakeUpTreeNode(int length)
{
this.length = length;
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/PackedBitArray.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/PackedBitArray.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/PackedBitArray.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/PackedBitArray.java Thu Jun 19 17:10:04 2014
@@ -32,7 +32,7 @@ final class PackedBitArray
* Constructs a new bit array.
* @param bitCount the number of bits to maintain
*/
- public PackedBitArray(int bitCount)
+ PackedBitArray(int bitCount)
{
this.bitCount = bitCount;
int byteCount = (bitCount + 7) / 8;
@@ -159,7 +159,7 @@ final class PackedBitArray
this.data[firstByte] &= ~(0xFF << startBitOffset);
for (int i = firstByte + 1; i < lastByte; i++)
{
- this.data[i] = (byte)0x00;
+ this.data[i] = 0x00;
}
if (endBitOffset > 0)
{
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/EndstreamOutputStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/EndstreamOutputStream.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/EndstreamOutputStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/EndstreamOutputStream.java Thu Jun 19 17:10:04 2014
@@ -39,7 +39,7 @@ class EndstreamOutputStream extends Buff
private int pos = 0;
private boolean mustFilter = true;
- public EndstreamOutputStream(OutputStream out)
+ EndstreamOutputStream(OutputStream out)
{
super(out);
}
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=1603945&r1=1603944&r2=1603945&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 Thu Jun 19 17:10:04 2014
@@ -904,7 +904,7 @@ public class PDFParser extends BaseParse
private COSObjectKey objectKey;
private COSObject object;
- public ConflictObj(long offsetValue, COSObjectKey key, COSObject pdfObject)
+ ConflictObj(long offsetValue, COSObjectKey key, COSObject pdfObject)
{
this.offset = offsetValue;
this.objectKey = key;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefEntry.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefEntry.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefEntry.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/XrefEntry.java Thu Jun 19 17:10:04 2014
@@ -28,7 +28,7 @@ class XrefEntry
private int generation = 0;
private boolean inUse = true;
- public XrefEntry(int objectNumber, int byteOffset, int generation, String inUse)
+ XrefEntry(int objectNumber, int byteOffset, int generation, String inUse)
{
this.objectNumber = objectNumber;
this.byteOffset = byteOffset;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/font/TTFGlyph2D.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/font/TTFGlyph2D.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/font/TTFGlyph2D.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/font/TTFGlyph2D.java Thu Jun 19 17:10:04 2014
@@ -27,14 +27,11 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fontbox.cmap.CMap;
-import org.apache.fontbox.ttf.CMAPEncodingEntry;
-import org.apache.fontbox.ttf.CMAPTable;
import org.apache.fontbox.ttf.GlyfDescript;
import org.apache.fontbox.ttf.GlyphData;
import org.apache.fontbox.ttf.GlyphDescription;
import org.apache.fontbox.ttf.HeaderTable;
import org.apache.fontbox.ttf.TrueTypeFont;
-import org.apache.pdfbox.encoding.Encoding;
import org.apache.pdfbox.pdmodel.font.PDCIDFontType2Font;
import org.apache.pdfbox.pdmodel.font.PDFont;
import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont;
@@ -447,7 +444,7 @@ public class TTFGlyph2D implements Glyph
private boolean onCurve = true;
private boolean endOfContour = false;
- public Point(int xValue, int yValue, boolean onCurveValue, boolean endOfContourValue)
+ Point(int xValue, int yValue, boolean onCurveValue, boolean endOfContourValue)
{
x = xValue;
y = yValue;
@@ -455,7 +452,7 @@ public class TTFGlyph2D implements Glyph
endOfContour = endOfContourValue;
}
- public Point(int xValue, int yValue)
+ Point(int xValue, int yValue)
{
this(xValue, yValue, false, false);
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDPageLabels.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDPageLabels.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDPageLabels.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDPageLabels.java Thu Jun 19 17:10:04 2014
@@ -288,7 +288,7 @@ public class PDPageLabels implements COS
private int numPages;
private int currentPage;
- public LabelGenerator(PDPageLabelRange label, int pages)
+ LabelGenerator(PDPageLabelRange label, int pages)
{
this.labelInfo = label;
this.numPages = pages;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/PDFunctionType0.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/PDFunctionType0.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/PDFunctionType0.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/function/PDFunctionType0.java Thu Jun 19 17:10:04 2014
@@ -339,7 +339,7 @@ public class PDFunctionType0 extends PDF
* @param inputNext coordinate of the "floor" point
*
*/
- public Rinterpol(float[] input, int[] inputPrev, int[] inputNext)
+ Rinterpol(float[] input, int[] inputPrev, int[] inputNext)
{
in = input;
inPrev = inputPrev;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/RC4Cipher.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/RC4Cipher.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/RC4Cipher.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/encryption/RC4Cipher.java Thu Jun 19 17:10:04 2014
@@ -34,7 +34,7 @@ class RC4Cipher
/**
* Constructor.
*/
- public RC4Cipher()
+ RC4Cipher()
{
salt = new int[256];
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendComposite.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendComposite.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendComposite.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendComposite.java Thu Jun 19 17:10:04 2014
@@ -74,7 +74,7 @@ public final class BlendComposite implem
private ColorModel dstColorModel;
private RenderingHints hints;
- public BlendCompositeContext(ColorModel srcColorModel, ColorModel dstColorModel,
+ BlendCompositeContext(ColorModel srcColorModel, ColorModel dstColorModel,
RenderingHints hints)
{
this.srcColorModel = srcColorModel;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/SoftMaskPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/SoftMaskPaint.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/SoftMaskPaint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/SoftMaskPaint.java Thu Jun 19 17:10:04 2014
@@ -80,7 +80,7 @@ public final class SoftMaskPaint impleme
private final int numColorComponents;
private final ColorModel parentColorModel;
- public Context(PaintContext parentContext) throws IOException
+ Context(PaintContext parentContext) throws IOException
{
this.parentContext = parentContext;
parentColorModel = parentContext.getColorModel();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java Thu Jun 19 17:10:04 2014
@@ -62,7 +62,7 @@ class AxialShadingContext implements Pai
* @param ctm the transformation matrix
* @param pageHeight height of the current page
*/
- public AxialShadingContext(PDShadingType2 shading, ColorModel cm, AffineTransform xform,
+ AxialShadingContext(PDShadingType2 shading, ColorModel cm, AffineTransform xform,
Matrix ctm, int pageHeight) throws IOException
{
this.shading = shading;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java Thu Jun 19 17:10:04 2014
@@ -47,7 +47,7 @@ class AxialShadingPaint implements Paint
* @param ctm current transformation matrix
* @param pageHeight size of the current page
*/
- public AxialShadingPaint(PDShadingType2 shadingType2, Matrix ctm, int pageHeight)
+ AxialShadingPaint(PDShadingType2 shadingType2, Matrix ctm, int pageHeight)
{
shading = shadingType2;
this.ctm = ctm;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudTriangle.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudTriangle.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudTriangle.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudTriangle.java Thu Jun 19 17:10:04 2014
@@ -61,7 +61,7 @@ class GouraudTriangle
* @param c point C of the triangle
* @param cColor color of point C
*/
- public GouraudTriangle(Point2D a, float[] aColor, Point2D b, float[] bColor, Point2D c, float[] cColor)
+ GouraudTriangle(Point2D a, float[] aColor, Point2D b, float[] bColor, Point2D c, float[] cColor)
{
pointA = a;
pointB = b;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java Thu Jun 19 17:10:04 2014
@@ -67,7 +67,7 @@ class RadialShadingContext implements Pa
* @param ctm the transformation matrix
* @param pageHeight height of the current page
*/
- public RadialShadingContext(PDShadingType3 shading, ColorModel cm, AffineTransform xform,
+ RadialShadingContext(PDShadingType3 shading, ColorModel cm, AffineTransform xform,
Matrix ctm, int pageHeight) throws IOException
{
this.shading = shading;
@@ -275,7 +275,7 @@ class RadialShadingContext implements Pa
{
try
{
- float input = (float) (domain[0] + (d1d0 * inputValue));
+ float input = (domain[0] + (d1d0 * inputValue));
values = shading.evalFunction(input);
}
catch (IOException exception)
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java Thu Jun 19 17:10:04 2014
@@ -47,7 +47,7 @@ class RadialShadingPaint implements Pain
* @param ctm current transformation matrix
* @param pageHeight size of the current page
*/
- public RadialShadingPaint(PDShadingType3 shading, Matrix ctm, int pageHeight)
+ RadialShadingPaint(PDShadingType3 shading, Matrix ctm, int pageHeight)
{
this.shading = shading;
this.ctm = ctm;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java Thu Jun 19 17:10:04 2014
@@ -57,7 +57,7 @@ class Type1ShadingContext implements Pai
* @param ctm current transformation matrix
* @param pageHeight height of the current page
*/
- public Type1ShadingContext(PDShadingType1 shading, ColorModel cm, AffineTransform xform,
+ Type1ShadingContext(PDShadingType1 shading, ColorModel cm, AffineTransform xform,
Matrix ctm, int pageHeight) throws IOException
{
this.shading = shading;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java Thu Jun 19 17:10:04 2014
@@ -46,7 +46,7 @@ class Type1ShadingPaint implements Paint
* @param ctm current transformation matrix
* @param pageHeight the height of the page
*/
- public Type1ShadingPaint(PDShadingType1 shading, Matrix ctm, int pageHeight)
+ Type1ShadingPaint(PDShadingType1 shading, Matrix ctm, int pageHeight)
{
this.shading = shading;
this.ctm = ctm;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java Thu Jun 19 17:10:04 2014
@@ -51,7 +51,7 @@ class Type4ShadingContext extends Gourau
* @param ctm current transformation matrix
* @param pageHeight height of the current page
*/
- public Type4ShadingContext(PDShadingType4 shading, ColorModel cm, AffineTransform xform,
+ Type4ShadingContext(PDShadingType4 shading, ColorModel cm, AffineTransform xform,
Matrix ctm, int pageHeight) throws IOException
{
super(shading, cm, xform, ctm, pageHeight);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java Thu Jun 19 17:10:04 2014
@@ -46,7 +46,7 @@ class Type4ShadingPaint implements Paint
* @param ctm current transformation matrix
* @param pageHeight the height of the page
*/
- public Type4ShadingPaint(PDShadingType4 shading, Matrix ctm, int pageHeight)
+ Type4ShadingPaint(PDShadingType4 shading, Matrix ctm, int pageHeight)
{
this.shading = shading;
this.ctm = ctm;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java Thu Jun 19 17:10:04 2014
@@ -49,7 +49,7 @@ class Type5ShadingContext extends Gourau
* @param pageHeight height of the current page
* @throws IOException if something went wrong
*/
- public Type5ShadingContext(PDShadingType5 shading, ColorModel cm, AffineTransform xform,
+ Type5ShadingContext(PDShadingType5 shading, ColorModel cm, AffineTransform xform,
Matrix ctm, int pageHeight) throws IOException
{
super(shading, cm, xform, ctm, pageHeight);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java Thu Jun 19 17:10:04 2014
@@ -46,7 +46,7 @@ class Type5ShadingPaint implements Paint
* @param ctm current transformation matrix
* @param pageHeight the height of the page
*/
- public Type5ShadingPaint(PDShadingType5 shading, Matrix ctm, int pageHeight)
+ Type5ShadingPaint(PDShadingType5 shading, Matrix ctm, int pageHeight)
{
this.shading = shading;
this.ctm = ctm;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Vertex.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Vertex.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Vertex.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Vertex.java Thu Jun 19 17:10:04 2014
@@ -29,7 +29,7 @@ class Vertex
public Point2D point;
public float[] color;
- public Vertex(byte flag, Point2D point, float[] color)
+ Vertex(byte flag, Point2D point, float[] color)
{
this.flag = flag;
this.point = point;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java Thu Jun 19 17:10:04 2014
@@ -1864,7 +1864,7 @@ public class PDFTextStripper extends PDF
textPosition = null;
}
- public LineItem(TextPosition textPosition)
+ LineItem(TextPosition textPosition)
{
this.textPosition = textPosition;
}
@@ -1892,7 +1892,7 @@ public class PDFTextStripper extends PDF
protected String text;
protected List<TextPosition> textPositions;
- public WordWithTextPositions(String word, List<TextPosition> positions)
+ WordWithTextPositions(String word, List<TextPosition> positions)
{
text = word;
textPositions = positions;
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/ParallelParameterized.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/ParallelParameterized.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/ParallelParameterized.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/ParallelParameterized.java Thu Jun 19 17:10:04 2014
@@ -37,7 +37,7 @@ public class ParallelParameterized exten
{
private ExecutorService executorService;
- public FixedThreadPoolScheduler()
+ FixedThreadPoolScheduler()
{
int cores = Runtime.getRuntime().availableProcessors();
executorService = Executors.newFixedThreadPool(cores);
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestPDFToImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestPDFToImage.java?rev=1603945&r1=1603944&r2=1603945&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestPDFToImage.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestPDFToImage.java Thu Jun 19 17:10:04 2014
@@ -146,16 +146,15 @@ public class TestPDFToImage extends Test
return (name.endsWith(".png") && name.startsWith(mcurFile.getName(),0));
}
});
- for (int n = 0; n < outFiles.length; n++)
+ for (File outFile : outFiles)
+ {
+ File inFile = new File(inDir + '/' + outFile.getName());
+ if (!inFile.exists() || !filesAreIdentical(outFile, inFile))
{
- File inFile = new File(inDir + '/' + outFiles[n].getName());
- if (!inFile.exists() ||
- !filesAreIdentical(outFiles[n], inFile))
- {
- this.bFail=true;
- log.warn("*** TEST FAILURE *** Input and output not identical for file: " + inFile.getName());
- }
+ this.bFail=true;
+ log.warn("*** TEST FAILURE *** Input and output not identical for file: " + inFile.getName());
}
+ }
}
catch(Exception e)
{
@@ -188,11 +187,10 @@ public class TestPDFToImage extends Test
return (name.endsWith(".pdf") || name.endsWith(".ai"));
}
});
-
- for (int n = 0; n < testFiles.length; n++)
- {
- doTestFile(testFiles[n], false, inDir, outDir);
- }
+ for (File testFile : testFiles)
+ {
+ doTestFile(testFile, false, inDir, outDir);
+ }
testFiles = new File(inDirExt).listFiles(new FilenameFilter()
{
public boolean accept(File dir, String name)
@@ -202,10 +200,9 @@ public class TestPDFToImage extends Test
});
if (testFiles != null)
{
- for (int n = 0; n < testFiles.length; n++)
- {
- doTestFile(testFiles[n], false, inDirExt, outDirExt);
- }
+ for (File testFile : testFiles) {
+ doTestFile(testFile, false, inDirExt, outDirExt);
+ }
}
}
else