A few changes to tie in some more LayoutManager classes

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

diff --git a/src/org/apache/fop/area/MainReference.java b/src/org/apache/fop/area/MainReference.java
index 95b3bd82a5594a89682665047abde561fe24c61a..b1840199575d0cbb0ce9d24525cce45ccb07a475 100644 (file)
--- a/src/org/apache/fop/area/MainReference.java
+++ b/src/org/apache/fop/area/MainReference.java
@@ -19,6 +19,7 @@ public class MainReference extends Area implements Serializable {
 
     public void addSpan(Span span) {
         spanAreas.add(span);
+       span.setParent(this);
     }
 
     public List getSpans() {

diff --git a/src/org/apache/fop/area/MinOptMax.java b/src/org/apache/fop/area/MinOptMax.java
index e7ed4add5277c8a08eb535ace8305b2e2bf99051..8a6684cd14ef1592e67bca6ba79364185f5be1b8 100644 (file)
--- a/src/org/apache/fop/area/MinOptMax.java
+++ b/src/org/apache/fop/area/MinOptMax.java
@@ -14,7 +14,7 @@ package org.apache.fop.area;
  * variables are package visible.
  */
 
-public class MinOptMax {
+public class MinOptMax implements java.io.Serializable {
 
     /** Publicly visible min(imum), opt(imum) and max(imum) values.*/
     public int min;

diff --git a/src/org/apache/fop/area/Span.java b/src/org/apache/fop/area/Span.java
index 85012cdb96b5a3fdb5cbeec292c32287ddff107a..20661dad77bc44bdd08c5306d3f880eaf4b8f006 100644 (file)
--- a/src/org/apache/fop/area/Span.java
+++ b/src/org/apache/fop/area/Span.java
@@ -22,6 +22,7 @@ public class Span extends Area {
 
     public void addFlow(Flow flow) {
         flowAreas.add(flow);
+       flow.setParent(this);
     }
 
     public int getColumnCount() {

diff --git a/src/org/apache/fop/area/inline/InlineArea.java b/src/org/apache/fop/area/inline/InlineArea.java
index d688ae038e7b4bb30f2b1b8cd8c95e983ddffd1f..5a63ef0edf2ed9dff847d1aeae188d47952f9bdf 100644 (file)
--- a/src/org/apache/fop/area/inline/InlineArea.java
+++ b/src/org/apache/fop/area/inline/InlineArea.java
@@ -8,6 +8,7 @@
 package org.apache.fop.area.inline;
 
 import org.apache.fop.area.Area;
+import org.apache.fop.area.MinOptMax;
 import org.apache.fop.area.Property;
 import org.apache.fop.render.Renderer;
 
@@ -45,6 +46,12 @@ public class InlineArea extends Area {
         return width;
     }
 
+    public MinOptMax getAllocationIPD() {
+       // Should also account for any borders and padding in the
+       // inline progression dimension
+       return new MinOptMax(width);
+    }
+
     public void setOffset(int v) {
         verticalPosition = v;
     }