You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/05/18 17:23:09 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr BlockStackingLayoutManager.java
jeremias 2005/05/18 08:23:09
Modified: src/java/org/apache/fop/layoutmgr
BlockStackingLayoutManager.java
Log:
Bugfix for space-after situation in block-containers.
Javadocs for protected variables.
Make two private variables protected as they are used by descendants, too.
Revision Changes Path
1.17 +7 -5 xml-fop/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
Index: BlockStackingLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BlockStackingLayoutManager.java 18 May 2005 08:59:36 -0000 1.16
+++ BlockStackingLayoutManager.java 18 May 2005 15:23:09 -0000 1.17
@@ -45,7 +45,6 @@
//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 @@
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 @@
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;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org