Bugfix: Weave included page segments into the object sequence instead of inserting...

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

diff --git a/src/java/org/apache/fop/afp/modca/AbstractPageObject.java b/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
index eff87971505330723e48e4f9bf6b43b5970acdf9..d17c06c6a021f57b1227a599b9c014f2e804cfee 100644 (file)
--- 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 ea9619b20d07b07e01964ef4c1e14da1c8f5a57f..0179c94a7fc185f1dbe29e278bc3c7d82a39d7e8 100644 (file)
--- 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 33852d90b2b7f0940cca3531b778120b38dc8424..6c2547f0b81d54a99f6426062c53d3fa89134c0a 100644 (file)
--- 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);
     }