pbwest 2004/07/23 21:16:54
Modified: src/java/org/apache/fop/area Tag: FOP_0-20-0_Alt-Design
RegionRefArea.java FootnoteRefArea.java
BeforeFloatRefArea.java SpanReferenceArea.java
NormalFlowRefArea.java MainReferenceArea.java
Log:
Now extends BlockReferenceArea.
Revision Changes Path
No revision
No revision
1.1.2.5 +2 -16 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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- RegionRefArea.java 1 Jun 2004 06:27:05 -0000 1.1.2.4
+++ RegionRefArea.java 24 Jul 2004 04:16:54 -0000 1.1.2.5
@@ -30,7 +30,7 @@
* It is cloneable through the ReferenceArea interface implementation.
*/
public abstract class RegionRefArea
-extends AbstractReferenceArea
+extends BlockReferenceArea
implements ReferenceArea {
// the list of block areas from the static flow
@@ -58,20 +58,6 @@
*/
public List getBlocks() {
return blocks;
- }
-
- /**
- * Clone this region.
- * This is used when cloning the page by the page master.
- * The blocks are not copied since the master will have no blocks.
- *
- * @return a copy of this region reference area
- */
- public Object clone() {
- RegionRefArea rr;
- rr = (RegionRefArea)(super.clone());
- rr.blocks = (ArrayList)(blocks.clone());
- return rr;
}
}
1.1.2.3 +3 -3 xml-fop/src/java/org/apache/fop/area/Attic/FootnoteRefArea.java
Index: FootnoteRefArea.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/FootnoteRefArea.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FootnoteRefArea.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ FootnoteRefArea.java 24 Jul 2004 04:16:54 -0000 1.1.2.3
@@ -28,7 +28,7 @@
* @version $Revision$ $Name$
*/
public class FootnoteRefArea
- extends AbstractReferenceArea
+ extends BlockReferenceArea
implements ReferenceArea {
/**
1.1.2.3 +3 -3
xml-fop/src/java/org/apache/fop/area/Attic/BeforeFloatRefArea.java
Index: BeforeFloatRefArea.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/BeforeFloatRefArea.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- BeforeFloatRefArea.java 28 Feb 2004 02:06:44 -0000 1.1.2.2
+++ BeforeFloatRefArea.java 24 Jul 2004 04:16:54 -0000 1.1.2.3
@@ -28,7 +28,7 @@
* @version $Revision$ $Name$
*/
public class BeforeFloatRefArea
- extends AbstractReferenceArea
+ extends BlockReferenceArea
implements ReferenceArea {
/**
1.1.2.5 +2 -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.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- SpanReferenceArea.java 12 May 2004 11:08:23 -0000 1.1.2.4
+++ SpanReferenceArea.java 24 Jul 2004 04:16:54 -0000 1.1.2.5
@@ -32,7 +32,7 @@
* This is a reference area block area with 0 border and padding
*/
public class SpanReferenceArea
-extends AbstractReferenceArea
+extends BlockReferenceArea
implements ReferenceArea, Serializable {
// the list of normal-flow-reference-areas in this span area
1.1.2.2 +3 -3
xml-fop/src/java/org/apache/fop/area/Attic/NormalFlowRefArea.java
Index: NormalFlowRefArea.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/Attic/NormalFlowRefArea.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- NormalFlowRefArea.java 28 Feb 2004 02:06:44 -0000 1.1.2.1
+++ NormalFlowRefArea.java 24 Jul 2004 04:16:54 -0000 1.1.2.2
@@ -27,7 +27,7 @@
* @author pbw
* @version $Revision$ $Name$
*/
-public class NormalFlowRefArea extends AbstractReferenceArea
+public class NormalFlowRefArea extends BlockReferenceArea
implements
ReferenceArea {
/**
1.1.2.6 +2 -2
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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- MainReferenceArea.java 12 May 2004 11:10:48 -0000 1.1.2.5
+++ MainReferenceArea.java 24 Jul 2004 04:16:54 -0000 1.1.2.6
@@ -32,7 +32,7 @@
* The children of this area are span-reference-areas.
*/
public class MainReferenceArea
-extends AbstractReferenceArea
+extends BlockReferenceArea
implements ReferenceArea {
private List spanAreas = new ArrayList();
private SpanReferenceArea currentSpan = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
