Browse Source

Removed unnecessary initializations of fields to values that already are the types' defaults


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ChangingIPDHack@793645 13f79535-47bb-0310-9956-ffa450edef68
Temp_ChangingIPDHack
Vincent Hennebert 15 years ago
parent
commit
f49da06a5f

+ 7
- 7
src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java View File

@@ -47,22 +47,22 @@ public abstract class AbstractLayoutManager extends AbstractBaseLayoutManager
private static Log log = LogFactory.getLog(AbstractLayoutManager.class);

/** Parent LayoutManager for this LayoutManager */
protected LayoutManager parentLM = null;
protected LayoutManager parentLM;
/** List of child LayoutManagers */
protected List childLMs = null;
protected List childLMs;
/** Iterator for child LayoutManagers */
protected ListIterator fobjIter = null;
protected ListIterator fobjIter;
/** Marker map for markers related to this LayoutManager */
private Map markers = null;
private Map markers;

/** True if this LayoutManager has handled all of its content. */
private boolean isFinished = false;
private boolean isFinished;

/** child LM during getNextKnuthElement phase */
protected LayoutManager curChildLM = null;
protected LayoutManager curChildLM;

/** child LM iterator during getNextKnuthElement phase */
protected ListIterator childLMiter = null;
protected ListIterator childLMiter;

private int lastGeneratedPosition = -1;
private int smallestPosNumberChecked = Integer.MAX_VALUE;

+ 13
- 18
src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java View File

@@ -53,31 +53,26 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
*/
private static Log log = LogFactory.getLog(BlockStackingLayoutManager.class);

/**
* Reference to FO whose areas it's managing or to the traits
* of the FO.
*/
//protected LayoutManager curChildLM = null; AbstractLayoutManager also defines this!
protected BlockParent parentArea = null;
protected BlockParent parentArea;

/** Value of the block-progression-unit (non-standard property) */
protected int bpUnit = 0;
protected int bpUnit;
/** space-before value adjusted for block-progression-unit handling */
protected int adjustedSpaceBefore = 0;
protected int adjustedSpaceBefore;
/** space-after value adjusted for block-progression-unit handling */
protected int adjustedSpaceAfter = 0;
protected int adjustedSpaceAfter;
/** Only used to store the original list when createUnitElements is called */
protected List storedList = null;
protected List storedList;
/** Indicates whether break before has been served or not */
protected boolean breakBeforeServed = false;
protected boolean breakBeforeServed;
/** Indicates whether the first visible mark has been returned by this LM, yet */
protected boolean firstVisibleMarkServed = false;
protected boolean firstVisibleMarkServed;
/** Reference IPD available */
protected int referenceIPD = 0;
protected int referenceIPD;
/** the effective start-indent value */
protected int startIndent = 0;
protected int startIndent;
/** the effective end-indent value */
protected int endIndent = 0;
protected int endIndent;
/**
* Holds the (one-time use) fo:block space-before
* and -after properties. Large fo:blocks are split
@@ -87,13 +82,13 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
* Block and space-after at the end of the last Block
* used in rendering the fo:block.
*/
protected MinOptMax foSpaceBefore = null;
protected MinOptMax foSpaceBefore;
/** see foSpaceBefore */
protected MinOptMax foSpaceAfter = null;
protected MinOptMax foSpaceAfter;

private Position auxiliaryPosition;

private int contentAreaIPD = 0;
private int contentAreaIPD;

/**
* @param node the fo this LM deals with

Loading…
Cancel
Save