pbwest 2004/02/23 05:18:37
Modified: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
BlockContainer.java ReferenceArea.java Area.java
src/java/org/apache/fop/area/inline Tag:
FOP_0-20-0_Alt-Design InlineContainer.java
Log:
Adjusted for new stubs
Revision Changes Path
No revision
No revision
1.1.2.4 +5 -3 xml-fop/src/java/org/apache/fop/area/Attic/BlockContainer.java
Index: BlockContainer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BlockContainer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- BlockContainer.java 1 Feb 2004 08:12:00 -0000 1.1.2.3
+++ BlockContainer.java 23 Feb 2004 13:18:37 -0000 1.1.2.4
@@ -25,7 +25,9 @@
* @author pbw
* @version $Revision$ $Name$
*/
-public class BlockContainer extends BlockArea implements ReferenceArea {
+public class BlockContainer
+extends AbstractReferenceArea
+implements ReferenceArea {
/**
* @param parent
1.1.2.3 +21 -3 xml-fop/src/java/org/apache/fop/area/Attic/ReferenceArea.java
Index: ReferenceArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/ReferenceArea.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- ReferenceArea.java 1 Feb 2004 05:47:38 -0000 1.1.2.2
+++ ReferenceArea.java 23 Feb 2004 13:18:37 -0000 1.1.2.3
@@ -23,6 +23,24 @@
* @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();
+
}
1.1.2.5 +99 -1 xml-fop/src/java/org/apache/fop/area/Area.java
Index: Area.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Area.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- Area.java 16 Feb 2004 00:15:29 -0000 1.1.2.4
+++ Area.java 23 Feb 2004 13:18:37 -0000 1.1.2.5
@@ -22,18 +22,32 @@
import org.apache.fop.datastructs.SyncedNode;
/**
+ * @author pbw
+ * @version $Revision$ $Name$
+ */
+/**
+ * @author pbw
+ * @version $Revision$ $Name$
+ */
+/**
* The base class for all areas. <code>Area</code> extends <code>Node</code>
* 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;
/**
@@ -55,6 +69,90 @@
throws IndexOutOfBoundsException {
super(parent, areaSync);
// 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;
}
}
No revision
No revision
1.1.2.4 +6 -3
xml-fop/src/java/org/apache/fop/area/inline/Attic/InlineContainer.java
Index: InlineContainer.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/inline/Attic/InlineContainer.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- InlineContainer.java 1 Feb 2004 08:12:00 -0000 1.1.2.3
+++ InlineContainer.java 23 Feb 2004 13:18:37 -0000 1.1.2.4
@@ -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 @@
* @author pbw
* @version $Revision$ $Name$
*/
-public class InlineContainer extends InlineArea implements ReferenceArea {
+public class InlineContainer
+extends AbstractReferenceArea
+implements ReferenceArea {
/**
* @param parent
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
