gmazza 2005/03/11 17:29:06
Modified: src/java/org/apache/fop/area BodyRegion.java
src/java/org/apache/fop/layoutmgr
PageSequenceLayoutManager.java
Log:
Minor simplification to PSLM.
Revision Changes Path
1.11 +2 -1 xml-fop/src/java/org/apache/fop/area/BodyRegion.java
Index: BodyRegion.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/BodyRegion.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BodyRegion.java 11 Mar 2005 07:23:43 -0000 1.10
+++ BodyRegion.java 12 Mar 2005 01:29:06 -0000 1.11
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,6 +40,7 @@
public BodyRegion() {
super(Constants.FO_REGION_BODY);
addTrait(Trait.IS_REFERENCE_AREA, Boolean.TRUE);
+ mainReference = new MainReference();
}
/**
1.42 +12 -17
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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- PageSequenceLayoutManager.java 11 Mar 2005 07:23:43 -0000 1.41
+++ PageSequenceLayoutManager.java 12 Mar 2005 01:29:06 -0000 1.42
@@ -60,8 +60,7 @@
import org.apache.fop.traits.MinOptMax;
/**
- * LayoutManager for a PageSequence and its flow.
- * It manages all page-related layout.
+ * LayoutManager for a PageSequence.
*/
public class PageSequenceLayoutManager extends AbstractLayoutManager {
private PageSequence pageSeq;
@@ -95,18 +94,21 @@
private int flowBPD = 0;
private int flowIPD = 0;
- /** Manager which handles a queue of all pages which are completely
- * laid out and ready for rendering, except for resolution of ID
- * references?
+ /**
+ * AreaTreeHandler which activates this PSLM.
*/
private AreaTreeHandler areaTreeHandler;
+
+ /**
+ * AreaTreeModel that this PSLM sends pages to.
+ */
private AreaTreeModel areaTreeModel;
/**
* This is the SimplePageMaster that should be used to create the page.
It
* will be equal to the PageSequence's simplePageMaster, if it exists, or
* to the correct member of the PageSequence's pageSequenceMaster, if
that
- * exists instead.
+ * is in effect instead.
*/
private SimplePageMaster currentSimplePageMaster;
@@ -117,10 +119,9 @@
//private HashMap staticContentLMs = new HashMap(4);
/**
- * This is the top level layout manager.
- * It is created by the PageSequence FO.
- *
- * @param pageseq the page sequence fo
+ * Constructor
+ *
+ * @param pageseq the page sequence fo to be laid out
*/
public PageSequenceLayoutManager(PageSequence pageSeq) {
super(pageSeq);
@@ -185,7 +186,6 @@
log.debug("Starting layout");
makeNewPage(false, false);
- createBodyMainReferenceArea();
createSpan(1);
flowIPD = curFlow.getIPD();
@@ -583,7 +583,6 @@
//numCols = curBody.getProperty(NUMBER_OF_COLUMNS);
}
if (curSpan == null) {
- createBodyMainReferenceArea();
bNeedSpan = true;
} else if (numCols != curSpan.getNormalFlowCount()) {
// todo: BALANCE EXISTING COLUMNS
@@ -697,10 +696,6 @@
}
}
- private void createBodyMainReferenceArea() {
- curBody.setMainReference(new MainReference());
- }
-
private void createSpan(int numCols) {
// check number of columns (= all in Body or 1)
// If already have a span, get its size and position (as MinMaxOpt)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
