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-ffa450edef68pull/24/head
@@ -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> | |||
</FindBugsFilter> |
@@ -33,23 +33,29 @@ public final class DummyStructureTreeEventHandler implements StructureTreeEventH | |||
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; | |||
} |
@@ -45,11 +45,13 @@ public final class StructureTree2SAXEventAdapter implements StructureTreeEventHa | |||
/** | |||
* 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 StructureTree2SAXEventAdapter implements StructureTreeEventHa | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public void endPageSequence() { | |||
try { | |||
contentHandler.endElement(IFConstants.NAMESPACE, IFConstants.EL_STRUCTURE_TREE, | |||
@@ -79,6 +82,7 @@ public final class StructureTree2SAXEventAdapter implements StructureTreeEventHa | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public StructureTreeElement startNode(String name, Attributes attributes) { | |||
try { | |||
if (name.equals("#PCDATA")) { | |||
@@ -96,6 +100,7 @@ public final class StructureTree2SAXEventAdapter implements StructureTreeEventHa | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public void endNode(String name) { | |||
try { | |||
contentHandler.endElement(FOElementMapping.URI, name, | |||
@@ -105,10 +110,12 @@ public final class StructureTree2SAXEventAdapter implements StructureTreeEventHa | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public StructureTreeElement startImageNode(String name, Attributes attributes) { | |||
return startNode(name, attributes); | |||
} | |||
/** {@inheritDoc} */ | |||
public StructureTreeElement startReferencedNode(String name, Attributes attributes) { | |||
return startNode(name, attributes); | |||
} |
@@ -17,9 +17,6 @@ | |||
/* $Id$ */ | |||
/** | |||
* | |||
*/ | |||
package org.apache.fop.accessibility; | |||
/** |
@@ -362,7 +362,8 @@ class StructureTreeEventTrigger extends FOEventHandler { | |||
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 FOEventHandler { | |||
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) { |
@@ -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.) |
@@ -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; |
@@ -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) { | |||
} | |||
@@ -913,6 +913,11 @@ public abstract class FONode implements Cloneable { | |||
} | |||
/** | |||
* Sets the structure tree element. | |||
* | |||
* @param structureTreeElement set. | |||
*/ | |||
public void setStructureTreeElement(StructureTreeElement structureTreeElement) { | |||
throw new UnsupportedOperationException(); | |||
} |
@@ -667,6 +667,7 @@ public class FOText extends FONode implements CharSequence { | |||
this.structureTreeElement = structureTreeElement; | |||
} | |||
/** @return the structure tree element. */ | |||
public StructureTreeElement getStructureTreeElement() { | |||
return structureTreeElement; | |||
} |
@@ -119,6 +119,7 @@ public abstract class AbstractGraphics extends FObj | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} | |||
@@ -236,6 +237,7 @@ public abstract class AbstractGraphics extends FObj | |||
return structureTreeElement; | |||
} | |||
/** @return the alternative text property. */ | |||
public String getAltText() { | |||
return altText; | |||
} |
@@ -91,6 +91,7 @@ public abstract class AbstractListItemPart extends FObj implements CommonAccessi | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -132,6 +132,7 @@ public abstract class AbstractPageNumberCitation extends FObj | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -151,6 +151,7 @@ public class Block extends FObjMixed implements BreakPropertySet, | |||
getFOEventHandler().endBlock(this); | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -111,6 +111,7 @@ public class Footnote extends FObj implements CommonAccessibilityHolder { | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -36,6 +36,7 @@ import org.apache.fop.fo.properties.CommonAccessibilityHolder; | |||
*/ | |||
public class FootnoteBody extends FObj implements CommonAccessibilityHolder { | |||
/** {@inheritDoc} */ | |||
private CommonAccessibility commonAccessibility; | |||
/** | |||
@@ -96,6 +97,7 @@ public class FootnoteBody extends FObj implements CommonAccessibilityHolder { | |||
return FO_FOOTNOTE_BODY; | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -101,6 +101,7 @@ public class InitialPropertySet extends FObj implements CommonAccessibilityHolde | |||
return FO_INITIAL_PROPERTY_SET; | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -72,6 +72,7 @@ public abstract class InlineLevel extends FObjMixed implements CommonAccessibili | |||
lineHeight = pList.get(PR_LINE_HEIGHT).getSpace(); | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -126,6 +126,7 @@ public class ListBlock extends FObj implements BreakPropertySet, CommonAccessibi | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -137,6 +137,7 @@ public class ListItem extends FObj implements BreakPropertySet, CommonAccessibil | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -127,6 +127,7 @@ public class PageNumber extends FObj | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -305,6 +305,7 @@ public class Table extends TableFObj implements ColumnNumberManagerHolder, Break | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -140,6 +140,7 @@ public class TableAndCaption extends FObj implements CommonAccessibilityHolder { | |||
return FO_TABLE_AND_CAPTION; | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -116,6 +116,7 @@ public class TableCaption extends FObj implements CommonAccessibilityHolder { | |||
return FO_TABLE_CAPTION; | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -148,6 +148,7 @@ public class TableCell extends TableFObj implements CommonAccessibilityHolder { | |||
return true; | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -128,6 +128,7 @@ public abstract class TableCellContainer extends TableFObj | |||
return columnNumberManager; | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -181,6 +181,7 @@ public class Root extends FObj implements CommonAccessibilityHolder { | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} | |||
@@ -365,6 +366,7 @@ public class Root extends FObj implements CommonAccessibilityHolder { | |||
} | |||
/** @return locale proprty. */ | |||
public Locale getLocale() { | |||
return locale; | |||
} |
@@ -117,6 +117,7 @@ public class Bookmark extends FObj implements CommonAccessibilityHolder { | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -84,6 +84,7 @@ public class BookmarkTitle extends FObj implements CommonAccessibilityHolder { | |||
} | |||
} | |||
/** {@inheritDoc} */ | |||
public CommonAccessibility getCommonAccessibility() { | |||
return commonAccessibility; | |||
} |
@@ -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); | |||
} |
@@ -255,8 +255,8 @@ public class PDFRoot extends PDFDictionary { | |||
} | |||
/** | |||
* 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) { |
@@ -179,6 +179,9 @@ public class PDFStructElem extends PDFDictionary implements StructureTreeElement | |||
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 PDFDictionary implements StructureTreeElement | |||
} | |||
} | |||
/** | |||
* Constructor | |||
* @param parent - | |||
* @param name - | |||
*/ | |||
public Placeholder(PDFObject parent, String name) { | |||
super(parent, new PDFName(name)); | |||
} |
@@ -39,6 +39,7 @@ public interface IFConstants extends XMLConstants { | |||
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"; |
@@ -160,8 +160,8 @@ public class IFParser implements IFConstants { | |||
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 IFConstants { | |||
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 IFConstants { | |||
} 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++; |
@@ -852,8 +852,8 @@ public class IFRenderer extends AbstractPathOrientedRenderer { | |||
/** {@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 AbstractPathOrientedRenderer { | |||
// 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 AbstractPathOrientedRenderer { | |||
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 |
@@ -165,7 +165,8 @@ public class IFSerializer extends AbstractXMLWritingIFDocumentHandler | |||
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 AbstractXMLWritingIFDocumentHandler | |||
} | |||
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 AbstractXMLWritingIFDocumentHandler | |||
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); |
@@ -43,7 +43,7 @@ final class IFStructureTreeBuilder implements StructureTreeEventHandler { | |||
static final class IFStructureTreeElement implements StructureTreeElement { | |||
final String id; | |||
private final String id; | |||
IFStructureTreeElement() { | |||
this.id = null; | |||
@@ -52,6 +52,10 @@ final class IFStructureTreeBuilder implements StructureTreeEventHandler { | |||
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 implements StructureTreeEventHandler { | |||
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 implements StructureTreeEventHandler { | |||
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 implements StructureTreeEventHandler { | |||
private StructureTreeEventHandler delegate; | |||
private final List<SAXEventRecorder> pageSequenceEventRecorders = new ArrayList<SAXEventRecorder>(); | |||
private final List<SAXEventRecorder> pageSequenceEventRecorders | |||
= new ArrayList<SAXEventRecorder>(); | |||
private int idCounter; | |||
@@ -107,8 +107,8 @@ public class DocumentNavigationHandler extends DefaultHandler | |||
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)) { |
@@ -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; |
@@ -1353,8 +1353,10 @@ public class RTFHandler extends FOEventHandler { | |||
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()); | |||
} |
@@ -105,8 +105,6 @@ public class XMLRenderer extends AbstractXMLRenderer { | |||
/** 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. | |||
*/ |
@@ -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("-"); |