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 2015/05/22 23:41:24 UTC
svn commit: r1681241 - in /pdfbox/trunk/tools/src:
main/java/org/apache/pdfbox/tools/ main/java/org/apache/pdfbox/tools/gui/
test/java/org/apache/pdfbox/tools/ test/java/org/apache/pdfbox/tools/imageio/
Author: tilman
Date: Fri May 22 21:41:24 2015
New Revision: 1681241
URL: http://svn.apache.org/r1681241
Log:
PDFBOX-2576: make fields final; remove unneeded casts
Modified:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtensionFileFilter.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/MapEntry.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeModel.java
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestExtractText.java
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestPDFText2HTML.java
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtensionFileFilter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtensionFileFilter.java?rev=1681241&r1=1681240&r2=1681241&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtensionFileFilter.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtensionFileFilter.java Fri May 22 21:41:24 2015
@@ -29,7 +29,7 @@ import javax.swing.filechooser.FileFilte
public class ExtensionFileFilter extends FileFilter
{
private String[] extensions = null;
- private String desc;
+ private final String desc;
/**
* Constructor.
@@ -46,6 +46,7 @@ public class ExtensionFileFilter extends
/**
* {@inheritDoc}
*/
+ @Override
public boolean accept(File pathname)
{
if (pathname.isDirectory())
@@ -67,6 +68,7 @@ public class ExtensionFileFilter extends
/**
* {@inheritDoc}
*/
+ @Override
public String getDescription()
{
return desc;
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java?rev=1681241&r1=1681240&r2=1681241&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java Fri May 22 21:41:24 2015
@@ -60,7 +60,7 @@ public class ExtractImages
private boolean directJPEG;
private String prefix;
- private Set<COSStream> seen = new HashSet<COSStream>();
+ private final Set<COSStream> seen = new HashSet<COSStream>();
private int imageCounter = 1;
private ExtractImages()
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java?rev=1681241&r1=1681240&r2=1681241&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java Fri May 22 21:41:24 2015
@@ -18,7 +18,6 @@ package org.apache.pdfbox.tools;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
@@ -248,7 +247,7 @@ public class ExtractText
{
System.err.println("Processing embedded file " + ent.getKey() + ":");
}
- PDComplexFileSpecification spec = (PDComplexFileSpecification) ent.getValue();
+ PDComplexFileSpecification spec = ent.getValue();
PDEmbeddedFile file = spec.getEmbeddedFile();
if (file != null && "application/pdf".equals(file.getSubtype()))
{
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java?rev=1681241&r1=1681240&r2=1681241&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java Fri May 22 21:41:24 2015
@@ -186,7 +186,7 @@ public class PDFSplit
}
for( int i=0; documents != null && i<documents.size(); i++ )
{
- PDDocument doc = (PDDocument)documents.get( i );
+ PDDocument doc = documents.get(i);
doc.close();
}
}
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java?rev=1681241&r1=1681240&r2=1681241&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java Fri May 22 21:41:24 2015
@@ -64,7 +64,7 @@ public class WriteDecodedDoc
doc.setAllSecurityToBeRemoved(true);
for (Iterator<COSObject> i = doc.getDocument().getObjects().iterator(); i.hasNext();)
{
- COSBase base = ((COSObject) i.next()).getObject();
+ COSBase base = i.next().getObject();
if (base instanceof COSStream)
{
// just kill the filters
@@ -91,6 +91,7 @@ public class WriteDecodedDoc
* see usage() for commandline
*
* @param args command line arguments
+ * @throws java.io.IOException if the output could not be written
*/
public static void main(String[] args) throws IOException
{
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/MapEntry.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/MapEntry.java?rev=1681241&r1=1681240&r2=1681241&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/MapEntry.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/MapEntry.java Fri May 22 21:41:24 2015
@@ -74,6 +74,7 @@ public class MapEntry
*
* @return A string representation of this class.
*/
+ @Override
public String toString()
{
String retval = null;
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeModel.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeModel.java?rev=1681241&r1=1681240&r2=1681241&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeModel.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/gui/PDFTreeModel.java Fri May 22 21:41:24 2015
@@ -85,6 +85,7 @@ public class PDFTreeModel implements Tre
* @see #removeTreeModelListener
*
*/
+ @Override
public void addTreeModelListener(TreeModelListener l)
{
//required for interface
@@ -104,6 +105,7 @@ public class PDFTreeModel implements Tre
* @return the child of <code>parent</code> at index <code>index</code>
*
*/
+ @Override
public Object getChild(Object parent, int index)
{
Object retval = null;
@@ -158,6 +160,7 @@ public class PDFTreeModel implements Tre
* @return the number of children of the node <code>parent</code>
*
*/
+ @Override
public int getChildCount(Object parent)
{
int retval = 0;
@@ -198,6 +201,7 @@ public class PDFTreeModel implements Tre
* <code>child</code> or <code>parent</code> are <code>null</code>
*
*/
+ @Override
public int getIndexOfChild(Object parent, Object child)
{
int retval = -1;
@@ -260,6 +264,7 @@ public class PDFTreeModel implements Tre
* @return the root of the tree
*
*/
+ @Override
public Object getRoot()
{
return document.getDocument().getTrailer();
@@ -276,6 +281,7 @@ public class PDFTreeModel implements Tre
* @return true if <code>node</code> is a leaf
*
*/
+ @Override
public boolean isLeaf(Object node)
{
boolean isLeaf = !(node instanceof COSDictionary ||
@@ -295,6 +301,7 @@ public class PDFTreeModel implements Tre
*
*/
+ @Override
public void removeTreeModelListener(TreeModelListener l)
{
//required for interface
@@ -309,6 +316,7 @@ public class PDFTreeModel implements Tre
* @param newValue the new value from the TreeCellEditor
*
*/
+ @Override
public void valueForPathChanged(TreePath path, Object newValue)
{
//required for interface
Modified: pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestExtractText.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestExtractText.java?rev=1681241&r1=1681240&r2=1681241&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestExtractText.java (original)
+++ pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestExtractText.java Fri May 22 21:41:24 2015
@@ -49,7 +49,7 @@ public class TestExtractText extends Tes
}
String result = outBytes.toString("UTF-8");
- assertTrue(result.indexOf("PDF1") != -1);
- assertTrue(result.indexOf("PDF2") != -1);
+ assertTrue(result.contains("PDF1"));
+ assertTrue(result.contains("PDF2"));
}
}
Modified: pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestPDFText2HTML.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestPDFText2HTML.java?rev=1681241&r1=1681240&r2=1681241&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestPDFText2HTML.java (original)
+++ pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestPDFText2HTML.java Fri May 22 21:41:24 2015
@@ -57,8 +57,7 @@ public class TestPDFText2HTML extends Te
Matcher m = Pattern.compile("<title>(.*?)</title>").matcher(text);
assertTrue(m.find());
assertEquals("<script>あ", m.group(1));
-
- assertTrue(text.indexOf("<foo>") >= 0);
+ assertTrue(text.contains("<foo>"));
}
public void testStyle() throws IOException
Modified: pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java?rev=1681241&r1=1681240&r2=1681241&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java (original)
+++ pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/imageio/TestImageIOUtils.java Fri May 22 21:41:24 2015
@@ -260,6 +260,7 @@ public class TestImageIOUtils extends Te
File[] testFiles = new File(inDir).listFiles(new FilenameFilter()
{
+ @Override
public boolean accept(File dir, String name)
{
return (name.endsWith(".pdf") || name.endsWith(".ai"));