Attachment #26702 for bug #50852

View | Details | Raw Unified | Return to bug 50852
Collapse All | Expand All

Lines 60-65 public class AreaTreeModel { Link Here

(-)a/src/java/org/apache/fop/area/AreaTreeModel.java (+1 lines)
60	throw new NullPointerException("pageSequence must not be null");	60	throw new NullPointerException("pageSequence must not be null");
61	}	61	}
62	if (currentPageSequence != null) {	62	if (currentPageSequence != null) {
		63	currentPageSequence.finish();
63	currentPageIndex += currentPageSequence.getPageCount();	64	currentPageIndex += currentPageSequence.getPageCount();
64	}	65	}
65	this.currentPageSequence = pageSequence;	66	this.currentPageSequence = pageSequence;

Lines 105-110 public class CachedRenderPagesModel extends RenderPagesModel { Link Here

(-)a/src/java/org/apache/fop/area/CachedRenderPagesModel.java (+1 lines)
105	}	105	}
106		106
107	renderPage(pageViewport);	107	renderPage(pageViewport);
		108	pageViewport.getPageSequence().finishPage(pageViewport);
108	pageViewport.clear();	109	pageViewport.clear();
109	iter.remove();	110	iter.remove();
110	} else {	111	} else {

Lines 21-26 package org.apache.fop.area; Link Here

(-)a/src/java/org/apache/fop/area/PageSequence.java (+24 lines)
21		21
22	import java.util.List;	22	import java.util.List;
23		23
		24	import org.apache.fop.accessibility.StructureElement;
		25
24	/**	26	/**
25	* Represents a page sequence in the area tree.	27	* Represents a page sequence in the area tree.
26	*/	28	*/
Lines 30-35 public class PageSequence extends AreaTreeObject { Link Here
30	private LineArea title;	32	private LineArea title;
31	private String language;	33	private String language;
32	private String country;	34	private String country;
		35	private StructureElement structTree;
		36	private int finishedPages;
		37	private boolean finished;
33		38
34	/**	39	/**
35	* Main constructor	40	* Main constructor
Lines 127-130 public class PageSequence extends AreaTreeObject { Link Here
127	}	132	}
128	}	133	}
129		134
		135	public void finish() {
		136	finished = true;
		137	if (finishedPages == getPageCount() && finished)
		138	this.structTree = null;
		139	}
		140
		141	public void finishPage(PageViewport page) {
		142	finishedPages++;
		143	if (finishedPages == getPageCount() && finished)
		144	this.structTree = null;
		145	}
		146
		147	public StructureElement getStructureTree() {
		148	return this.structTree;
		149	}
		150
		151	public void setStructureTree(StructureElement structTree) {
		152	this.structTree = structTree;
		153	}
130	}	154	}

Lines 130-135 public class RenderPagesModel extends AreaTreeModel { Link Here

(-)a/src/java/org/apache/fop/area/RenderPagesModel.java (-1 / +2 lines)
130	throw new IllegalStateException("Fatal error occurred. Cannot continue. "	130	throw new IllegalStateException("Fatal error occurred. Cannot continue. "
131	+ e.getClass().getName() + ": " + err);	131	+ e.getClass().getName() + ": " + err);
132	}	132	}
		133	page.getPageSequence().finishPage(page);
133	page.clear();	134	page.clear();
134	} else {	135	} else {
135	preparePage(page);	136	preparePage(page);
Lines 166-171 public class RenderPagesModel extends AreaTreeModel { Link Here
166	renderer.startPageSequence(pageViewport.getPageSequence());	167	renderer.startPageSequence(pageViewport.getPageSequence());
167	}	168	}
168	renderPage(pageViewport);	169	renderPage(pageViewport);
		170	pageViewport.getPageSequence().finishPage(pageViewport);
169	pageViewport.clear();	171	pageViewport.clear();
170	iter.remove();	172	iter.remove();
171	} else {	173	} else {
172	-

Return to bug 50852