From: Peter Bernard West Date: Mon, 23 Feb 2004 13:18:37 +0000 (+0000) Subject: Adjusted for new stubs X-Git-Tag: Alt-Design_pre_awt_renderer_import~43 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3d2ead7eb1e291bb9257ea6c6ec21ca82d53db0f;p=xmlgraphics-fop.git Adjusted for new stubs git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197362 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/fop/area/Area.java b/src/java/org/apache/fop/area/Area.java index d9d8e1ff4..63c0ea986 100644 --- a/src/java/org/apache/fop/area/Area.java +++ b/src/java/org/apache/fop/area/Area.java @@ -21,19 +21,33 @@ package org.apache.fop.area; import org.apache.fop.datastructs.Node; import org.apache.fop.datastructs.SyncedNode; +/** + * @author pbw + * @version $Revision$ $Name$ + */ +/** + * @author pbw + * @version $Revision$ $Name$ + */ /** * The base class for all areas. Area extends Node * because all areas will find themselves in a tree of some kind. * @author pbw * @version $Revision$ $Name$ */ -public class Area extends SyncedNode { +public class Area extends SyncedNode implements Cloneable { + /** Current inline progression dimension. May be unknown. */ protected Integer iPDim = null; + /** Maximum required inline progression dimension. May be unknown. */ protected Integer iPDimMax = null; + /** Mimimum required inline progression dimension. May be unknown. */ protected Integer iPDimMin = null; + /** Current block progression dimension. May be unknown. */ protected Integer bPDim = null; + /** Maximum required block progression dimension. May be unknown. */ protected Integer bPDimMax = null; + /** Mimimum required block progression dimension. May be unknown. */ protected Integer bPDimMin = null; /** @@ -57,4 +71,88 @@ public class Area extends SyncedNode { // TODO Auto-generated constructor stub } + /** + * @return the bPDim + */ + public Integer getBPDim() { + return bPDim; + } + + /** + * @param dim to set + */ + public void setBPDim(Integer dim) { + bPDim = dim; + } + + /** + * @return the bPDimMax + */ + public Integer getBPDimMax() { + return bPDimMax; + } + + /** + * @param dimMax to set + */ + public void setBPDimMax(Integer dimMax) { + bPDimMax = dimMax; + } + + /** + * @return the bPDimMin + */ + public Integer getBPDimMin() { + return bPDimMin; + } + + /** + * @param dimMin to set + */ + public void setBPDimMin(Integer dimMin) { + bPDimMin = dimMin; + } + + /** + * @return the iPDim + */ + public Integer getIPDim() { + return iPDim; + } + + /** + * @param dim to set + */ + public void setIPDim(Integer dim) { + iPDim = dim; + } + + /** + * @return the iPDimMax + */ + public Integer getIPDimMax() { + return iPDimMax; + } + + /** + * @param dimMax to set + */ + public void setIPDimMax(Integer dimMax) { + iPDimMax = dimMax; + } + + /** + * @return the iPDimMin + */ + public Integer getIPDimMin() { + return iPDimMin; + } + + /** + * @param dimMin to set + */ + public void setIPDimMin(Integer dimMin) { + iPDimMin = dimMin; + } + } diff --git a/src/java/org/apache/fop/area/BlockContainer.java b/src/java/org/apache/fop/area/BlockContainer.java index ac1a122aa..5bb6a1350 100644 --- a/src/java/org/apache/fop/area/BlockContainer.java +++ b/src/java/org/apache/fop/area/BlockContainer.java @@ -25,7 +25,9 @@ import org.apache.fop.datastructs.Node; * @author pbw * @version $Revision$ $Name$ */ -public class BlockContainer extends BlockArea implements ReferenceArea { +public class BlockContainer +extends AbstractReferenceArea +implements ReferenceArea { /** * @param parent diff --git a/src/java/org/apache/fop/area/ReferenceArea.java b/src/java/org/apache/fop/area/ReferenceArea.java index 2d24c79fe..7e4f3a4e5 100644 --- a/src/java/org/apache/fop/area/ReferenceArea.java +++ b/src/java/org/apache/fop/area/ReferenceArea.java @@ -23,6 +23,24 @@ package org.apache.fop.area; * @author pbw * @version $Revision$ $Name$ */ -public interface ReferenceArea { +public interface ReferenceArea extends Cloneable { + /** + * Set the Coordinate Transformation Matrix which transforms content + * coordinates in this reference area which are specified in + * terms of "start" and "before" into coordinates in a system which + * is positioned in "absolute" directions (with origin at lower left of + * the reference area. + * + * @param matrix the current transform to position this region + */ + public void setCoordTransformer(CoordTransformer matrix); + + /** + * Get the current transformer of this reference area. + * + * @return the current transformer to position this reference area. + */ + public CoordTransformer getCoordTransformer(); + } diff --git a/src/java/org/apache/fop/area/inline/InlineContainer.java b/src/java/org/apache/fop/area/inline/InlineContainer.java index f9ebc0f1c..2e684666d 100644 --- a/src/java/org/apache/fop/area/inline/InlineContainer.java +++ b/src/java/org/apache/fop/area/inline/InlineContainer.java @@ -19,6 +19,7 @@ */ package org.apache.fop.area.inline; +import org.apache.fop.area.AbstractReferenceArea; import org.apache.fop.area.ReferenceArea; import org.apache.fop.datastructs.Node; @@ -26,7 +27,9 @@ import org.apache.fop.datastructs.Node; * @author pbw * @version $Revision$ $Name$ */ -public class InlineContainer extends InlineArea implements ReferenceArea { +public class InlineContainer +extends AbstractReferenceArea +implements ReferenceArea { /** * @param parent