You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2009/01/16 15:21:00 UTC
svn commit: r735025 - in
/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca:
AbstractPageObject.java Overlay.java PageObject.java
Author: jeremias
Date: Fri Jan 16 06:20:59 2009
New Revision: 735025
URL: http://svn.apache.org/viewvc?rev=735025&view=rev
Log:
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.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java?rev=735025&r1=735024&r2=735025&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/AbstractPageObject.java Fri Jan 16 06:20:59 2009
@@ -61,9 +61,6 @@
/** 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 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);
}
/**
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java?rev=735025&r1=735024&r2=735025&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/Overlay.java Fri Jan 16 06:20:59 2009
@@ -72,7 +72,6 @@
getActiveEnvironmentGroup().writeToStream(os);
- writeObjects(includePageSegments, os);
writeObjects(tagLogicalElements, os);
writeObjects(objects, os);
}
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java?rev=735025&r1=735024&r2=735025&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/afp/modca/PageObject.java Fri Jan 16 06:20:59 2009
@@ -185,7 +185,6 @@
getActiveEnvironmentGroup().writeToStream(os);
- writeObjects(includePageSegments, os);
writeObjects(tagLogicalElements, os);
writeObjects(objects, os);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org