aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2011-02-06 14:05:44 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2011-02-06 14:05:44 +0000
commit6ac76ab07369f3f0d9596ac21e4f439b8e7d3ddd (patch)
tree9c9781574b9cf1618320a2b392239d5023717d02
parent72e24a8ee9904be481395279127d507a03d64135 (diff)
downloadxmlgraphics-fop-6ac76ab07369f3f0d9596ac21e4f439b8e7d3ddd.tar.gz
xmlgraphics-fop-6ac76ab07369f3f0d9596ac21e4f439b8e7d3ddd.zip
Minor fixup: extract condition into local variable
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1067668 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
index ee43be6fa..974222271 100644
--- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
@@ -249,6 +249,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
referenceIPD = context.getRefIPD();
updateContentAreaIPDwithOverconstrainedAdjust();
+ boolean isRestart = (lmStack != null);
List<ListElement> contentList = new LinkedList<ListElement>();
List<ListElement> elements = new LinkedList<ListElement>();
@@ -278,7 +279,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
LayoutContext childLC = new LayoutContext(0);
List<ListElement> childElements;
LayoutManager currentChildLM;
- if (lmStack != null) {
+ if (isRestart) {
if (lmStack.isEmpty()) {
assert restartAtLM != null && restartAtLM.getParent() == this;
currentChildLM = restartAtLM;
@@ -342,7 +343,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
}
while ((currentChildLM = getChildLM()) != null) {
- if (lmStack != null) {
+ if (isRestart) {
currentChildLM.reset(); // TODO won't work with forced breaks
}