Addressed findbugs and checkstyle regressions
Findbugs report generated with version 1.3.9.
Checkstyle report generated with version 5.5.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ImproveAccessibility@1240963 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index 67220fc..ba6b3ab 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -1,6 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<FindBugsFilter>
- <!-- The names of public methods will not be modified -->
+ <Match>
+ <Class name="org.apache.fop.render.intermediate.IFStructureTreeBuilder"/>
+ <Field name="delegate"/>
+ <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.fop.render.pdf.PDFLogicalStructureHandler"/>
+ <Field name="currentPage"/>
+ <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.fop.render.pdf.PDFLogicalStructureHandler"/>
+ <Field name="pageParentTreeArray"/>
+ <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.fop.render.pdf.PDFStructureTreeBuilder"/>
+ <Field name="logicalStructureHandler"/>
+ <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.fop.render.pdf.PDFStructureTreeBuilder"/>
+ <Field name="pdfFactory"/>
+ <Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR"/>
+ </Match>
+ <Match>
+ <Class name="org.apache.fop.accessibility.fo.FO2StructureTreeConverter$1"/>
+ <Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/>
+ </Match>
+ <Match>
+ <Class name="~org.apache.fop.accessibility.fo.FOEventRecorder.*"/>
+ <Bug pattern="SIC_INNER_SHOULD_BE_STATIC_ANON"/>
+ </Match>
<Match>
<Class name="org.apache.fop.afp.AFPDataObjectInfo"/>
<Method name="getUri"/>
@@ -5089,4 +5121,4 @@
<Bug pattern="REC_CATCH_EXCEPTION"/>
</Match>
<!-- /Automatically generated list of exclusions on 18 February 2011 -->
-</FindBugsFilter>
\ No newline at end of file
+</FindBugsFilter>
diff --git a/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java b/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java
index f8507a6..66eaece 100644
--- a/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java
+++ b/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java
@@ -33,23 +33,29 @@
private DummyStructureTreeEventHandler() { }
+ /** {@inheritDoc} */
public void startPageSequence(Locale locale) {
}
+ /** {@inheritDoc} */
public void endPageSequence() {
}
+ /** {@inheritDoc} */
public StructureTreeElement startNode(String name, Attributes attributes) {
return null;
}
+ /** {@inheritDoc} */
public void endNode(String name) {
}
+ /** {@inheritDoc} */
public StructureTreeElement startImageNode(String name, Attributes attributes) {
return null;
}
+ /** {@inheritDoc} */
public StructureTreeElement startReferencedNode(String name, Attributes attributes) {
return null;
}
diff --git a/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java b/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java
index 6578b45..79c589f 100644
--- a/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java
+++ b/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java
@@ -45,11 +45,13 @@
/**
* Factory method that creates a new instance.
* @param contentHandler The handler that receives SAX events
+ * @return -
*/
public static StructureTreeEventHandler newInstance(ContentHandler contentHandler) {
return new StructureTree2SAXEventAdapter(contentHandler);
}
+ /** {@inheritDoc} */
public void startPageSequence(Locale locale) {
try {
@@ -65,6 +67,7 @@
}
}
+ /** {@inheritDoc} */
public void endPageSequence() {
try {
contentHandler.endElement(IFConstants.NAMESPACE, IFConstants.EL_STRUCTURE_TREE,
@@ -79,6 +82,7 @@
}
}
+ /** {@inheritDoc} */
public StructureTreeElement startNode(String name, Attributes attributes) {
try {
if (name.equals("#PCDATA")) {
@@ -96,6 +100,7 @@
}
}
+ /** {@inheritDoc} */
public void endNode(String name) {
try {
contentHandler.endElement(FOElementMapping.URI, name,
@@ -105,10 +110,12 @@
}
}
+ /** {@inheritDoc} */
public StructureTreeElement startImageNode(String name, Attributes attributes) {
return startNode(name, attributes);
}
+ /** {@inheritDoc} */
public StructureTreeElement startReferencedNode(String name, Attributes attributes) {
return startNode(name, attributes);
}
diff --git a/src/java/org/apache/fop/accessibility/StructureTreeElement.java b/src/java/org/apache/fop/accessibility/StructureTreeElement.java
index 3a691c4..ebed2c8 100644
--- a/src/java/org/apache/fop/accessibility/StructureTreeElement.java
+++ b/src/java/org/apache/fop/accessibility/StructureTreeElement.java
@@ -17,9 +17,6 @@
/* $Id$ */
-/**
- *
- */
package org.apache.fop.accessibility;
/**
diff --git a/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java b/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
index b5cd0a5..957f408 100644
--- a/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
+++ b/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
@@ -362,7 +362,8 @@
if (node instanceof CommonAccessibilityHolder) {
addRole((CommonAccessibilityHolder) node, attributes);
}
- node.setStructureTreeElement(structureTreeEventHandler.startReferencedNode(localName, attributes));
+ node.setStructureTreeElement(
+ structureTreeEventHandler.startReferencedNode(localName, attributes));
}
private void startElementWithIDAndAltText(AbstractGraphics node) {
@@ -371,7 +372,8 @@
addRole(node, attributes);
addAttribute(attributes, ExtensionElementMapping.URI, "alt-text",
ExtensionElementMapping.STANDARD_PREFIX, node.getAltText());
- node.setStructureTreeElement(structureTreeEventHandler.startImageNode(localName, attributes));
+ node.setStructureTreeElement(
+ structureTreeEventHandler.startImageNode(localName, attributes));
}
private StructureTreeElement startElement(FONode node, AttributesImpl attributes) {
diff --git a/src/java/org/apache/fop/apps/FOUserAgent.java b/src/java/org/apache/fop/apps/FOUserAgent.java
index d5cc695..7d17365 100644
--- a/src/java/org/apache/fop/apps/FOUserAgent.java
+++ b/src/java/org/apache/fop/apps/FOUserAgent.java
@@ -102,7 +102,8 @@
private boolean locatorEnabled = true; // true by default (for error messages).
private boolean conserveMemoryPolicy = false;
private EventBroadcaster eventBroadcaster = new FOPEventBroadcaster();
- private StructureTreeEventHandler structureTreeEventHandler = DummyStructureTreeEventHandler.INSTANCE;
+ private StructureTreeEventHandler structureTreeEventHandler
+ = DummyStructureTreeEventHandler.INSTANCE;
/** Producer: Metadata element for the system/software that produces
* the document. (Some renderers can store this in the document.)
diff --git a/src/java/org/apache/fop/area/AreaTreeParser.java b/src/java/org/apache/fop/area/AreaTreeParser.java
index 29a3634..d8c22f2 100644
--- a/src/java/org/apache/fop/area/AreaTreeParser.java
+++ b/src/java/org/apache/fop/area/AreaTreeParser.java
@@ -163,8 +163,6 @@
private DOMImplementation domImplementation;
private Locator locator;
- private Attributes pageSequenceAttributes;
-
public Handler(AreaTreeModel treeModel, FOUserAgent userAgent,
ElementMappingRegistry elementMappingRegistry) {
this.treeModel = treeModel;
diff --git a/src/java/org/apache/fop/fo/FOEventHandler.java b/src/java/org/apache/fop/fo/FOEventHandler.java
index bed1f36..b7bcd42 100644
--- a/src/java/org/apache/fop/fo/FOEventHandler.java
+++ b/src/java/org/apache/fop/fo/FOEventHandler.java
@@ -122,9 +122,11 @@
public void endDocument() throws SAXException {
}
+ /** {@inheritDoc} */
public void startRoot(Root root) {
}
+ /** {@inheritDoc} */
public void endRoot(Root root) {
}
diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java
index 622ff86..b63c49a 100644
--- a/src/java/org/apache/fop/fo/FONode.java
+++ b/src/java/org/apache/fop/fo/FONode.java
@@ -913,6 +913,11 @@
}
+ /**
+ * Sets the structure tree element.
+ *
+ * @param structureTreeElement set.
+ */
public void setStructureTreeElement(StructureTreeElement structureTreeElement) {
throw new UnsupportedOperationException();
}
diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java
index 3858cde..43b5868 100644
--- a/src/java/org/apache/fop/fo/FOText.java
+++ b/src/java/org/apache/fop/fo/FOText.java
@@ -667,6 +667,7 @@
this.structureTreeElement = structureTreeElement;
}
+ /** @return the structure tree element. */
public StructureTreeElement getStructureTreeElement() {
return structureTreeElement;
}
diff --git a/src/java/org/apache/fop/fo/flow/AbstractGraphics.java b/src/java/org/apache/fop/fo/flow/AbstractGraphics.java
index 2b8fa8a..d5fe2b5 100644
--- a/src/java/org/apache/fop/fo/flow/AbstractGraphics.java
+++ b/src/java/org/apache/fop/fo/flow/AbstractGraphics.java
@@ -119,6 +119,7 @@
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
@@ -236,6 +237,7 @@
return structureTreeElement;
}
+ /** @return the alternative text property. */
public String getAltText() {
return altText;
}
diff --git a/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java b/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java
index 3ee44ac..0e99bfe 100644
--- a/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java
+++ b/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java
@@ -91,6 +91,7 @@
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java b/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
index 108896d..5a6893b 100644
--- a/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
+++ b/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
@@ -132,6 +132,7 @@
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java
index 4e5b6f1..84f1abc 100644
--- a/src/java/org/apache/fop/fo/flow/Block.java
+++ b/src/java/org/apache/fop/fo/flow/Block.java
@@ -151,6 +151,7 @@
getFOEventHandler().endBlock(this);
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java
index 61149b0..5953363 100644
--- a/src/java/org/apache/fop/fo/flow/Footnote.java
+++ b/src/java/org/apache/fop/fo/flow/Footnote.java
@@ -111,6 +111,7 @@
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/FootnoteBody.java b/src/java/org/apache/fop/fo/flow/FootnoteBody.java
index 24edaf5..1c103b6 100644
--- a/src/java/org/apache/fop/fo/flow/FootnoteBody.java
+++ b/src/java/org/apache/fop/fo/flow/FootnoteBody.java
@@ -36,6 +36,7 @@
*/
public class FootnoteBody extends FObj implements CommonAccessibilityHolder {
+ /** {@inheritDoc} */
private CommonAccessibility commonAccessibility;
/**
@@ -96,6 +97,7 @@
return FO_FOOTNOTE_BODY;
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/InitialPropertySet.java b/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
index 47ce749..b41021b 100644
--- a/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
+++ b/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
@@ -101,6 +101,7 @@
return FO_INITIAL_PROPERTY_SET;
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/InlineLevel.java b/src/java/org/apache/fop/fo/flow/InlineLevel.java
index d23b775..0da7690 100644
--- a/src/java/org/apache/fop/fo/flow/InlineLevel.java
+++ b/src/java/org/apache/fop/fo/flow/InlineLevel.java
@@ -72,6 +72,7 @@
lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java
index 390978c..35288ec 100644
--- a/src/java/org/apache/fop/fo/flow/ListBlock.java
+++ b/src/java/org/apache/fop/fo/flow/ListBlock.java
@@ -126,6 +126,7 @@
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java
index dfd74f9..aa17777 100644
--- a/src/java/org/apache/fop/fo/flow/ListItem.java
+++ b/src/java/org/apache/fop/fo/flow/ListItem.java
@@ -137,6 +137,7 @@
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java
index 0e5ce50..59169c2 100644
--- a/src/java/org/apache/fop/fo/flow/PageNumber.java
+++ b/src/java/org/apache/fop/fo/flow/PageNumber.java
@@ -127,6 +127,7 @@
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/table/Table.java b/src/java/org/apache/fop/fo/flow/table/Table.java
index ae7b8e4..c78f9f9 100644
--- a/src/java/org/apache/fop/fo/flow/table/Table.java
+++ b/src/java/org/apache/fop/fo/flow/table/Table.java
@@ -305,6 +305,7 @@
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java b/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
index 62acc57..51db27e 100644
--- a/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
+++ b/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
@@ -140,6 +140,7 @@
return FO_TABLE_AND_CAPTION;
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/table/TableCaption.java b/src/java/org/apache/fop/fo/flow/table/TableCaption.java
index 127c098..380b27f 100644
--- a/src/java/org/apache/fop/fo/flow/table/TableCaption.java
+++ b/src/java/org/apache/fop/fo/flow/table/TableCaption.java
@@ -116,6 +116,7 @@
return FO_TABLE_CAPTION;
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/table/TableCell.java b/src/java/org/apache/fop/fo/flow/table/TableCell.java
index 549377f..c4f9c2a 100644
--- a/src/java/org/apache/fop/fo/flow/table/TableCell.java
+++ b/src/java/org/apache/fop/fo/flow/table/TableCell.java
@@ -148,6 +148,7 @@
return true;
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java b/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
index 4b2a510..89ecd15 100644
--- a/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
+++ b/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
@@ -128,6 +128,7 @@
return columnNumberManager;
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/pagination/Root.java b/src/java/org/apache/fop/fo/pagination/Root.java
index 6df6e95..1a2ce71 100644
--- a/src/java/org/apache/fop/fo/pagination/Root.java
+++ b/src/java/org/apache/fop/fo/pagination/Root.java
@@ -181,6 +181,7 @@
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
@@ -365,6 +366,7 @@
}
+ /** @return locale proprty. */
public Locale getLocale() {
return locale;
}
diff --git a/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java b/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java
index 5348e88..9e7d80c 100644
--- a/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java
+++ b/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java
@@ -117,6 +117,7 @@
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java b/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java
index f444193..1db7d84 100644
--- a/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java
+++ b/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java
@@ -84,6 +84,7 @@
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
diff --git a/src/java/org/apache/fop/layoutmgr/TraitSetter.java b/src/java/org/apache/fop/layoutmgr/TraitSetter.java
index da548c2..0ae4994 100644
--- a/src/java/org/apache/fop/layoutmgr/TraitSetter.java
+++ b/src/java/org/apache/fop/layoutmgr/TraitSetter.java
@@ -597,7 +597,8 @@
* @param area the area to set the traits on
* @param structureTreeElement the element the area is associated to in the document structure
*/
- public static void addStructureTreeElement(Area area, StructureTreeElement structureTreeElement) {
+ public static void addStructureTreeElement(Area area,
+ StructureTreeElement structureTreeElement) {
if (structureTreeElement != null) {
area.addTrait(Trait.STRUCTURE_TREE_ELEMENT, structureTreeElement);
}
diff --git a/src/java/org/apache/fop/pdf/PDFRoot.java b/src/java/org/apache/fop/pdf/PDFRoot.java
index 177ca4b..76f2587 100644
--- a/src/java/org/apache/fop/pdf/PDFRoot.java
+++ b/src/java/org/apache/fop/pdf/PDFRoot.java
@@ -255,8 +255,8 @@
}
/**
- * Sets the language identifier of the document.
- * @param lang the language identifier of the document.
+ * Sets the locale of the document.
+ * @param locale the locale of the document.
*/
public void setLanguage(Locale locale) {
if (locale == null) {
diff --git a/src/java/org/apache/fop/pdf/PDFStructElem.java b/src/java/org/apache/fop/pdf/PDFStructElem.java
index 4462263..d2b3be6 100644
--- a/src/java/org/apache/fop/pdf/PDFStructElem.java
+++ b/src/java/org/apache/fop/pdf/PDFStructElem.java
@@ -179,6 +179,9 @@
return kidsAttached;
}
+ /**
+ * Class representing a placeholder for a PDF Structure Element.
+ */
public static class Placeholder extends PDFStructElem {
@Override
@@ -195,6 +198,11 @@
}
}
+ /**
+ * Constructor
+ * @param parent -
+ * @param name -
+ */
public Placeholder(PDFObject parent, String name) {
super(parent, new PDFName(name));
}
diff --git a/src/java/org/apache/fop/render/intermediate/IFConstants.java b/src/java/org/apache/fop/render/intermediate/IFConstants.java
index dba39be..c7bf13e 100644
--- a/src/java/org/apache/fop/render/intermediate/IFConstants.java
+++ b/src/java/org/apache/fop/render/intermediate/IFConstants.java
@@ -39,6 +39,7 @@
String EL_HEADER = "header";
/** element name trailer */
String EL_TRAILER = "trailer";
+ /** element name locale */
String EL_LOCALE = "locale";
/** element name page-sequence */
String EL_PAGE_SEQUENCE = "page-sequence";
diff --git a/src/java/org/apache/fop/render/intermediate/IFParser.java b/src/java/org/apache/fop/render/intermediate/IFParser.java
index 1a384c6..36f1fd8 100644
--- a/src/java/org/apache/fop/render/intermediate/IFParser.java
+++ b/src/java/org/apache/fop/render/intermediate/IFParser.java
@@ -160,8 +160,8 @@
private Attributes pageSequenceAttributes;
- private Map<String, StructureTreeElement> structureTreeElements =
- new HashMap<String, StructureTreeElement>();
+ private Map<String, StructureTreeElement> structureTreeElements
+ = new HashMap<String, StructureTreeElement>();
private final class StructureTreeHandler extends DefaultHandler {
@@ -191,12 +191,12 @@
structureTreeEventHandler.startNode(localName, attributes);
} else if (localName.equals("external-graphic")
|| localName.equals("instream-foreign-object")) {
- StructureTreeElement structureTreeElement =
- structureTreeEventHandler.startImageNode(localName, attributes);
+ StructureTreeElement structureTreeElement
+ = structureTreeEventHandler.startImageNode(localName, attributes);
structureTreeElements.put(structID, structureTreeElement);
} else {
- StructureTreeElement structureTreeElement =
- structureTreeEventHandler.startReferencedNode(localName, attributes);
+ StructureTreeElement structureTreeElement = structureTreeEventHandler
+ .startReferencedNode(localName, attributes);
structureTreeElements.put(structID, structureTreeElement);
}
}
@@ -289,7 +289,8 @@
} else if (DocumentNavigationExtensionConstants.NAMESPACE.equals(uri)) {
if (this.navParser == null) {
this.navParser = new DocumentNavigationHandler(
- this.documentHandler.getDocumentNavigationHandler(), structureTreeElements);
+ this.documentHandler.getDocumentNavigationHandler(),
+ structureTreeElements);
}
delegate = this.navParser;
delegateDepth++;
diff --git a/src/java/org/apache/fop/render/intermediate/IFRenderer.java b/src/java/org/apache/fop/render/intermediate/IFRenderer.java
index a2d8a0b..4657c88 100644
--- a/src/java/org/apache/fop/render/intermediate/IFRenderer.java
+++ b/src/java/org/apache/fop/render/intermediate/IFRenderer.java
@@ -852,8 +852,8 @@
/** {@inheritDoc} */
public void renderInlineViewport(InlineViewport viewport) {
- StructureTreeElement structElem =
- (StructureTreeElement) viewport.getTrait(Trait.STRUCTURE_TREE_ELEMENT);
+ StructureTreeElement structElem
+ = (StructureTreeElement) viewport.getTrait(Trait.STRUCTURE_TREE_ELEMENT);
establishStructureTreeElement(structElem);
pushdID(viewport);
Dimension dim = new Dimension(viewport.getIPD(), viewport.getBPD());
@@ -957,8 +957,8 @@
// warn if link trait found but not allowed, else create link
if (linkTraitFound) {
- StructureTreeElement structElem =
- (StructureTreeElement) ip.getTrait(Trait.STRUCTURE_TREE_ELEMENT);
+ StructureTreeElement structElem
+ = (StructureTreeElement) ip.getTrait(Trait.STRUCTURE_TREE_ELEMENT);
action.setStructureTreeElement(structElem);
Link link = new Link(action, ipRect);
this.deferredLinks.add(link);
@@ -1012,7 +1012,8 @@
String fontName = getInternalFontNameForArea(text);
int size = ((Integer) text.getTrait(Trait.FONT_SIZE)).intValue();
- StructureTreeElement structElem = (StructureTreeElement) text.getTrait(Trait.STRUCTURE_TREE_ELEMENT);
+ StructureTreeElement structElem
+ = (StructureTreeElement) text.getTrait(Trait.STRUCTURE_TREE_ELEMENT);
establishStructureTreeElement(structElem);
// This assumes that *all* CIDFonts use a /ToUnicode mapping
diff --git a/src/java/org/apache/fop/render/intermediate/IFSerializer.java b/src/java/org/apache/fop/render/intermediate/IFSerializer.java
index c6bf9af..7b9d958 100644
--- a/src/java/org/apache/fop/render/intermediate/IFSerializer.java
+++ b/src/java/org/apache/fop/render/intermediate/IFSerializer.java
@@ -165,7 +165,8 @@
handler.startPrefixMapping(XLINK_PREFIX, XLINK_NAMESPACE);
handler.startPrefixMapping(DocumentNavigationExtensionConstants.PREFIX,
DocumentNavigationExtensionConstants.NAMESPACE);
- handler.startPrefixMapping(InternalElementMapping.STANDARD_PREFIX, InternalElementMapping.URI);
+ handler.startPrefixMapping(InternalElementMapping.STANDARD_PREFIX,
+ InternalElementMapping.URI);
handler.startElement(EL_DOCUMENT);
} catch (SAXException e) {
throw new IFException("SAX error in startDocument()", e);
@@ -686,10 +687,10 @@
}
private void addStructureReference(AttributesImpl atts) {
- IFStructureTreeElement structureTreeElement =
- (IFStructureTreeElement) getContext().getStructureTreeElement();
+ IFStructureTreeElement structureTreeElement
+ = (IFStructureTreeElement) getContext().getStructureTreeElement();
if (structureTreeElement != null) {
- addStructRefAttribute(atts, structureTreeElement.id);
+ addStructRefAttribute(atts, structureTreeElement.getId());
}
}
@@ -786,7 +787,7 @@
XMLConstants.CDATA, IFUtil.toString(link.getTargetRect()));
if (getUserAgent().isAccessibilityEnabled()) {
addStructRefAttribute(atts,
- ((IFStructureTreeElement) link.getAction().getStructureTreeElement()).id);
+ ((IFStructureTreeElement) link.getAction().getStructureTreeElement()).getId());
}
try {
handler.startElement(DocumentNavigationExtensionConstants.LINK, atts);
diff --git a/src/java/org/apache/fop/render/intermediate/IFStructureTreeBuilder.java b/src/java/org/apache/fop/render/intermediate/IFStructureTreeBuilder.java
index b78ae35..3d98859 100644
--- a/src/java/org/apache/fop/render/intermediate/IFStructureTreeBuilder.java
+++ b/src/java/org/apache/fop/render/intermediate/IFStructureTreeBuilder.java
@@ -43,7 +43,7 @@
static final class IFStructureTreeElement implements StructureTreeElement {
- final String id;
+ private final String id;
IFStructureTreeElement() {
this.id = null;
@@ -52,6 +52,10 @@
IFStructureTreeElement(String id) {
this.id = id;
}
+
+ public String getId() {
+ return id;
+ }
}
/** A SAX handler that records events to replay them later. */
@@ -106,8 +110,8 @@
private static final class StartPrefixMapping extends SAXEventRecorder.Event {
- protected final String prefix;
- protected final String uri;
+ private final String prefix;
+ private final String uri;
private StartPrefixMapping(String prefix, String uri) {
this.prefix = prefix;
@@ -122,7 +126,7 @@
private static final class EndPrefixMapping extends SAXEventRecorder.Event {
- protected final String prefix;
+ private final String prefix;
private EndPrefixMapping(String prefix) {
this.prefix = prefix;
@@ -169,7 +173,8 @@
private StructureTreeEventHandler delegate;
- private final List<SAXEventRecorder> pageSequenceEventRecorders = new ArrayList<SAXEventRecorder>();
+ private final List<SAXEventRecorder> pageSequenceEventRecorders
+ = new ArrayList<SAXEventRecorder>();
private int idCounter;
diff --git a/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java b/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
index 693497b..c174a74 100644
--- a/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
+++ b/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
@@ -107,8 +107,8 @@
throw new SAXException(localName + " must be the root element!");
}
Rectangle targetRect = XMLUtil.getAttributeAsRectangle(attributes, "rect");
- structureTreeElement = structureTreeElements.get(
- attributes.getValue(InternalElementMapping.URI, InternalElementMapping.STRUCT_REF));
+ structureTreeElement = structureTreeElements.get(attributes.getValue(
+ InternalElementMapping.URI, InternalElementMapping.STRUCT_REF));
Link link = new Link(null, targetRect);
objectStack.push(link);
} else if (GOTO_XY.getLocalName().equals(localName)) {
diff --git a/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java b/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java
index c773b13..9b76d06 100644
--- a/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java
+++ b/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java
@@ -35,9 +35,11 @@
/**
* Standard structure types defined by the PDF Reference, Fourth Edition (PDF 1.5).
*/
- private static final Map<String, PDFName> STANDARD_STRUCTURE_TYPES = new HashMap<String, PDFName>();
+ private static final Map<String, PDFName> STANDARD_STRUCTURE_TYPES
+ = new HashMap<String, PDFName>();
- private static final Map<String, Mapper> DEFAULT_MAPPINGS = new java.util.HashMap<String, Mapper>();
+ private static final Map<String, Mapper> DEFAULT_MAPPINGS
+ = new java.util.HashMap<String, Mapper>();
private static final PDFName THEAD;
private static final PDFName NON_STRUCT;
diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java
index a3e3db4..dea5dcb 100644
--- a/src/java/org/apache/fop/render/rtf/RTFHandler.java
+++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java
@@ -1353,8 +1353,10 @@
RtfTextrun textrun = container.getTextrun();
textrun.addLeader(rtfAttr);
-
- } catch (Exception e) {
+ } catch (IOException e) {
+ log.error("startLeader: " + e.getMessage());
+ throw new RuntimeException(e.getMessage());
+ } catch (FOPException e) {
log.error("startLeader: " + e.getMessage());
throw new RuntimeException(e.getMessage());
}
diff --git a/src/java/org/apache/fop/render/xml/XMLRenderer.java b/src/java/org/apache/fop/render/xml/XMLRenderer.java
index 2a62d2c..5029346 100644
--- a/src/java/org/apache/fop/render/xml/XMLRenderer.java
+++ b/src/java/org/apache/fop/render/xml/XMLRenderer.java
@@ -105,8 +105,6 @@
/** If not null, the XMLRenderer will mimic another renderer by using its font setup. */
protected Renderer mimic;
- private int pageSequenceIndex;
-
/**
* Creates a new XML renderer.
*/
diff --git a/src/java/org/apache/fop/util/LanguageTags.java b/src/java/org/apache/fop/util/LanguageTags.java
index 070fa15..662fab9 100644
--- a/src/java/org/apache/fop/util/LanguageTags.java
+++ b/src/java/org/apache/fop/util/LanguageTags.java
@@ -37,7 +37,6 @@
*
* @param locale a locale
* @return the corresponding language tag
- * @throws NullPointerException if the specified locale is null
*/
public static String toLanguageTag(Locale locale) {
StringBuffer sb = new StringBuffer(5);
@@ -53,7 +52,8 @@
/**
* Converts an RFC 3066 compliant language tag to a locale.
*
- * @throws NullPointerException if the specified language tag is null
+ * @param languageTag language tag to convert
+ * @return the corresponding locale
*/
public static Locale toLocale(String languageTag) {
String[] parts = languageTag.split("-");
