diff options
Diffstat (limited to 'src/java/org')
| -rw-r--r-- | src/java/org/apache/fop/fo/pagination/PageSequence.java | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java index a2bbd82a0..767d5f896 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequence.java +++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java @@ -3,34 +3,34 @@ * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ - * + * * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * + * * 3. The end-user documentation included with the redistribution, if any, must * include the following acknowledgment: "This product includes software * developed by the Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, if * and wherever such third-party acknowledgments normally appear. - * + * * 4. The names "FOP" and "Apache Software Foundation" must not be used to * endorse or promote products derived from this software without prior * written permission. For written permission, please contact * apache@apache.org. - * + * * 5. Products derived from this software may not be called "Apache", nor may * "Apache" appear in their name, without prior written permission of the * Apache Software Foundation. - * + * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -42,12 +42,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ============================================================================ - * + * * This software consists of voluntary contributions made by many individuals * on behalf of the Apache Software Foundation and was originally created by * James Tauber <jtauber@jtauber.com>. For more information on the Apache * Software Foundation, please see <http://www.apache.org/>. - */ + */ package org.apache.fop.fo.pagination; // FOP @@ -303,10 +303,7 @@ public class PageSequence extends FObj { } // Don't add main flow to the flow map // addFlow(mainFlow); - if (!sequenceStarted) { - structHandler.startPageSequence(this, titleFO, layoutMasterSet); - sequenceStarted = true; - } + startStructuredPageSequence(); super.addChild(child); // For getChildren } } else if (childName.equals("fo:static-content")) { @@ -325,10 +322,7 @@ public class PageSequence extends FObj { } flowMap.put(flowName, child); // addFlow((Flow)child); - if (!sequenceStarted) { - structHandler.startPageSequence(this, titleFO, layoutMasterSet); - sequenceStarted = true; - } + startStructuredPageSequence(); } else { // Ignore it! getLogger().warn("FO '" + childName @@ -342,6 +336,16 @@ public class PageSequence extends FObj { } /** + * Start the page-sequence logic in the Structured Handler + */ + private void startStructuredPageSequence() { + if (!sequenceStarted) { + structHandler.startPageSequence(this, titleFO, layoutMasterSet); + sequenceStarted = true; + } + } + + /** * Signal end of this xml element. * This passes the end page sequence to the structure handler * so it can act upon that. |