gmazza 2005/02/06 00:14:08
Modified: src/java/org/apache/fop/area AreaTreeHandler.java
src/java/org/apache/fop/fo/flow PageNumber.java
src/java/org/apache/fop/layoutmgr
PageSequenceLayoutManager.java
Log:
Minor variable renaming in PSLM, removed pageCount variable from ATH.
Revision Changes Path
1.33 +3 -15 xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java
Index: AreaTreeHandler.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- AreaTreeHandler.java 5 Feb 2005 07:39:12 -0000 1.32
+++ AreaTreeHandler.java 6 Feb 2005 08:14:07 -0000 1.33
@@ -77,9 +77,6 @@
// the LayoutManager maker
private LayoutManagerMaker lmMaker;
- // count of number of pages rendered
- private int pageCount;
-
// AreaTreeModel in use
private AreaTreeModel model;
@@ -209,7 +206,6 @@
public void startDocument() throws SAXException {
//Initialize statistics
if (outputStatistics) {
- pageCount = 0;
initialMemory = runtime.totalMemory() - runtime.freeMemory();
startTime = System.currentTimeMillis();
}
@@ -268,11 +264,12 @@
long memoryNow = runtime.totalMemory() - runtime.freeMemory();
long memoryUsed = (memoryNow - initialMemory) / 1024L;
long timeUsed = System.currentTimeMillis() - startTime;
+ int pageCount = rootFObj.getRunningPageNumberCounter();
log.debug("Initial heap size: " + (initialMemory / 1024L) +
"Kb");
log.debug("Current heap size: " + (memoryNow / 1024L) + "Kb");
log.debug("Total memory used: " + memoryUsed + "Kb");
log.debug("Total time used: " + timeUsed + "ms");
- log.debug("Pages rendered: " +
rootFObj.getRunningPageNumberCounter());
+ log.debug("Pages rendered: " + pageCount);
if (pageCount > 0) {
log.debug("Avg render time: " + (timeUsed / pageCount) +
"ms/page");
}
@@ -306,14 +303,5 @@
model.handleOffDocumentItem(odi);
}
}
-
- /**
- * Called by the PageSequenceLayoutManager to notify the AreaTreeHandler
- * of a new page being started.
- * @param pageNumber page number
- */
- public void notifyNewPage(String pageNumber) {
- pageCount++;
- }
}
1.49 +5 -6 xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java
Index: PageNumber.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/PageNumber.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- PageNumber.java 25 Jan 2005 10:55:46 -0000 1.48
+++ PageNumber.java 6 Feb 2005 08:14:07 -0000 1.49
@@ -150,6 +150,11 @@
return id;
}
+ /** @return the "text-decoration" property. */
+ public CommonTextDecoration getTextDecoration() {
+ return textDecoration;
+ }
+
/**
* @see org.apache.fop.fo.FONode#getName()
*/
@@ -163,10 +168,4 @@
public int getNameId() {
return FO_PAGE_NUMBER;
}
-
- /** @return the "text-decoration" property. */
- public CommonTextDecoration getTextDecoration() {
- return textDecoration;
- }
-
}
1.27 +24 -37
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- PageSequenceLayoutManager.java 3 Feb 2005 20:45:33 -0000 1.26
+++ PageSequenceLayoutManager.java 6 Feb 2005 08:14:07 -0000 1.27
@@ -65,7 +65,7 @@
* It manages all page-related layout.
*/
public class PageSequenceLayoutManager extends AbstractLayoutManager {
- private PageSequence fobj;
+ private PageSequence pageSeq;
private static class BlockBreakPosition extends LeafPosition {
protected BreakPoss breakps;
@@ -128,11 +128,11 @@
*
* @param pageseq the page sequence fo
*/
- public PageSequenceLayoutManager(PageSequence pageseq) {
- super(pageseq);
- fobj = pageseq;
- if (fobj.getPageSequenceMaster() != null) {
- fobj.getPageSequenceMaster().reset();
+ public PageSequenceLayoutManager(PageSequence pageSeq) {
+ super(pageSeq);
+ this.pageSeq = pageSeq;
+ if (pageSeq.getPageSequenceMaster() != null) {
+ pageSeq.getPageSequenceMaster().reset();
}
}
@@ -154,19 +154,6 @@
}
/**
- * Set the page counting for this page sequence.
- * This sets the initial page number and the page number formatter.
- *
- * @param pc the starting page number
- * @param generator the page number generator
- */
- private void setPageCounting(int pc, PageNumberGenerator generator) {
- pageCount = pc;
- pageNumberGenerator = generator;
- pageNumberString =
pageNumberGenerator.makeFormattedPageNumber(pageCount);
- }
-
- /**
* Get the page count.
* Used to get the last page number for reference for
* the next page sequence.
@@ -205,13 +192,14 @@
* which creates and adds all the pages to the area tree.
*/
public void activateLayout() {
- fobj.initPageNumber();
- setPageCounting(fobj.getCurrentPageNumber(),
- fobj.getPageNumberGenerator());
+ pageSeq.initPageNumber();
+ pageCount = pageSeq.getCurrentPageNumber();
+ pageNumberGenerator = pageSeq.getPageNumberGenerator();
+ pageNumberString =
pageNumberGenerator.makeFormattedPageNumber(pageCount);
LineArea title = null;
- if (fobj.getTitleFO() != null) {
- title = getTitleArea(fobj.getTitleFO());
+ if (pageSeq.getTitleFO() != null) {
+ title = getTitleArea(pageSeq.getTitleFO());
}
areaTreeModel.startPageSequence(title);
@@ -239,7 +227,7 @@
pageCount--;
log.debug("Ending layout");
flush();
- fobj.setCurrentPageNumber(getPageCount());
+ pageSeq.setCurrentPageNumber(getPageCount());
}
/**
@@ -262,8 +250,8 @@
childLC.setRefIPD(flowIPD);
if (!curLM.isFinished()) {
- fobj.setLayoutDimension(PercentBase.REFERENCE_AREA_IPD,
flowIPD);
- fobj.setLayoutDimension(PercentBase.REFERENCE_AREA_BPD,
flowBPD);
+ pageSeq.setLayoutDimension(PercentBase.REFERENCE_AREA_IPD,
flowIPD);
+ pageSeq.setLayoutDimension(PercentBase.REFERENCE_AREA_BPD,
flowBPD);
bp = curLM.getNextBreakPoss(childLC);
}
if (bp != null) {
@@ -496,7 +484,6 @@
if (log.isDebugEnabled()) {
log.debug("[" + curPage.getPageNumber() + "]");
}
- areaTreeHandler.notifyNewPage(curPage.getPageNumber());
RegionViewport rv = curPage.getPage().getRegionViewport(
FO_REGION_BODY);
curBody = (BodyRegion) rv.getRegion();
@@ -510,7 +497,7 @@
if (region == null) {
return;
}
- StaticContent flow = fobj.getStaticContent(region.getRegionName());
+ StaticContent flow =
pageSeq.getStaticContent(region.getRegionName());
if (flow == null) {
return;
}
@@ -775,8 +762,8 @@
throws FOPException {
currentSimplePageMaster = getSimplePageMasterToUse(bIsBlank);
Region body = currentSimplePageMaster.getRegion(FO_REGION_BODY);
- if (!fobj.getMainFlow().getFlowName().equals(body.getRegionName())) {
- throw new FOPException("Flow '" + fobj.getMainFlow().getFlowName()
+ if
(!pageSeq.getMainFlow().getFlowName().equals(body.getRegionName())) {
+ throw new FOPException("Flow '" +
pageSeq.getMainFlow().getFlowName()
+ "' does not map to the region-body in
page-master '"
+ currentSimplePageMaster.getMasterName() +
"'");
}
@@ -796,11 +783,11 @@
private SimplePageMaster getSimplePageMasterToUse(boolean bIsBlank)
throws FOPException {
- if (fobj.getPageSequenceMaster() == null) {
- return fobj.getSimplePageMaster();
+ if (pageSeq.getPageSequenceMaster() == null) {
+ return pageSeq.getSimplePageMaster();
}
boolean isOddPage = ((pageCount % 2) == 1);
- return fobj.getPageSequenceMaster()
+ return pageSeq.getPageSequenceMaster()
.getNextSimplePageMaster(isOddPage, isFirstPage, bIsBlank);
}
@@ -809,8 +796,8 @@
int pageHeight = spm.getPageHeight().getValue();
// Set the page dimension as the toplevel containing block for
margin.
- ((FObj) fobj.getParent()).setLayoutDimension(PercentBase.BLOCK_IPD,
pageWidth);
- ((FObj) fobj.getParent()).setLayoutDimension(PercentBase.BLOCK_BPD,
pageHeight);
+ ((FObj)
pageSeq.getParent()).setLayoutDimension(PercentBase.BLOCK_IPD, pageWidth);
+ ((FObj)
pageSeq.getParent()).setLayoutDimension(PercentBase.BLOCK_BPD, pageHeight);
// Get absolute margin properties (top, left, bottom, right)
CommonMarginBlock mProps = spm.getCommonMarginBlock();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
