Clean up API calls and fix for findbugs 3
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop-pdf-images/trunk@1785288 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java b/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java
index baeb42b..9a46ac0 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/AbstractPDFBoxHandler.java
@@ -93,7 +93,7 @@
Map<Object, Object> objectCachePerFile = getObjectCache(getImagePath(originalImageUri), userAgent);
- PDPage page = pddoc.getDocumentCatalog().getPages().get(selectedPage);
+ PDPage page = pddoc.getPage(selectedPage);
if (targetPage.getPDFResources().getParentResources() == null) {
PDFResources res = pdfDoc.getFactory().makeResources();
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/FOPPDFSingleByteFont.java b/src/java/org/apache/fop/render/pdf/pdfbox/FOPPDFSingleByteFont.java
index fd8c836..5282869 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/FOPPDFSingleByteFont.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/FOPPDFSingleByteFont.java
@@ -357,7 +357,7 @@
for (int i = fontForEnc.getFirstChar(); i <= fontForEnc.getLastChar(); i++) {
if (codeToName.keySet().contains(i)) {
String s = codeToName.get(i);
- if (!added.contains(s) || (added.contains(s) && !encodingMap.containsKey(i))) {
+ if (!added.contains(s) || !encodingMap.containsKey(i)) {
if (!encodingMap.containsKey(i)) {
encodingMap.put(i, s);
} else {
diff --git a/src/java/org/apache/fop/render/pdf/pdfbox/PreloaderPDF.java b/src/java/org/apache/fop/render/pdf/pdfbox/PreloaderPDF.java
index fc1b99d..94db567 100644
--- a/src/java/org/apache/fop/render/pdf/pdfbox/PreloaderPDF.java
+++ b/src/java/org/apache/fop/render/pdf/pdfbox/PreloaderPDF.java
@@ -105,7 +105,7 @@
+ ") does not exist in the PDF file. The document has "
+ pddoc.getNumberOfPages() + " pages.");
}
- PDPage page = pddoc.getDocumentCatalog().getPages().get(selectedPage);
+ PDPage page = pddoc.getPage(selectedPage);
PDRectangle mediaBox = page.getMediaBox();
PDRectangle cropBox = page.getCropBox();
PDRectangle viewBox = cropBox != null ? cropBox : mediaBox;
diff --git a/test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java b/test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java
index 987317b..d164c63 100644
--- a/test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/FOPPDFSingleMultiByteFontTestCase.java
@@ -45,7 +45,7 @@
public class FOPPDFSingleMultiByteFontTestCase {
private COSDictionary getFont(PDDocument doc, String internalname) throws IOException {
- PDPage page = doc.getDocumentCatalog().getPages().get(0);
+ PDPage page = doc.getPage(0);
PDResources sourcePageResources = page.getResources();
COSDictionary fonts = (COSDictionary)sourcePageResources.getCOSObject().getDictionaryObject(COSName.FONT);
return (COSDictionary) fonts.getDictionaryObject(internalname);
diff --git a/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java b/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
index f5fd40d..401c2a3 100644
--- a/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
@@ -159,7 +159,7 @@
if (font.getFontType() == FontType.TYPE1C || font.getFontType() == FontType.CIDTYPE0) {
byte[] data = IOUtils.toByteArray(is);
CFFParser p = new CFFParser();
- p.parse(data).get(0);
+ p.parse(data);
} else if (font.getFontType() == FontType.TRUETYPE) {
TTFParser parser = new TTFParser();
parser.parse(is);
@@ -180,7 +180,7 @@
private String writeText(FontInfo fi, String pdf) throws IOException {
PDDocument doc = PDDocument.load(new File(pdf));
- PDPage page = doc.getDocumentCatalog().getPages().get(0);
+ PDPage page = doc.getPage(0);
AffineTransform at = new AffineTransform();
String c = getPDFBoxAdapter(true).createStreamFromPDFBoxPage(doc, page, pdf, at, fi, new Rectangle());
// PDResources sourcePageResources = page.findResources();
@@ -199,7 +199,7 @@
PDFBoxAdapter adapter = new PDFBoxAdapter(pdfpage, new HashMap(), new HashMap<Integer, PDFArray>());
adapter.setCurrentMCID(5);
PDDocument doc = PDDocument.load(new File(HELLOTagged));
- PDPage page = doc.getDocumentCatalog().getPages().get(0);
+ PDPage page = doc.getPage(0);
AffineTransform at = new AffineTransform();
Rectangle r = new Rectangle(0, 1650, 842000, 595000);
String stream = adapter.createStreamFromPDFBoxPage(doc, page, "key", at, null, r);
@@ -215,7 +215,7 @@
pdfpage.setObjectNumber(1);
PDFBoxAdapter adapter = new PDFBoxAdapter(pdfpage, new HashMap(), new HashMap<Integer, PDFArray>());
PDDocument doc = PDDocument.load(new File(ANNOT));
- PDPage page = doc.getDocumentCatalog().getPages().get(0);
+ PDPage page = doc.getPage(0);
AffineTransform at = new AffineTransform();
Rectangle r = new Rectangle(0, 1650, 842000, 595000);
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -231,7 +231,7 @@
public void testAnnot2() throws Exception {
PDFBoxAdapter adapter = getPDFBoxAdapter(false);
PDDocument doc = PDDocument.load(new File(ANNOT));
- PDPage page = doc.getDocumentCatalog().getPages().get(0);
+ PDPage page = doc.getPage(0);
COSArray annots = (COSArray) page.getCOSObject().getDictionaryObject(COSName.ANNOTS);
COSDictionary dict = (COSDictionary) ((COSObject)annots.get(0)).getObject();
dict.setItem(COSName.PARENT, COSInteger.ONE);
@@ -251,7 +251,7 @@
Map<Integer, PDFArray> pageNumbers = new HashMap<Integer, PDFArray>();
PDFBoxAdapter adapter = new PDFBoxAdapter(pdfpage, new HashMap(), pageNumbers);
PDDocument doc = PDDocument.load(new File(LINK));
- PDPage page = doc.getDocumentCatalog().getPages().get(0);
+ PDPage page = doc.getPage(0);
AffineTransform at = new AffineTransform();
Rectangle r = new Rectangle(0, 1650, 842000, 595000);
String stream = adapter.createStreamFromPDFBoxPage(doc, page, "key", at, null, r);
@@ -273,7 +273,7 @@
Map<Integer, PDFArray> pageNumbers = new HashMap<Integer, PDFArray>();
PDFBoxAdapter adapter = new PDFBoxAdapter(pdfpage, new HashMap(), pageNumbers);
PDDocument doc = PDDocument.load(new File(XFORM));
- PDPage page = doc.getDocumentCatalog().getPages().get(0);
+ PDPage page = doc.getPage(0);
AffineTransform at = new AffineTransform();
Rectangle r = new Rectangle(0, 1650, 842000, 595000);
adapter.createStreamFromPDFBoxPage(doc, page, "key", at, new FontInfo(), r);
@@ -412,7 +412,7 @@
PDFBoxAdapter adapter = new PDFBoxAdapter(
pdfpage, objectCachePerFile, new HashMap<Integer, PDFArray>(), pdfCache);
PDDocument doc = PDDocument.load(new File(LOOP));
- PDPage page = doc.getDocumentCatalog().getPages().get(0);
+ PDPage page = doc.getPage(0);
adapter.createStreamFromPDFBoxPage(doc, page, "key", new AffineTransform(), null, new Rectangle());
doc.close();
diff --git a/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java b/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java
index 874b705..0b28391 100644
--- a/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java
+++ b/test/java/org/apache/fop/render/pdf/PDFRotateTestCase.java
@@ -76,7 +76,7 @@
private AffineTransform getTransform(int angle) throws IOException {
PDFBoxAdapter adapter = PDFBoxAdapterTestCase.getPDFBoxAdapter(false);
PDDocument doc = PDDocument.load(new File(PDFBoxAdapterTestCase.ROTATE));
- PDPage page = doc.getDocumentCatalog().getPages().get(0);
+ PDPage page = doc.getPage(0);
page.setRotation(angle);
AffineTransform at = new AffineTransform();
Rectangle r = new Rectangle(0, 1650, 842000, 595000);
