Bugfix: Weave included page segments into the object sequence instead of inserting them at the beginning. Otherwise they can be overpainted by marks that would otherwise lay under the page segment.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@735025 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 1 insertions, 18 deletions

diff --git a/src/java/org/apache/fop/afp/modca/AbstractPageObject.java b/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
index eff879715..d17c06c6a 100644
--- a/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
+++ b/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
@@ -61,9 +61,6 @@ public abstract class AbstractPageObject extends AbstractNamedAFPObject implemen
     /** The list of tag logical elements */
     protected List/*<TagLogicalElement>*/ tagLogicalElements = null;
 
-    /** The list of the include page segments */
-    protected List/*<IncludePageSegment>*/ includePageSegments = null;
-
     /** The list of objects within this resource container */
     protected List/*<AbstractStructuredAFPObject>*/ objects = new java.util.ArrayList();
 
@@ -254,19 +251,7 @@ public abstract class AbstractPageObject extends AbstractNamedAFPObject implemen
      */
     public void createIncludePageSegment(String name, int x, int y) {
         IncludePageSegment ips = factory.createIncludePageSegment(name, x, y);
-        getIncludePageSegments().add(ips);
-    }
-
-    /**
-     * Returns the include page segments list
-     *
-     * @return the include page segments list
-     */
-    private List getIncludePageSegments() {
-        if (this.includePageSegments == null) {
-            this.includePageSegments = new java.util.ArrayList/*<IncludePageSegment>*/();
-        }
-        return this.includePageSegments;
+        addObject(ips);
     }
 
     /**
diff --git a/src/java/org/apache/fop/afp/modca/Overlay.java b/src/java/org/apache/fop/afp/modca/Overlay.java
index ea9619b20..0179c94a7 100644
--- a/src/java/org/apache/fop/afp/modca/Overlay.java
+++ b/src/java/org/apache/fop/afp/modca/Overlay.java
@@ -72,7 +72,6 @@ public class Overlay extends PageObject {
 
         getActiveEnvironmentGroup().writeToStream(os);
 
-        writeObjects(includePageSegments, os);
         writeObjects(tagLogicalElements, os);
         writeObjects(objects, os);
     }
diff --git a/src/java/org/apache/fop/afp/modca/PageObject.java b/src/java/org/apache/fop/afp/modca/PageObject.java
index 33852d90b..6c2547f0b 100644
--- a/src/java/org/apache/fop/afp/modca/PageObject.java
+++ b/src/java/org/apache/fop/afp/modca/PageObject.java
@@ -185,7 +185,6 @@ public class PageObject extends AbstractResourceGroupContainer {
 
         getActiveEnvironmentGroup().writeToStream(os);
 
-        writeObjects(includePageSegments, os);
         writeObjects(tagLogicalElements, os);
         writeObjects(objects, os);
     }