jeremias 2005/01/26 09:51:55
Modified: src/java/org/apache/fop/layoutmgr
PageSequenceLayoutManager.java
Log:
Switching off reuse of static LMs, which fixes page numbers and markers on
pages >1.
Revision Changes Path
1.24 +9 -11
xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
Index: PageSequenceLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- PageSequenceLayoutManager.java 24 Jan 2005 14:03:14 -0000 1.23
+++ PageSequenceLayoutManager.java 26 Jan 2005 17:51:55 -0000 1.24
@@ -53,10 +53,8 @@
import org.apache.fop.fo.pagination.Title;
import org.apache.fop.fo.properties.CommonMarginBlock;
-import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
import java.awt.Rectangle;
import java.util.Iterator;
import java.awt.geom.Rectangle2D;
@@ -122,7 +120,7 @@
* The collection of StaticContentLayoutManager objects that are
associated
* with this Page Sequence, keyed by flow-name.
*/
- private HashMap staticContentLMs = new HashMap(4);
+ //private HashMap staticContentLMs = new HashMap(4);
/**
* This is the top level layout manager.
@@ -320,7 +318,7 @@
* @param bbp the block break position
*/
public void addAreas(BlockBreakPosition bbp) {
- List list = new ArrayList();
+ List list = new java.util.ArrayList();
list.add(bbp.breakps);
bbp.getLM().addAreas(new BreakPossPosIter(list, 0,
1), null);
@@ -534,7 +532,7 @@
while (!lm.isFinished()) {
BreakPoss bp = lm.getNextBreakPoss(childLC);
if (bp != null) {
- List vecBreakPoss = new ArrayList();
+ List vecBreakPoss = new java.util.ArrayList();
vecBreakPoss.add(bp);
lm.addAreas(new BreakPossPosIter(vecBreakPoss, 0,
vecBreakPoss.size()), null);
@@ -944,13 +942,13 @@
*/
private StaticContentLayoutManager
getStaticContentLayoutManager(StaticContent sc)
throws FOPException {
- StaticContentLayoutManager lm =
- (StaticContentLayoutManager)
staticContentLMs.get(sc.getFlowName());
- if (lm == null) {
+ StaticContentLayoutManager lm;
+ //lm = (StaticContentLayoutManager)
staticContentLMs.get(sc.getFlowName());
+ //if (lm == null) {
lm = (StaticContentLayoutManager)
getAreaTreeHandler().getLayoutManagerMaker().makeLayoutManager(sc);
- staticContentLMs.put(sc.getFlowName(), lm);
- }
+ //staticContentLMs.put(sc.getFlowName(), lm);
+ //}
return lm;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
