diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2005-05-18 15:23:09 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2005-05-18 15:23:09 +0000 |
| commit | 407531b9a51d5175eeb1234613fcd0ba57e8cced (patch) | |
| tree | 17ff94d566c1dea2b0359c966fa01203c147cede /src/java/org/apache/fop/layoutmgr | |
| parent | f0e84dfed0618689d0c3eed1cf5a9995bcf664cb (diff) | |
| download | xmlgraphics-fop-407531b9a51d5175eeb1234613fcd0ba57e8cced.tar.gz xmlgraphics-fop-407531b9a51d5175eeb1234613fcd0ba57e8cced.zip | |
Bugfix for space-after situation in block-containers.
Javadocs for protected variables.
Make two private variables protected as they are used by descendants, too.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198651 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/layoutmgr')
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java index 335e882ab..550099cd0 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java @@ -45,7 +45,6 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager //protected LayoutManager curChildLM = null; AbstractLayoutManager also defines this! protected BlockParent parentArea = null; - /*LF*/ /** Value of the block-progression-unit (non-standard property) */ protected int bpUnit = 0; /** space-before value adjusted for block-progression-unit handling */ @@ -54,11 +53,14 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager protected int adjustedSpaceAfter = 0; /** Only used to store the original list when createUnitElements is called */ protected LinkedList storedList = null; + /** FO node */ protected FObj fobj; - private boolean bBreakBeforeServed = false; - private boolean bSpaceBeforeServed = false; + /** Indicates whether break before has been served or not */ + protected boolean bBreakBeforeServed = false; + /** Indicates whether space before has been served or not */ + protected boolean bSpaceBeforeServed = false; + /** Reference IPD available */ protected int referenceIPD = 0; - /*LF*/ public BlockStackingLayoutManager(FObj node) { super(node); @@ -842,7 +844,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager if (fobj instanceof org.apache.fop.fo.flow.Block) { spaceAfter = ((org.apache.fop.fo.flow.Block)fobj) .getCommonMarginBlock().spaceAfter; - } else if (fobj instanceof org.apache.fop.fo.flow.Block) { + } else if (fobj instanceof org.apache.fop.fo.flow.BlockContainer) { spaceAfter = ((org.apache.fop.fo.flow.BlockContainer)fobj) .getCommonMarginBlock().spaceAfter; } |