gmazza 2005/03/11 17:56:33 Modified: src/java/org/apache/fop/layoutmgr PageSequenceLayoutManager.java Log: Minor simplifications to PSLM. Revision Changes Path 1.43 +13 -12 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.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- PageSequenceLayoutManager.java 12 Mar 2005 01:29:06 -0000 1.42 +++ PageSequenceLayoutManager.java 12 Mar 2005 01:56:33 -0000 1.43 @@ -31,7 +31,6 @@ import org.apache.fop.area.RegionViewport; import org.apache.fop.area.RegionReference; import org.apache.fop.area.BodyRegion; -import org.apache.fop.area.MainReference; import org.apache.fop.area.Span; import org.apache.fop.area.BeforeFloat; import org.apache.fop.area.Footnote; @@ -119,9 +118,10 @@ //private HashMap staticContentLMs = new HashMap(4); /** - * Constructor - * - * @param pageseq the page sequence fo to be laid out + * Constructor - activated by AreaTreeHandler for each + * fo:page-sequence in the input FO stream + * + * @param pageseq the page-sequence formatting object */ public PageSequenceLayoutManager(PageSequence pageSeq) { super(pageSeq); @@ -130,7 +130,7 @@ /** * Set the AreaTreeHandler - * @param areaTreeHandler the area tree handler to add pages to + * @param areaTreeHandler the area tree handler object */ public void setAreaTreeHandler(AreaTreeHandler areaTreeHandler) { this.areaTreeHandler = areaTreeHandler; @@ -146,6 +146,7 @@ } /** + * Each fo:page-sequence may have an fo:title object. * @return the Title area */ private LineArea getTitleArea(Title foTitle) { @@ -186,7 +187,6 @@ log.debug("Starting layout"); makeNewPage(false, false); - createSpan(1); flowIPD = curFlow.getIPD(); BreakPoss bp; @@ -484,7 +484,7 @@ FO_REGION_BODY); curBody = (BodyRegion) rv.getRegion(); flowBPD = (int) curBody.getBPD(); - + createSpan(1); // todo determine actual # of NormalFlows needed return curPage; } @@ -532,6 +532,9 @@ private void finishPage() { if (curPage == null) { + curBody = null; + curSpan = null; + curFlow = null; return; } // Layout static content into the regions @@ -798,7 +801,7 @@ TraitSetter.addBackground(rv, r.getCommonBorderPaddingBackground()); } - private RegionReference makeRegionBodyReferenceArea(RegionBody r, + private BodyRegion makeRegionBodyReferenceArea(RegionBody r, Rectangle2D absRegVPRect) { // Should set some column stuff here I think, or put it elsewhere BodyRegion body = new BodyRegion(); @@ -812,9 +815,7 @@ columnCount = 1; } body.setColumnCount(columnCount); - - int columnGap = r.getColumnGap(); - body.setColumnGap(columnGap); + body.setColumnGap(r.getColumnGap()); return body; }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]