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 pb...@apache.org on 2004/05/04 06:42:40 UTC
cvs commit: xml-fop/src/java/org/apache/fop/area RegionStartVport.java RegionEndVport.java RegionStartRefArea.java RegionBeforeVport.java MainReferenceArea.java RegionRefArea.java RegionAfterVport.java RegionBodyVport.java RegionBodyRefArea.java RegionEndRefArea.java RegionAfterRefArea.java SpanReferenceArea.java RegionViewport.java RegionBeforeRefArea.java
pbwest 2004/05/03 21:42:40
Modified: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
RegionStartVport.java RegionEndVport.java
RegionStartRefArea.java RegionBeforeVport.java
MainReferenceArea.java RegionRefArea.java
RegionAfterVport.java RegionBodyVport.java
RegionBodyRefArea.java RegionEndRefArea.java
RegionAfterRefArea.java SpanReferenceArea.java
RegionViewport.java RegionBeforeRefArea.java
Log:
More support for null page construction
Revision Changes Path
No revision
No revision
1.1.2.3 +47 -6 xml-fop/src/java/org/apache/fop/area/Attic/RegionStartVport.java
Index: RegionStartVport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionStartVport.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RegionStartVport.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ RegionStartVport.java 4 May 2004 04:42:40 -0000 1.1.2.3
@@ -32,17 +32,58 @@
public class RegionStartVport extends RegionViewport {
/**
- * @param parent
+ * Creates a new region-start area with no defined rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
* @param sync
- * @param viewArea
*/
public RegionStartVport(
- Rectangle2D viewArea,
FoPageSequence pageSeq,
FONode generatedBy,
Node parent,
Object sync) {
- super(viewArea, pageSeq, generatedBy, parent, sync);
+ super(pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates a new region-start area with the defined rectangular area
+ * @param area the rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
+ * @param sync
+ */
+ public RegionStartVport(
+ Rectangle2D area,
+ FoPageSequence pageSeq,
+ FONode generatedBy,
+ Node parent,
+ Object sync) {
+ super(area, pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates and returns a <code>RegionStartVport</code> with no
+ * rectangular area.
+ * <b>N.B.</b> this is a <code>static</code> method.
+ * @param pageSeq the <code>page-sequence</code> to which this area belongs
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the <code>region-body-viewport-area</code>
+ * @param sync
+ * @return the created reference area
+ */
+ public static RegionStartVport nullRegionStartVport(
+ FoPageSequence pageSeq, FONode generatedBy,
+ Node parent, Object sync) {
+ RegionStartVport vport =
+ new RegionStartVport(pageSeq, generatedBy, parent, sync);
+ vport.setRegion(RegionStartRefArea.nullRegionStartRef(
+ pageSeq, generatedBy, vport, sync));
+ return vport;
}
}
1.1.2.3 +47 -6 xml-fop/src/java/org/apache/fop/area/Attic/RegionEndVport.java
Index: RegionEndVport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionEndVport.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RegionEndVport.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ RegionEndVport.java 4 May 2004 04:42:40 -0000 1.1.2.3
@@ -32,17 +32,58 @@
public class RegionEndVport extends RegionViewport {
/**
- * @param parent
+ * Creates a new region-end area with no defined rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
* @param sync
- * @param viewArea
*/
public RegionEndVport(
- Rectangle2D viewArea,
FoPageSequence pageSeq,
FONode generatedBy,
Node parent,
Object sync) {
- super(viewArea, pageSeq, generatedBy, parent, sync);
+ super(pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates a new region-end area with the defined rectangular area
+ * @param area the rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
+ * @param sync
+ */
+ public RegionEndVport(
+ Rectangle2D area,
+ FoPageSequence pageSeq,
+ FONode generatedBy,
+ Node parent,
+ Object sync) {
+ super(area, pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates and returns a <code>RegionEndVport</code> with no
+ * rectangular area.
+ * <b>N.B.</b> this is a <code>static</code> method.
+ * @param pageSeq the <code>page-sequence</code> to which this area belongs
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the <code>region-body-viewport-area</code>
+ * @param sync
+ * @return the created reference area
+ */
+ public static RegionEndVport nullRegionEndVport(
+ FoPageSequence pageSeq, FONode generatedBy,
+ Node parent, Object sync) {
+ RegionEndVport vport =
+ new RegionEndVport(pageSeq, generatedBy, parent, sync);
+ vport.setRegion(RegionEndRefArea.nullRegionEndRef(
+ pageSeq, generatedBy, vport, sync));
+ return vport;
}
}
1.1.2.3 +46 -4 xml-fop/src/java/org/apache/fop/area/Attic/RegionStartRefArea.java
Index: RegionStartRefArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionStartRefArea.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RegionStartRefArea.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ RegionStartRefArea.java 4 May 2004 04:42:40 -0000 1.1.2.3
@@ -19,6 +19,8 @@
*/
package org.apache.fop.area;
+import java.awt.geom.Rectangle2D;
+
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -32,7 +34,11 @@
implements ReferenceArea {
/**
- * @param parent
+ * Creates a new region-start area with no defined rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
* @param sync
*/
public RegionStartRefArea(
@@ -41,7 +47,43 @@
Node parent,
Object sync) {
super(pageSeq, generatedBy, parent, sync);
- // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * Creates a new region-start area with the given rectangular area
+ * @param area the rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
+ * @param sync
+ */
+ public RegionStartRefArea(
+ Rectangle2D area,
+ FoPageSequence pageSeq,
+ FONode generatedBy,
+ Node parent,
+ Object sync) {
+ super(area, pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates and returns a <code>RegionStartRefArea</code> with no
+ * rectangular area.
+ * <b>N.B.</b> this is a <code>static</code> method.
+ * @param pageSeq the <code>page-sequence</code> to which this area belongs
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the <code>region-body-viewport-area</code>
+ * @param sync
+ * @return the created reference area
+ */
+ public static RegionStartRefArea nullRegionStartRef(
+ FoPageSequence pageSeq, FONode generatedBy,
+ Node parent, Object sync) {
+ RegionStartRefArea startRef =
+ new RegionStartRefArea(pageSeq, generatedBy, parent, sync);
+ return startRef;
}
}
1.1.2.3 +48 -7 xml-fop/src/java/org/apache/fop/area/Attic/RegionBeforeVport.java
Index: RegionBeforeVport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionBeforeVport.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RegionBeforeVport.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ RegionBeforeVport.java 4 May 2004 04:42:40 -0000 1.1.2.3
@@ -32,18 +32,59 @@
public class RegionBeforeVport extends RegionViewport {
/**
- * @param parent
+ * Creates a new region-before area with no defined rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
* @param sync
- * @param viewArea
*/
public RegionBeforeVport(
- Rectangle2D viewArea,
FoPageSequence pageSeq,
FONode generatedBy,
Node parent,
Object sync) {
- super(viewArea, pageSeq, generatedBy, parent, sync);
- // TODO Auto-generated constructor stub
+ super(pageSeq, generatedBy, parent, sync);
}
+
+ /**
+ * Creates a new region-before area with the defined rectangular area
+ * @param area the rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
+ * @param sync
+ */
+ public RegionBeforeVport(
+ Rectangle2D area,
+ FoPageSequence pageSeq,
+ FONode generatedBy,
+ Node parent,
+ Object sync) {
+ super(area, pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates and returns a <code>RegionBeforeVport</code> with no
+ * rectangular area.
+ * <b>N.B.</b> this is a <code>static</code> method.
+ * @param pageSeq the <code>page-sequence</code> to which this area belongs
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the <code>region-body-viewport-area</code>
+ * @param sync
+ * @return the created reference area
+ */
+ public static RegionBeforeVport nullRegionBeforeVport(
+ FoPageSequence pageSeq, FONode generatedBy,
+ Node parent, Object sync) {
+ RegionBeforeVport vport =
+ new RegionBeforeVport(pageSeq, generatedBy, parent, sync);
+ vport.setRegion(RegionBeforeRefArea.nullRegionBeforeRef(
+ pageSeq, generatedBy, vport, sync));
+ return vport;
+ }
+
}
1.1.2.4 +13 -1 xml-fop/src/java/org/apache/fop/area/Attic/MainReferenceArea.java
Index: MainReferenceArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/MainReferenceArea.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- MainReferenceArea.java 2 May 2004 19:24:53 -0000 1.1.2.3
+++ MainReferenceArea.java 4 May 2004 04:42:40 -0000 1.1.2.4
@@ -49,6 +49,18 @@
super(pageSeq, generatedBy, parent, sync);
}
+
+ /**
+ * Creates and returns a <code>MainReferenceArea</code> with no rectangular
+ * area. The span created references a null <code>NormalFlowRefArea</code>.
+ * <b>N.B.</b> this is a <code>static</code> method.
+ * @param pageSeq the <code>page-sequence</code> to which this area belongs
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the <code>region-body-reference-area</code>
+ * @param sync
+ * @return the created reference area
+ */
public static MainReferenceArea nullMainRefArea(
FoPageSequence pageSeq, FONode generatedBy,
Node parent, Object sync) {
1.1.2.3 +24 -2 xml-fop/src/java/org/apache/fop/area/Attic/RegionRefArea.java
Index: RegionRefArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionRefArea.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RegionRefArea.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ RegionRefArea.java 4 May 2004 04:42:40 -0000 1.1.2.3
@@ -17,6 +17,7 @@
*/
package org.apache.fop.area;
+import java.awt.geom.Rectangle2D;
import java.util.ArrayList;
import java.util.List;
@@ -37,7 +38,11 @@
private ArrayList blocks = new ArrayList();
/**
- * Create a new region reference area.
+ * Creates a new region reference area, without a defined rectangular area
+ * @param pageSeq the generating page sequence
+ * @param generatedBy the generating node; in this case, the page sequence
+ * @param parent the associated viewport area
+ * @param sync
*/
public RegionRefArea(
FoPageSequence pageSeq,
@@ -45,6 +50,23 @@
Node parent,
Object sync) {
super(pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates a new region reference area, with a defined rectangular area
+ * @param area the geometry of this area
+ * @param pageSeq the generating page sequence
+ * @param generatedBy the generating node; in this case, the page sequence
+ * @param parent the associated viewport area
+ * @param sync
+ */
+ public RegionRefArea(
+ Rectangle2D area,
+ FoPageSequence pageSeq,
+ FONode generatedBy,
+ Node parent,
+ Object sync) {
+ super(area, pageSeq, generatedBy, parent, sync);
}
/**
1.1.2.3 +47 -6 xml-fop/src/java/org/apache/fop/area/Attic/RegionAfterVport.java
Index: RegionAfterVport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionAfterVport.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RegionAfterVport.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ RegionAfterVport.java 4 May 2004 04:42:40 -0000 1.1.2.3
@@ -32,17 +32,58 @@
public class RegionAfterVport extends RegionViewport {
/**
- * @param parent
+ * Creates a new region-after area with no defined rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
* @param sync
- * @param viewArea
*/
public RegionAfterVport(
- Rectangle2D viewArea,
FoPageSequence pageSeq,
FONode generatedBy,
Node parent,
Object sync) {
- super(viewArea, pageSeq, generatedBy, parent, sync);
+ super(pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates a new region-after area with the defined rectangular area
+ * @param area the rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
+ * @param sync
+ */
+ public RegionAfterVport(
+ Rectangle2D area,
+ FoPageSequence pageSeq,
+ FONode generatedBy,
+ Node parent,
+ Object sync) {
+ super(area, pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates and returns a <code>RegionAfterVport</code> with no
+ * rectangular area.
+ * <b>N.B.</b> this is a <code>static</code> method.
+ * @param pageSeq the <code>page-sequence</code> to which this area belongs
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the <code>region-body-viewport-area</code>
+ * @param sync
+ * @return the created reference area
+ */
+ public static RegionAfterVport nullRegionAfterVport(
+ FoPageSequence pageSeq, FONode generatedBy,
+ Node parent, Object sync) {
+ RegionAfterVport vport =
+ new RegionAfterVport(pageSeq, generatedBy, parent, sync);
+ vport.setRegion(RegionAfterRefArea.nullRegionAfterRef(
+ pageSeq, generatedBy, vport, sync));
+ return vport;
}
}
1.1.2.4 +23 -3 xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyVport.java
Index: RegionBodyVport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyVport.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- RegionBodyVport.java 2 May 2004 19:24:53 -0000 1.1.2.3
+++ RegionBodyVport.java 4 May 2004 04:42:40 -0000 1.1.2.4
@@ -32,7 +32,11 @@
public class RegionBodyVport extends RegionViewport {
/**
- * @param area
+ * Creates a <code>region-body-viewport</code> with the given rectangular
+ * area
+ * @param area the rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy
* @param parent
* @param sync
*/
@@ -46,6 +50,9 @@
}
/**
+ * Creates a <code>region-body-viewport</code> with no rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy
* @param parent
* @param sync
*/
@@ -57,6 +64,19 @@
super(pageSeq, generatedBy, parent, sync);
}
+ /**
+
+ /**
+ * Creates and returns a <code>RegionBodyVport</code> with no rectangular
+ * area. The area created references a null <code>RegionBodyRefArea</code>.
+ * <b>N.B.</b> this is a <code>static</code> method.
+ * @param pageSeq the <code>page-sequence</code> to which this area belongs
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the <code>page-reference-area</code>
+ * @param sync
+ * @return the created reference area
+ */
public static RegionBodyVport nullRegionBodyVport(
FoPageSequence pageSeq, FONode generatedBy,
Node parent, Object sync) {
1.1.2.5 +31 -6 xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyRefArea.java
Index: RegionBodyRefArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionBodyRefArea.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- RegionBodyRefArea.java 2 May 2004 19:24:53 -0000 1.1.2.4
+++ RegionBodyRefArea.java 4 May 2004 04:42:40 -0000 1.1.2.5
@@ -17,6 +17,8 @@
*/
package org.apache.fop.area;
+import java.awt.geom.Rectangle2D;
+
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -36,11 +38,13 @@
private int columnCount = 1;
/**
- * Create a new body region area.
+ * Creates a new body region area with no defined rectangular area and the
+ * default column count and gap
* This sets the region reference area class to BODY.
* @param pageSeq the generating <code>page-sequence</code>
- * @param generatedBy the generating <code>FONode</code>
- * @param parent
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
* @param sync
*/
public RegionBodyRefArea(
@@ -52,21 +56,42 @@
}
/**
- * Create a new body region area.
+ * Creates a new body region area with the given rectangular area, column
+ * count and gap
* This sets the region reference area class to BODY.
+ * @param columnCount
+ * @param columnGap
+ * @param area the rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
+ * @param sync
*/
public RegionBodyRefArea(
int columnCount,
int columnGap,
+ Rectangle2D area,
FoPageSequence pageSeq,
FONode generatedBy,
Node parent,
Object sync) {
- super(pageSeq, generatedBy, parent, sync);
+ super(area, pageSeq, generatedBy, parent, sync);
this.columnCount = columnCount;
this.columnGap = columnGap;
}
+ /**
+ * Creates and returns a <code>RegionBodyRefArea</code> with no rectangular
+ * area. The area created references a null <code>MainReferenceArea</code>.
+ * <b>N.B.</b> this is a <code>static</code> method.
+ * @param pageSeq the <code>page-sequence</code> to which this area belongs
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the <code>region-body-viewport-area</code>
+ * @param sync
+ * @return the created reference area
+ */
public static RegionBodyRefArea nullRegionBodyRef(
FoPageSequence pageSeq, FONode generatedBy,
Node parent, Object sync) {
1.1.2.3 +46 -3 xml-fop/src/java/org/apache/fop/area/Attic/RegionEndRefArea.java
Index: RegionEndRefArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionEndRefArea.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RegionEndRefArea.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ RegionEndRefArea.java 4 May 2004 04:42:40 -0000 1.1.2.3
@@ -19,6 +19,8 @@
*/
package org.apache.fop.area;
+import java.awt.geom.Rectangle2D;
+
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -32,7 +34,11 @@
implements ReferenceArea {
/**
- * @param parent
+ * Creates a new region-end area with no defined rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
* @param sync
*/
public RegionEndRefArea(
@@ -41,6 +47,43 @@
Node parent,
Object sync) {
super(pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates a new region-end area with the given rectangular area
+ * @param area the rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
+ * @param sync
+ */
+ public RegionEndRefArea(
+ Rectangle2D area,
+ FoPageSequence pageSeq,
+ FONode generatedBy,
+ Node parent,
+ Object sync) {
+ super(area, pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates and returns a <code>RegionEndRefArea</code> with no
+ * rectangular area.
+ * <b>N.B.</b> this is a <code>static</code> method.
+ * @param pageSeq the <code>page-sequence</code> to which this area belongs
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the <code>region-body-viewport-area</code>
+ * @param sync
+ * @return the created reference area
+ */
+ public static RegionEndRefArea nullRegionEndRef(
+ FoPageSequence pageSeq, FONode generatedBy,
+ Node parent, Object sync) {
+ RegionEndRefArea endRef =
+ new RegionEndRefArea(pageSeq, generatedBy, parent, sync);
+ return endRef;
}
}
1.1.2.3 +46 -4 xml-fop/src/java/org/apache/fop/area/Attic/RegionAfterRefArea.java
Index: RegionAfterRefArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionAfterRefArea.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RegionAfterRefArea.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ RegionAfterRefArea.java 4 May 2004 04:42:40 -0000 1.1.2.3
@@ -19,6 +19,8 @@
*/
package org.apache.fop.area;
+import java.awt.geom.Rectangle2D;
+
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -32,7 +34,11 @@
implements ReferenceArea {
/**
- * @param parent
+ * Creates a new region-after area with no defined rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
* @param sync
*/
public RegionAfterRefArea(
@@ -41,7 +47,43 @@
Node parent,
Object sync) {
super(pageSeq, generatedBy, parent, sync);
- // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * Creates a new region-after area with the given rectangular area
+ * @param area the rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
+ * @param sync
+ */
+ public RegionAfterRefArea(
+ Rectangle2D area,
+ FoPageSequence pageSeq,
+ FONode generatedBy,
+ Node parent,
+ Object sync) {
+ super(area, pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates and returns a <code>RegionAfterRefArea</code> with no
+ * rectangular area.
+ * <b>N.B.</b> this is a <code>static</code> method.
+ * @param pageSeq the <code>page-sequence</code> to which this area belongs
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the <code>region-body-viewport-area</code>
+ * @param sync
+ * @return the created reference area
+ */
+ public static RegionAfterRefArea nullRegionAfterRef(
+ FoPageSequence pageSeq, FONode generatedBy,
+ Node parent, Object sync) {
+ RegionAfterRefArea afterRef =
+ new RegionAfterRefArea(pageSeq, generatedBy, parent, sync);
+ return afterRef;
}
}
1.1.2.3 +13 -1 xml-fop/src/java/org/apache/fop/area/Attic/SpanReferenceArea.java
Index: SpanReferenceArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/SpanReferenceArea.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- SpanReferenceArea.java 2 May 2004 19:24:53 -0000 1.1.2.2
+++ SpanReferenceArea.java 4 May 2004 04:42:40 -0000 1.1.2.3
@@ -73,6 +73,18 @@
this.columnCount = columnCount;
}
+ /**
+ * Creates and returns a <code>SpanReferenceArea</code> with no rectangular
+ * area and only the default column count. The span created references a
+ * null <code>NormalFlowRefArea</code>. <b>N.B.</b> this is a
+ * <code>static</code> method.
+ * @param pageSeq the <code>page-sequence</code> to which this area belongs
+ * @param generatedBy the node which generated this span; in this case, the
+ * <code>page-sequence</code>
+ * @param parent the <code>main-reference-area</code>
+ * @param sync
+ * @return the created reference area
+ */
public static SpanReferenceArea nullSpanArea(
FoPageSequence pageSeq, FONode generatedBy,
Node parent, Object sync) {
1.3.2.5 +5 -5 xml-fop/src/java/org/apache/fop/area/RegionViewport.java
Index: RegionViewport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/RegionViewport.java,v
retrieving revision 1.3.2.4
retrieving revision 1.3.2.5
diff -u -r1.3.2.4 -r1.3.2.5
--- RegionViewport.java 2 May 2004 19:24:53 -0000 1.3.2.4
+++ RegionViewport.java 4 May 2004 04:42:40 -0000 1.3.2.5
@@ -31,11 +31,11 @@
extends AbstractViewport
implements Viewport, Cloneable {
/**
- * Creates a new region viewport.
+ * Creates a new region viewport with the given rectangular area
* @param area the rectangular area
* @param pageSeq the generating <code>page-sequence</code>
- * @param generatedBy the generating <code>FONode</code>
- * @param parent
+ * @param generatedBy the generating node; in this case, the page sequence
+ * @param parent the <code>main-reference-area</code>
* @param sync
*/
public RegionViewport(
@@ -50,8 +50,8 @@
/**
* Creates a new region viewport with a null rectangular area
* @param pageSeq the generating <code>page-sequence</code>
- * @param generatedBy the generating <code>FONode</code>
- * @param parent
+ * @param generatedBy the generating node; in this case, the page sequence
+ * @param parent the <code>main-reference-area</code>
* @param sync
*/
public RegionViewport(
1.1.2.3 +47 -3 xml-fop/src/java/org/apache/fop/area/Attic/RegionBeforeRefArea.java
Index: RegionBeforeRefArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/RegionBeforeRefArea.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RegionBeforeRefArea.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ RegionBeforeRefArea.java 4 May 2004 04:42:40 -0000 1.1.2.3
@@ -19,6 +19,8 @@
*/
package org.apache.fop.area;
+import java.awt.geom.Rectangle2D;
+
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.flow.FoPageSequence;
@@ -32,7 +34,11 @@
implements ReferenceArea {
/**
- * @param parent
+ * Creates a new region-before area with no defined rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
* @param sync
*/
public RegionBeforeRefArea(
@@ -42,5 +48,43 @@
Object sync) {
super(pageSeq, generatedBy, parent, sync);
}
+
+ /**
+ * Creates a new region-before area with the given rectangular area
+ * @param area the rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the page-reference-area
+ * @param sync
+ */
+ public RegionBeforeRefArea(
+ Rectangle2D area,
+ FoPageSequence pageSeq,
+ FONode generatedBy,
+ Node parent,
+ Object sync) {
+ super(area, pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * Creates and returns a <code>RegionBeforeRefArea</code> with no
+ * rectangular area.
+ * <b>N.B.</b> this is a <code>static</code> method.
+ * @param pageSeq the <code>page-sequence</code> to which this area belongs
+ * @param generatedBy the node which generated this reference area; in this
+ * case, the <code>page-sequence</code>
+ * @param parent the <code>region-body-viewport-area</code>
+ * @param sync
+ * @return the created reference area
+ */
+ public static RegionBeforeRefArea nullRegionBeforeRef(
+ FoPageSequence pageSeq, FONode generatedBy,
+ Node parent, Object sync) {
+ RegionBeforeRefArea beforeRef =
+ new RegionBeforeRefArea(pageSeq, generatedBy, parent, sync);
+ return beforeRef;
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org