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 lb...@apache.org on 2012/11/04 01:44:52 UTC

svn commit: r1405444 - in /xmlgraphics/fop/trunk/src/java/org/apache/fop/area: BodyRegion.java MainReference.java

Author: lbernardo
Date: Sun Nov  4 00:44:51 2012
New Revision: 1405444

URL: http://svn.apache.org/viewvc?rev=1405444&view=rev
Log:
bugzilla #53942: fo:flow not rendered with -awt; patch 29465 submitted by Robert Meyer

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java
    xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java?rev=1405444&r1=1405443&r2=1405444&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/BodyRegion.java Sun Nov  4 00:44:51 2012
@@ -132,7 +132,7 @@ public class BodyRegion extends RegionRe
      */
     public int getRemainingBPD() {
         int usedBPD = 0;
-        List spans = getMainReference().getSpans();
+        List<Span> spans = getMainReference().getSpans();
         int previousSpanCount = spans.size() - 1;
         for (int i = 0; i < previousSpanCount; i++) {
             usedBPD += ((Span)spans.get(i)).getHeight();
@@ -155,6 +155,7 @@ public class BodyRegion extends RegionRe
     public Object clone() throws CloneNotSupportedException {
         BodyRegion br = (BodyRegion) super.clone();
         br.mainReference = new MainReference(br);
+        br.mainReference.setSpans(mainReference.getSpans());
         return br;
     }
 

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java?rev=1405444&r1=1405443&r2=1405444&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/area/MainReference.java Sun Nov  4 00:44:51 2012
@@ -74,7 +74,7 @@ public class MainReference extends Area 
      *
      * @return the list of span areas
      */
-    public List getSpans() {
+    public List<Span> getSpans() {
         return spanAreas;
     }
 
@@ -131,7 +131,7 @@ public class MainReference extends Area 
      * @param wmtg a WM traits getter
      */
     public void setWritingModeTraits(WritingModeTraitsGetter wmtg) {
-        for ( Span s : (List<Span>) getSpans() ) {
+        for ( Span s : getSpans() ) {
             s.setWritingModeTraits ( wmtg );
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org