diff options
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java index f3749f2ed..5e3464da7 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java @@ -48,19 +48,14 @@ import org.apache.fop.traits.MinOptMax; * an exception to this rule.) * This class can be extended to handle the creation and adding of the * inline area. - * TODO [GA] replace use of hungarian notation with normalized java naming */ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager implements InlineLevelLayoutManager { - /** - * logging instance - */ + /** logging instance */ protected static final Log log = LogFactory.getLog(LeafNodeLayoutManager.class); - /** - * The inline area that this leafnode will add. - */ + /** The inline area that this leafnode will add. */ protected InlineArea curArea = null; /** Any border, padding and background properties applying to this area */ protected CommonBorderPaddingBackground commonBorderPaddingBackground = null; @@ -68,7 +63,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager protected AlignmentContext alignmentContext = null; /** Flag to indicate if something was changed as part of the getChangeKnuthElements sequence */ - protected boolean isSomethingChanged = false; + protected boolean somethingChanged = false; /** Our area info for the Knuth elements */ protected AreaInfo areaInfo = null; @@ -77,32 +72,31 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager */ protected class AreaInfo { /** letter space count */ - protected short iLScount; + protected short letterSpaces; /** ipd of area */ protected MinOptMax ipdArea; /** true if hyphenated */ - protected boolean bHyphenated; + protected boolean isHyphenated; /** alignment context */ protected AlignmentContext alignmentContext; /** * Construct an area information item. - * @param iLS letter space count + * @param letterSpaces letter space count * @param ipd inline progression dimension - * @param bHyph true if hyphenated + * @param isHyphenated true if hyphenated * @param alignmentContext an alignment context */ - public AreaInfo(short iLS, MinOptMax ipd, boolean bHyph, + public AreaInfo(short letterSpaces, MinOptMax ipd, boolean isHyphenated, AlignmentContext alignmentContext) { - iLScount = iLS; - ipdArea = ipd; - bHyphenated = bHyph; + this.letterSpaces = letterSpaces; + this.ipdArea = ipd; + this.isHyphenated = isHyphenated; this.alignmentContext = alignmentContext; } } - /** * Create a Leaf node layout manager. * @param node the FObj to attach to this LM. @@ -145,18 +139,22 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager } /** - * This is a leaf-node, so this method is never called. + * This is a leaf-node, so this method should never be called. * @param childArea the childArea to add */ + @Override public void addChildArea(Area childArea) { + assert false; } /** - * This is a leaf-node, so this method is never called. + * This is a leaf-node, so this method should never be called. * @param childArea the childArea to get the parent for * @return the parent area */ + @Override public Area getParentArea(Area childArea) { + assert false; return null; } @@ -185,6 +183,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager * @param posIter the position iterator * @param context the layout context for adding the area */ + @Override public void addAreas(PositionIterator posIter, LayoutContext context) { addId(); @@ -260,6 +259,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager } /** {@inheritDoc} */ + @Override public List getNextKnuthElements(LayoutContext context, int alignment) { curArea = get(context); @@ -336,6 +336,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager } /** {@inheritDoc} */ + @Override public List getChangedKnuthElements(List oldList, int alignment) { if (isFinished()) { return null; |