diff options
author | Vincent Hennebert <vhennebert@apache.org> | 2011-10-24 16:29:56 +0000 |
---|---|---|
committer | Vincent Hennebert <vhennebert@apache.org> | 2011-10-24 16:29:56 +0000 |
commit | b073a605e44760bcb7add72968a3a2f78cf06d97 (patch) | |
tree | 50501d5167416c5a5a31f2319102efee829a8bd8 /src/java/org/apache/fop/fo/flow/InlineLevel.java | |
parent | 29ecb2d96c4c4b75785e160a55c7dc436cfef860 (diff) | |
download | xmlgraphics-fop-b073a605e44760bcb7add72968a3a2f78cf06d97.tar.gz xmlgraphics-fop-b073a605e44760bcb7add72968a3a2f78cf06d97.zip |
Removed the FO document pre-processing step that was adding ptr and creating a reduced FO tree.
* Removed addPtr.xsl and reduceFOTree.xsl
* Implemented Common Accessibility properties on objects that support them
* Added a special implementation of FOEventHandler to build the structure tree
* Added mockito library and its dependencies
* Added mocks for some FO nodes and properties
* Removed FOTreeUnitTester and converted it into a re-usable FODocumentParser class
* Re-worked table FO test cases accordingly
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ImproveAccessibility@1188205 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/fo/flow/InlineLevel.java')
-rw-r--r-- | src/java/org/apache/fop/fo/flow/InlineLevel.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/fo/flow/InlineLevel.java b/src/java/org/apache/fop/fo/flow/InlineLevel.java index 5410e1ca7..d23b775f0 100644 --- a/src/java/org/apache/fop/fo/flow/InlineLevel.java +++ b/src/java/org/apache/fop/fo/flow/InlineLevel.java @@ -25,6 +25,8 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.fo.FONode; import org.apache.fop.fo.FObjMixed; import org.apache.fop.fo.PropertyList; +import org.apache.fop.fo.properties.CommonAccessibility; +import org.apache.fop.fo.properties.CommonAccessibilityHolder; import org.apache.fop.fo.properties.CommonBorderPaddingBackground; import org.apache.fop.fo.properties.CommonFont; import org.apache.fop.fo.properties.CommonMarginInline; @@ -35,9 +37,10 @@ import org.apache.fop.fo.properties.SpaceProperty; * Class modelling the commonalities of several inline-level * formatting objects. */ -public abstract class InlineLevel extends FObjMixed { +public abstract class InlineLevel extends FObjMixed implements CommonAccessibilityHolder { // The value of properties relevant for inline-level FOs. + private CommonAccessibility commonAccessibility; private CommonBorderPaddingBackground commonBorderPaddingBackground; private CommonMarginInline commonMarginInline; private CommonFont commonFont; @@ -59,6 +62,7 @@ public abstract class InlineLevel extends FObjMixed { /** {@inheritDoc} */ public void bind(PropertyList pList) throws FOPException { super.bind(pList); + commonAccessibility = CommonAccessibility.getInstance(pList); commonBorderPaddingBackground = pList.getBorderPaddingBackgroundProps(); commonMarginInline = pList.getMarginInlineProps(); commonFont = pList.getFontProps(); @@ -68,6 +72,10 @@ public abstract class InlineLevel extends FObjMixed { lineHeight = pList.get(PR_LINE_HEIGHT).getSpace(); } + public CommonAccessibility getCommonAccessibility() { + return commonAccessibility; + } + /** @return the {@link CommonMarginInline} */ public CommonMarginInline getCommonMarginInline() { return commonMarginInline; |