gmazza 2005/02/10 09:08:24 Modified: src/java/org/apache/fop/area RenderPagesModel.java StorePagesModel.java src/java/org/apache/fop/layoutmgr PageSequenceLayoutManager.java Log: Some simplification to StorePagesModel, removal of not very informative comment in PSLM. Revision Changes Path 1.13 +3 -2 xml-fop/src/java/org/apache/fop/area/RenderPagesModel.java Index: RenderPagesModel.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/RenderPagesModel.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- RenderPagesModel.java 6 Feb 2005 20:48:47 -0000 1.12 +++ RenderPagesModel.java 10 Feb 2005 17:08:24 -0000 1.13 @@ -67,6 +67,7 @@ public RenderPagesModel (FOUserAgent userAgent, int renderType, FontInfo fontInfo, OutputStream stream) throws FOPException { + super(); renderer = RendererFactory.createRenderer(userAgent, renderType); try { @@ -220,12 +221,12 @@ processOffDocumentItems(pendingODI); pendingODI.clear(); processOffDocumentItems(endDocODI); - + try { renderer.stopRenderer(); } catch (IOException ex) { throw new SAXException(ex); - } + } } } 1.14 +11 -35 xml-fop/src/java/org/apache/fop/area/StorePagesModel.java Index: StorePagesModel.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/StorePagesModel.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- StorePagesModel.java 6 Dec 2004 05:37:17 -0000 1.13 +++ StorePagesModel.java 10 Feb 2005 17:08:24 -0000 1.14 @@ -34,8 +34,8 @@ * The pages are stored and can be retrieved in any order. */ public class StorePagesModel extends AreaTreeModel { - private List pageSequence = null; - private List currSequence; + private List pageSequenceList = null; + private List currentPageSequencePageList; private List offDocumentItems = new java.util.ArrayList(); protected static Log log = LogFactory.getLog(StorePagesModel.class); @@ -44,6 +44,7 @@ * Create a new store pages model */ public StorePagesModel() { + pageSequenceList = new java.util.ArrayList(); } /** @@ -52,11 +53,8 @@ * @param title the title of the page sequence. */ public void startPageSequence(LineArea title) { - if (pageSequence == null) { - pageSequence = new java.util.ArrayList(); - } - currSequence = new java.util.ArrayList(); - pageSequence.add(currSequence); + currentPageSequencePageList = new java.util.ArrayList(); + pageSequenceList.add(currentPageSequencePageList); } /** @@ -64,7 +62,7 @@ * @param page the page to add to the current page sequence */ public void addPage(PageViewport page) { - currSequence.add(page); + currentPageSequencePageList.add(page); } /** @@ -72,7 +70,7 @@ * @return the number of page sequences in the document. */ public int getPageSequenceCount() { - return pageSequence.size(); + return pageSequenceList.size(); } /** @@ -81,7 +79,7 @@ * @return returns the number of pages in a page sequence */ public int getPageCount(int seq) { - List sequence = (List) pageSequence.get(seq - 1); + List sequence = (List) pageSequenceList.get(seq - 1); return sequence.size(); } @@ -92,7 +90,7 @@ * @return the PageViewport for the particular page */ public PageViewport getPage(int seq, int count) { - List sequence = (List) pageSequence.get(seq - 1); + List sequence = (List) pageSequenceList.get(seq - 1); return (PageViewport) sequence.get(count); } @@ -100,36 +98,14 @@ * @see org.apache.fop.area.AreaTreeModel#handleOffDocumentItem(OffDocumentItem) */ public void handleOffDocumentItem(OffDocumentItem ext) { - int seq, page; - switch(ext.getWhenToProcess()) { - case OffDocumentItem.IMMEDIATELY: - seq = pageSequence == null ? 0 : pageSequence.size(); - page = currSequence == null ? 0 : currSequence.size(); - break; - case OffDocumentItem.AFTER_PAGE: - break; - case OffDocumentItem.END_OF_DOC: - break; - } offDocumentItems.add(ext); } /** - * Get the list of OffDocumentItems that apply at a particular - * position in the document. - * @param seq the page sequence number - * @param count the page count in the sequence + * Get the list of OffDocumentItems for this StorePagesModel. * @return the list of OffDocumentItems */ - public List getOffDocumentItems(int seq, int count) { - return null; - } - - /** - * Get the end of document OffDocumentItems for this store pages model. - * @return the list of end OffDocumentItems - */ - public List getEndOffDocumentItems() { + public List getOffDocumentItems() { return offDocumentItems; } 1.30 +1 -2 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.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- PageSequenceLayoutManager.java 7 Feb 2005 11:01:36 -0000 1.29 +++ PageSequenceLayoutManager.java 10 Feb 2005 17:08:24 -0000 1.30 @@ -202,7 +202,6 @@ areaTreeModel.startPageSequence(title); log.debug("Starting layout"); - // this should be done another way makeNewPage(false, false); createBodyMainReferenceArea(); createSpan(1);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]