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/02 21:24:54 UTC
cvs commit: xml-fop/src/java/org/apache/fop/area RegionBodyVport.java RegionBodyRefArea.java AbstractViewport.java Area.java SpanReferenceArea.java RegionViewport.java Page.java MainReferenceArea.java AbstractReferenceArea.java
pbwest 2004/05/02 12:24:54
Modified: src/java/org/apache/fop/area/inline Tag:
FOP_0-20-0_Alt-Design InlineArea.java
src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
RegionBodyVport.java RegionBodyRefArea.java
AbstractViewport.java Area.java
SpanReferenceArea.java RegionViewport.java
Page.java MainReferenceArea.java
AbstractReferenceArea.java
Log:
W.I.P. Null page construction
Revision Changes Path
No revision
No revision
1.2.2.5 +0 -16 xml-fop/src/java/org/apache/fop/area/inline/InlineArea.java
Index: InlineArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/inline/InlineArea.java,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- InlineArea.java 28 Feb 2004 02:03:54 -0000 1.2.2.4
+++ InlineArea.java 2 May 2004 19:24:53 -0000 1.2.2.5
@@ -32,22 +32,6 @@
/**
* @param parent
- * @param index
- * @throws IndexOutOfBoundsException
- */
- public InlineArea(
- FoPageSequence pageSeq,
- FONode generatedBy,
- Node parent,
- int index,
- Object sync)
- throws IndexOutOfBoundsException {
- super(pageSeq, generatedBy, parent, index, sync);
- // TODO Auto-generated constructor stub
- }
-
- /**
- * @param parent
* @throws IndexOutOfBoundsException
*/
public InlineArea(
No revision
No revision
1.1.2.3 +26 -5 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- RegionBodyVport.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ RegionBodyVport.java 2 May 2004 19:24:53 -0000 1.1.2.3
@@ -32,17 +32,38 @@
public class RegionBodyVport extends RegionViewport {
/**
+ * @param area
* @param parent
* @param sync
- * @param viewArea
*/
public RegionBodyVport(
- Rectangle2D viewArea,
+ Rectangle2D area,
FoPageSequence pageSeq,
FONode generatedBy,
Node parent,
Object sync) {
- super(viewArea, pageSeq, generatedBy, parent, sync);
+ super(area, pageSeq, generatedBy, parent, sync);
}
+ /**
+ * @param parent
+ * @param sync
+ */
+ public RegionBodyVport(
+ FoPageSequence pageSeq,
+ FONode generatedBy,
+ Node parent,
+ Object sync) {
+ super(pageSeq, generatedBy, parent, sync);
+ }
+
+ public static RegionBodyVport nullRegionBodyVport(
+ FoPageSequence pageSeq, FONode generatedBy,
+ Node parent, Object sync) {
+ RegionBodyVport vport =
+ new RegionBodyVport(pageSeq, generatedBy, parent, sync);
+ vport.setRegion(RegionBodyRefArea.nullRegionBodyRef(
+ pageSeq, generatedBy, vport, sync));
+ return vport;
+ }
}
1.1.2.4 +16 -3 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.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- RegionBodyRefArea.java 28 Feb 2004 02:06:44 -0000 1.1.2.3
+++ RegionBodyRefArea.java 2 May 2004 19:24:53 -0000 1.1.2.4
@@ -32,12 +32,16 @@
//private BeforeFloat beforeFloat;
private MainReferenceArea mainReference;
//private Footnote footnote;
- private int columnGap;
- private int columnCount;
+ private int columnGap = 0;
+ private int columnCount = 1;
/**
* Create a new body region area.
* 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 sync
*/
public RegionBodyRefArea(
FoPageSequence pageSeq,
@@ -63,6 +67,15 @@
this.columnGap = columnGap;
}
+ public static RegionBodyRefArea nullRegionBodyRef(
+ FoPageSequence pageSeq, FONode generatedBy,
+ Node parent, Object sync) {
+ RegionBodyRefArea bodyRef =
+ new RegionBodyRefArea(pageSeq, generatedBy, parent, sync);
+ bodyRef.setMainReference(MainReferenceArea.nullMainRefArea(
+ pageSeq, generatedBy, bodyRef, sync));
+ return bodyRef;
+ }
/**
* Set the number of columns for blocks when not spanning
*
1.1.2.3 +4 -6 xml-fop/src/java/org/apache/fop/area/Attic/AbstractViewport.java
Index: AbstractViewport.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AbstractViewport.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- AbstractViewport.java 2 May 2004 06:17:16 -0000 1.1.2.2
+++ AbstractViewport.java 2 May 2004 19:24:53 -0000 1.1.2.3
@@ -69,8 +69,7 @@
FONode generatedBy,
Node parent,
Object sync) {
- super(pageSeq, generatedBy, parent, sync);
- this.area = area;
+ super(area, pageSeq, generatedBy, parent, sync);
}
/**
* @param pageSeq
@@ -81,8 +80,7 @@
Rectangle2D area,
FoPageSequence pageSeq,
FONode generatedBy) {
- super(pageSeq, generatedBy);
- this.area = area;
+ super(area, pageSeq, generatedBy);
}
/* (non-Javadoc)
* @see org.apache.fop.area.Viewport#setReferenceArea(org.apache.fop.area.ReferenceArea)
1.1.2.10 +23 -7 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.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- Area.java 2 May 2004 06:23:52 -0000 1.1.2.9
+++ Area.java 2 May 2004 19:24:53 -0000 1.1.2.10
@@ -77,25 +77,26 @@
}
}
/**
+ * Constructs an <code>Area</code> which is based on the given
+ * <code>Rectangle2D</code>
+ * @param area the rectangular area
* @param pageSeq through which this area was generated
* @param generatedBy the given <code>FONode</code> generated this
* @param parent <code>Node</code> of this
- * @param index of this in children of parent
* @param sync the object on which this area is synchronized
- * @throws IndexOutOfBoundsException
*/
public Area(
+ Rectangle2D area,
FoPageSequence pageSeq,
FONode generatedBy,
Node parent,
- int index,
- Object sync)
- throws IndexOutOfBoundsException {
- super(pageSeq, generatedBy, parent, index, sync);
- setup();
+ Object sync) {
+ this(pageSeq, generatedBy, parent, sync);
+ this.area = area;
}
/**
+ * Constructs an <code>Area</code> with a null rectangular area
* @param pageSeq through which this area was generated
* @param generatedBy the given <code>FONode</code> generated this
* @param parent <code>Node</code> of this
@@ -109,6 +110,21 @@
Object sync) {
super(pageSeq, generatedBy, parent, sync);
setup();
+ }
+
+ /**
+ * Constructs an <code>Area</code> with the given rectangular area,
+ * which is the root of a tree, and is synchronized on itself.
+ * @param area the rectangular area
+ * @param pageSeq through which this area was generated
+ * @param generatedBy the given <code>FONode</code> generated this
+ */
+ public Area(
+ Rectangle2D area,
+ FoPageSequence pageSeq,
+ FONode generatedBy) {
+ this(pageSeq, generatedBy);
+ this.area = area;
}
/**
1.1.2.2 +18 -2 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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- SpanReferenceArea.java 2 May 2004 17:28:13 -0000 1.1.2.1
+++ SpanReferenceArea.java 2 May 2004 19:24:53 -0000 1.1.2.2
@@ -18,6 +18,7 @@
package org.apache.fop.area;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import org.apache.fop.apps.FOPException;
@@ -33,8 +34,9 @@
public class SpanReferenceArea
extends AbstractReferenceArea
implements ReferenceArea, Serializable {
+
// the list of normal-flow-reference-areas in this span area
- private List flowAreas;
+ private List flowAreas = new ArrayList();
private NormalFlowRefArea currentFlowArea = null;
@@ -71,6 +73,16 @@
this.columnCount = columnCount;
}
+ public static SpanReferenceArea nullSpanArea(
+ FoPageSequence pageSeq, FONode generatedBy,
+ Node parent, Object sync) {
+ SpanReferenceArea span = new SpanReferenceArea(
+ pageSeq, generatedBy, parent, sync);
+ span.addNormalFlowRef(
+ new NormalFlowRefArea(pageSeq, generatedBy, span, sync));
+ return span;
+ }
+
/**
* @return the column count
*/
@@ -96,6 +108,10 @@
return false;
}
return true;
+ }
+
+ public void addNormalFlowRef(NormalFlowRefArea normal) {
+ flowAreas.add(normal);
}
}
1.3.2.4 +21 -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.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- RegionViewport.java 2 May 2004 06:12:53 -0000 1.3.2.3
+++ RegionViewport.java 2 May 2004 19:24:53 -0000 1.3.2.4
@@ -30,12 +30,13 @@
public class RegionViewport
extends AbstractViewport
implements Viewport, Cloneable {
- // this rectangle is relative to the page
-
/**
- * Create a new region viewport.
- *
- * @param area the view area of this viewport
+ * Creates a new region viewport.
+ * @param area the rectangular area
+ * @param pageSeq the generating <code>page-sequence</code>
+ * @param generatedBy the generating <code>FONode</code>
+ * @param parent
+ * @param sync
*/
public RegionViewport(
Rectangle2D area,
@@ -44,6 +45,21 @@
Node parent,
Object sync) {
super(area, pageSeq, generatedBy, parent, sync);
+ }
+
+ /**
+ * 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 sync
+ */
+ public RegionViewport(
+ FoPageSequence pageSeq,
+ FONode generatedBy,
+ Node parent,
+ Object sync) {
+ super(pageSeq, generatedBy, parent, sync);
}
/**
1.4.2.3 +34 -1 xml-fop/src/java/org/apache/fop/area/Page.java
Index: Page.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Page.java,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- Page.java 2 May 2004 05:57:50 -0000 1.4.2.2
+++ Page.java 2 May 2004 19:24:53 -0000 1.4.2.3
@@ -28,6 +28,7 @@
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.flow.FoPageSequence;
+import org.apache.fop.fo.pagination.FoSimplePageMaster;
import org.apache.fop.fo.properties.RetrievePosition;
/**
@@ -54,7 +55,7 @@
}
/**
- * Create a page viewport.
+ * Create a page.
* @param parent node of this viewport
* @param sync object on which the Area is synchronized
* @param pageId the unique identifier of this page
@@ -69,6 +70,38 @@
this.pageId = pageId;
}
+ /**
+ * Creates a null page, consisting of
+ * <ul>
+ * <li>a <code>PageViewport</code>/<code>PageRefArea</code> pair</li>
+ * <li>a set of region viewport/reference-area pairs
+ * <ul>
+ * <li><code>RegionBodyVPort</code>/<code>RegionBodyRefArea</code>
+ * <ul>
+ * <li><code>MainReferenceArea</code></li>
+ * <li><code>SpanReferenceArea</code></li>
+ * <li><code>NormalFlowRefArea</code></li>
+ * </ul>
+ * </li>
+ * <li><code>RegionBeforeVPort</code>/<code>RegionBeforeRefArea</code>
+ * </li>
+ * <li><code>RegionAfterVPort</code>/<code>RegionAfterRefArea</code>
+ * </li>
+ * <li><code>RegionStartVPort</code>/<code>RegionStartRefArea</code>
+ * </li>
+ * <li><code>RegionEndVPort</code>/<code>RegionEndRefArea</code>
+ * </li>
+ * </ul>
+ * </li>
+ * </ul>
+ *
+ */
+ public void setupNullPage() {
+
+ }
+
+ /** The <code>simple-page-master</code> that generated this page. */
+ protected FoSimplePageMaster pageMaster = null;
/** Unique ID for this page. 0 is an invalid ID. */
private long pageId = 0;
/** The formatted page number */
1.1.2.3 +17 -7 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.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- MainReferenceArea.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ MainReferenceArea.java 2 May 2004 19:24:53 -0000 1.1.2.3
@@ -17,6 +17,7 @@
*/
package org.apache.fop.area;
+import java.util.ArrayList;
import java.util.List;
import org.apache.fop.datastructs.Node;
@@ -33,27 +34,36 @@
public class MainReferenceArea
extends AbstractReferenceArea
implements ReferenceArea {
- private List spanAreas = new java.util.ArrayList();
+ private List spanAreas = new ArrayList();
/**
* @param parent
- * @param areaSync
+ * @param sync
* @throws IndexOutOfBoundsException
*/
public MainReferenceArea(
FoPageSequence pageSeq,
FONode generatedBy,
Node parent,
- Object areaSync) {
- super(pageSeq, generatedBy, parent, areaSync);
+ Object sync) {
+ super(pageSeq, generatedBy, parent, sync);
+ }
+
+ public static MainReferenceArea nullMainRefArea(
+ FoPageSequence pageSeq, FONode generatedBy,
+ Node parent, Object sync) {
+ MainReferenceArea main =
+ new MainReferenceArea(pageSeq, generatedBy, parent, sync);
+ SpanReferenceArea span =
+ SpanReferenceArea.nullSpanArea(pageSeq, generatedBy, main, sync);
+ return main;
}
-
/**
* Add a span area to this area.
*
* @param span the span area to add
*/
- public void addSpan(Span span) {
+ public void addSpan(SpanReferenceArea span) {
spanAreas.add(span);
}
1.1.2.4 +19 -2 xml-fop/src/java/org/apache/fop/area/Attic/AbstractReferenceArea.java
Index: AbstractReferenceArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/AbstractReferenceArea.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- AbstractReferenceArea.java 30 Apr 2004 00:34:50 -0000 1.1.2.3
+++ AbstractReferenceArea.java 2 May 2004 19:24:53 -0000 1.1.2.4
@@ -19,6 +19,7 @@
package org.apache.fop.area;
import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
import org.apache.fop.datastructs.Node;
import org.apache.fop.fo.FONode;
@@ -47,6 +48,22 @@
Node parent,
Object sync) {
super(pageSeq, generatedBy, parent, sync);
+ // TODO Auto-generated constructor stub
+ }
+
+ /**
+ * @param pageSeq through which this area was generated
+ * @param generatedBy the given <code>FONode</code> generated this
+ * @param parent area of this
+ * @param sync object on which operations in this are synchronized
+ */
+ public AbstractReferenceArea(
+ Rectangle2D area,
+ FoPageSequence pageSeq,
+ FONode generatedBy,
+ Node parent,
+ Object sync) {
+ super(area, pageSeq, generatedBy, parent, sync);
// TODO Auto-generated constructor stub
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org