aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas L. Delmelle <adelmelle@apache.org>2008-06-23 21:22:48 +0000
committerAndreas L. Delmelle <adelmelle@apache.org>2008-06-23 21:22:48 +0000
commit35ca6c79d80e155e5dc1257c478c6d41947c49e5 (patch)
treecf63831ca3b908423eeaa76fcfb17308f660c209
parent4796fd3e354a8ee284576bc9f402ed365c052dbb (diff)
downloadxmlgraphics-fop-35ca6c79d80e155e5dc1257c478c6d41947c49e5.tar.gz
xmlgraphics-fop-35ca6c79d80e155e5dc1257c478c6d41947c49e5.zip
Minor cleanup: remove double storage of the FObj
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@670763 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java
index a5bbdb33c..3ce4a6f9c 100644
--- a/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java
@@ -24,26 +24,21 @@ import org.apache.fop.area.inline.InlineParent;
import org.apache.fop.area.Block;
import org.apache.fop.area.LineArea;
import org.apache.fop.fo.flow.Wrapper;
-import org.apache.fop.layoutmgr.BlockLayoutManager;
-import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
-import org.apache.fop.layoutmgr.LayoutContext;
-import org.apache.fop.layoutmgr.PositionIterator;
-import org.apache.fop.layoutmgr.TraitSetter;
+import org.apache.fop.layoutmgr.*;
+
+import java.util.LinkedList;
/**
* This is the layout manager for the fo:wrapper formatting object.
*/
public class WrapperLayoutManager extends LeafNodeLayoutManager {
- private Wrapper fobj;
-
/**
* Creates a new LM for fo:wrapper.
* @param node the fo:wrapper
*/
public WrapperLayoutManager(Wrapper node) {
super(node);
- fobj = node;
}
/** {@inheritDoc} */
@@ -70,13 +65,13 @@ public class WrapperLayoutManager extends LeafNodeLayoutManager {
public void addAreas(PositionIterator posIter, LayoutContext context) {
if (fobj.hasId()) {
addId();
- InlineArea area = getEffectiveArea();
if (parentLM instanceof BlockStackingLayoutManager
&& !(parentLM instanceof BlockLayoutManager)) {
Block helperBlock = new Block();
TraitSetter.setProducerID(helperBlock, fobj.getId());
parentLM.addChildArea(helperBlock);
} else {
+ InlineArea area = getEffectiveArea();
parentLM.addChildArea(area);
}
}