Author: phancock
Date: Mon Feb 6 10:18:09 2012
New Revision: 1240963
URL: http://svn.apache.org/viewvc?rev=1240963&view=rev
Log:
Addressed findbugs and checkstyle regressions
Findbugs report generated with version 1.3.9.
Checkstyle report generated with version 5.5.
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/findbugs-exclude.xml
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/StructureTreeElement.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/apps/FOUserAgent.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/area/AreaTreeParser.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FOEventHandler.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FONode.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FOText.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractGraphics.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/Block.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/Footnote.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/FootnoteBody.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/InlineLevel.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/ListBlock.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/ListItem.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/PageNumber.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/Table.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCaption.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCell.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/Root.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/layoutmgr/TraitSetter.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/pdf/PDFRoot.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/pdf/PDFStructElem.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFConstants.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFParser.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFSerializer.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFStructureTreeBuilder.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/rtf/RTFHandler.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/xml/XMLRenderer.java
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/util/LanguageTags.java
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/findbugs-exclude.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/findbugs-exclude.xml?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ImproveAccessibility/findbugs-exclude.xml
(original)
+++ xmlgraphics/fop/branches/Temp_ImproveAccessibility/findbugs-exclude.xml Mon
Feb 6 10:18:09 2012
@@ -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>
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/DummyStructureTreeEventHandler.java
Mon Feb 6 10:18:09 2012
@@ -33,23 +33,29 @@ public final class DummyStructureTreeEve
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;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/StructureTree2SAXEventAdapter.java
Mon Feb 6 10:18:09 2012
@@ -45,11 +45,13 @@ public final class StructureTree2SAXEven
/**
* 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 @@ public final class StructureTree2SAXEven
}
}
+ /** {@inheritDoc} */
public void endPageSequence() {
try {
contentHandler.endElement(IFConstants.NAMESPACE,
IFConstants.EL_STRUCTURE_TREE,
@@ -79,6 +82,7 @@ public final class StructureTree2SAXEven
}
}
+ /** {@inheritDoc} */
public StructureTreeElement startNode(String name, Attributes attributes) {
try {
if (name.equals("#PCDATA")) {
@@ -96,6 +100,7 @@ public final class StructureTree2SAXEven
}
}
+ /** {@inheritDoc} */
public void endNode(String name) {
try {
contentHandler.endElement(FOElementMapping.URI, name,
@@ -105,10 +110,12 @@ public final class StructureTree2SAXEven
}
}
+ /** {@inheritDoc} */
public StructureTreeElement startImageNode(String name, Attributes
attributes) {
return startNode(name, attributes);
}
+ /** {@inheritDoc} */
public StructureTreeElement startReferencedNode(String name, Attributes
attributes) {
return startNode(name, attributes);
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/StructureTreeElement.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/StructureTreeElement.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/StructureTreeElement.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/StructureTreeElement.java
Mon Feb 6 10:18:09 2012
@@ -17,9 +17,6 @@
/* $Id$ */
-/**
- *
- */
package org.apache.fop.accessibility;
/**
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/accessibility/fo/StructureTreeEventTrigger.java
Mon Feb 6 10:18:09 2012
@@ -362,7 +362,8 @@ class StructureTreeEventTrigger extends
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 @@ class StructureTreeEventTrigger extends
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) {
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/apps/FOUserAgent.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/apps/FOUserAgent.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/apps/FOUserAgent.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/apps/FOUserAgent.java
Mon Feb 6 10:18:09 2012
@@ -102,7 +102,8 @@ public class FOUserAgent {
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.)
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/area/AreaTreeParser.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/area/AreaTreeParser.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/area/AreaTreeParser.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/area/AreaTreeParser.java
Mon Feb 6 10:18:09 2012
@@ -163,8 +163,6 @@ public class AreaTreeParser {
private DOMImplementation domImplementation;
private Locator locator;
- private Attributes pageSequenceAttributes;
-
public Handler(AreaTreeModel treeModel, FOUserAgent userAgent,
ElementMappingRegistry elementMappingRegistry) {
this.treeModel = treeModel;
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FOEventHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FOEventHandler.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FOEventHandler.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FOEventHandler.java
Mon Feb 6 10:18:09 2012
@@ -122,9 +122,11 @@ public abstract class FOEventHandler {
public void endDocument() throws SAXException {
}
+ /** {@inheritDoc} */
public void startRoot(Root root) {
}
+ /** {@inheritDoc} */
public void endRoot(Root root) {
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FONode.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FONode.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FONode.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FONode.java
Mon Feb 6 10:18:09 2012
@@ -913,6 +913,11 @@ public abstract class FONode implements
}
+ /**
+ * Sets the structure tree element.
+ *
+ * @param structureTreeElement set.
+ */
public void setStructureTreeElement(StructureTreeElement
structureTreeElement) {
throw new UnsupportedOperationException();
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FOText.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FOText.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FOText.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/FOText.java
Mon Feb 6 10:18:09 2012
@@ -667,6 +667,7 @@ public class FOText extends FONode imple
this.structureTreeElement = structureTreeElement;
}
+ /** @return the structure tree element. */
public StructureTreeElement getStructureTreeElement() {
return structureTreeElement;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractGraphics.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractGraphics.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractGraphics.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractGraphics.java
Mon Feb 6 10:18:09 2012
@@ -119,6 +119,7 @@ public abstract class AbstractGraphics e
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
@@ -236,6 +237,7 @@ public abstract class AbstractGraphics e
return structureTreeElement;
}
+ /** @return the alternative text property. */
public String getAltText() {
return altText;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java
Mon Feb 6 10:18:09 2012
@@ -91,6 +91,7 @@ public abstract class AbstractListItemPa
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/AbstractPageNumberCitation.java
Mon Feb 6 10:18:09 2012
@@ -132,6 +132,7 @@ public abstract class AbstractPageNumber
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/Block.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/Block.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/Block.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/Block.java
Mon Feb 6 10:18:09 2012
@@ -151,6 +151,7 @@ public class Block extends FObjMixed imp
getFOEventHandler().endBlock(this);
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/Footnote.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/Footnote.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/Footnote.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/Footnote.java
Mon Feb 6 10:18:09 2012
@@ -111,6 +111,7 @@ public class Footnote extends FObj imple
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/FootnoteBody.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/FootnoteBody.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/FootnoteBody.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/FootnoteBody.java
Mon Feb 6 10:18:09 2012
@@ -36,6 +36,7 @@ import org.apache.fop.fo.properties.Comm
*/
public class FootnoteBody extends FObj implements CommonAccessibilityHolder {
+ /** {@inheritDoc} */
private CommonAccessibility commonAccessibility;
/**
@@ -96,6 +97,7 @@ public class FootnoteBody extends FObj i
return FO_FOOTNOTE_BODY;
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/InitialPropertySet.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/InitialPropertySet.java
Mon Feb 6 10:18:09 2012
@@ -101,6 +101,7 @@ public class InitialPropertySet extends
return FO_INITIAL_PROPERTY_SET;
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/InlineLevel.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/InlineLevel.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/InlineLevel.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/InlineLevel.java
Mon Feb 6 10:18:09 2012
@@ -72,6 +72,7 @@ public abstract class InlineLevel extend
lineHeight = pList.get(PR_LINE_HEIGHT).getSpace();
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/ListBlock.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/ListBlock.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/ListBlock.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/ListBlock.java
Mon Feb 6 10:18:09 2012
@@ -126,6 +126,7 @@ public class ListBlock extends FObj impl
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/ListItem.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/ListItem.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/ListItem.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/ListItem.java
Mon Feb 6 10:18:09 2012
@@ -137,6 +137,7 @@ public class ListItem extends FObj imple
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/PageNumber.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/PageNumber.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/PageNumber.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/PageNumber.java
Mon Feb 6 10:18:09 2012
@@ -127,6 +127,7 @@ public class PageNumber extends FObj
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/Table.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/Table.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/Table.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/Table.java
Mon Feb 6 10:18:09 2012
@@ -305,6 +305,7 @@ public class Table extends TableFObj imp
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
Mon Feb 6 10:18:09 2012
@@ -140,6 +140,7 @@ public class TableAndCaption extends FOb
return FO_TABLE_AND_CAPTION;
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCaption.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCaption.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCaption.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCaption.java
Mon Feb 6 10:18:09 2012
@@ -116,6 +116,7 @@ public class TableCaption extends FObj i
return FO_TABLE_CAPTION;
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCell.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCell.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCell.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCell.java
Mon Feb 6 10:18:09 2012
@@ -148,6 +148,7 @@ public class TableCell extends TableFObj
return true;
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
Mon Feb 6 10:18:09 2012
@@ -128,6 +128,7 @@ public abstract class TableCellContainer
return columnNumberManager;
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/Root.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/Root.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/Root.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/Root.java
Mon Feb 6 10:18:09 2012
@@ -181,6 +181,7 @@ public class Root extends FObj implement
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
@@ -365,6 +366,7 @@ public class Root extends FObj implement
}
+ /** @return locale proprty. */
public Locale getLocale() {
return locale;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java
Mon Feb 6 10:18:09 2012
@@ -117,6 +117,7 @@ public class Bookmark extends FObj imple
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java
Mon Feb 6 10:18:09 2012
@@ -84,6 +84,7 @@ public class BookmarkTitle extends FObj
}
}
+ /** {@inheritDoc} */
public CommonAccessibility getCommonAccessibility() {
return commonAccessibility;
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/layoutmgr/TraitSetter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/layoutmgr/TraitSetter.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/layoutmgr/TraitSetter.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/layoutmgr/TraitSetter.java
Mon Feb 6 10:18:09 2012
@@ -597,7 +597,8 @@ public final class TraitSetter {
* @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);
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/pdf/PDFRoot.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/pdf/PDFRoot.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/pdf/PDFRoot.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/pdf/PDFRoot.java
Mon Feb 6 10:18:09 2012
@@ -255,8 +255,8 @@ public class PDFRoot extends PDFDictiona
}
/**
- * 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) {
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/pdf/PDFStructElem.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/pdf/PDFStructElem.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/pdf/PDFStructElem.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/pdf/PDFStructElem.java
Mon Feb 6 10:18:09 2012
@@ -179,6 +179,9 @@ public class PDFStructElem extends PDFDi
return kidsAttached;
}
+ /**
+ * Class representing a placeholder for a PDF Structure Element.
+ */
public static class Placeholder extends PDFStructElem {
@Override
@@ -195,6 +198,11 @@ public class PDFStructElem extends PDFDi
}
}
+ /**
+ * Constructor
+ * @param parent -
+ * @param name -
+ */
public Placeholder(PDFObject parent, String name) {
super(parent, new PDFName(name));
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFConstants.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFConstants.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFConstants.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFConstants.java
Mon Feb 6 10:18:09 2012
@@ -39,6 +39,7 @@ public interface IFConstants extends XML
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";
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFParser.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFParser.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFParser.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFParser.java
Mon Feb 6 10:18:09 2012
@@ -160,8 +160,8 @@ public class IFParser implements IFConst
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 @@ public class IFParser implements IFConst
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 @@ public class IFParser implements IFConst
} 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++;
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFRenderer.java
Mon Feb 6 10:18:09 2012
@@ -852,8 +852,8 @@ public class IFRenderer extends Abstract
/** {@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 @@ public class IFRenderer extends Abstract
// 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 @@ public class IFRenderer extends Abstract
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
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFSerializer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFSerializer.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFSerializer.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFSerializer.java
Mon Feb 6 10:18:09 2012
@@ -165,7 +165,8 @@ public class IFSerializer extends Abstra
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 @@ public class IFSerializer extends Abstra
}
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 @@ public class IFSerializer extends Abstra
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);
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFStructureTreeBuilder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFStructureTreeBuilder.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFStructureTreeBuilder.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/IFStructureTreeBuilder.java
Mon Feb 6 10:18:09 2012
@@ -43,7 +43,7 @@ final class IFStructureTreeBuilder imple
static final class IFStructureTreeElement implements StructureTreeElement {
- final String id;
+ private final String id;
IFStructureTreeElement() {
this.id = null;
@@ -52,6 +52,10 @@ final class IFStructureTreeBuilder imple
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 @@ final class IFStructureTreeBuilder imple
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 @@ final class IFStructureTreeBuilder imple
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 @@ final class IFStructureTreeBuilder imple
private StructureTreeEventHandler delegate;
- private final List<SAXEventRecorder> pageSequenceEventRecorders = new
ArrayList<SAXEventRecorder>();
+ private final List<SAXEventRecorder> pageSequenceEventRecorders
+ = new ArrayList<SAXEventRecorder>();
private int idCounter;
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/intermediate/extensions/DocumentNavigationHandler.java
Mon Feb 6 10:18:09 2012
@@ -107,8 +107,8 @@ public class DocumentNavigationHandler e
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)) {
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java
Mon Feb 6 10:18:09 2012
@@ -35,9 +35,11 @@ final class FOToPDFRoleMap {
/**
* 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;
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/rtf/RTFHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/rtf/RTFHandler.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/rtf/RTFHandler.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/rtf/RTFHandler.java
Mon Feb 6 10:18:09 2012
@@ -1353,8 +1353,10 @@ public class RTFHandler extends FOEventH
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());
}
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/xml/XMLRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/xml/XMLRenderer.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/xml/XMLRenderer.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/render/xml/XMLRenderer.java
Mon Feb 6 10:18:09 2012
@@ -105,8 +105,6 @@ public class XMLRenderer extends Abstrac
/** 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.
*/
Modified:
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/util/LanguageTags.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/util/LanguageTags.java?rev=1240963&r1=1240962&r2=1240963&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/util/LanguageTags.java
(original)
+++
xmlgraphics/fop/branches/Temp_ImproveAccessibility/src/java/org/apache/fop/util/LanguageTags.java
Mon Feb 6 10:18:09 2012
@@ -37,7 +37,6 @@ public final class LanguageTags {
*
* @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 @@ public final class LanguageTags {
/**
* 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("-");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
