diff options
7 files changed, 7 insertions, 21 deletions
diff --git a/src/java/org/apache/fop/area/BeforeFloatRefArea.java b/src/java/org/apache/fop/area/BeforeFloatRefArea.java index b4ce4b09e..6edd4955e 100644 --- a/src/java/org/apache/fop/area/BeforeFloatRefArea.java +++ b/src/java/org/apache/fop/area/BeforeFloatRefArea.java @@ -28,7 +28,7 @@ import org.apache.fop.fo.flow.FoPageSequence; * @version $Revision$ $Name$ */ public class BeforeFloatRefArea - extends AbstractReferenceArea + extends BlockReferenceArea implements ReferenceArea { /** diff --git a/src/java/org/apache/fop/area/BlockContainer.java b/src/java/org/apache/fop/area/BlockContainer.java index c63d51219..a265efbfc 100644 --- a/src/java/org/apache/fop/area/BlockContainer.java +++ b/src/java/org/apache/fop/area/BlockContainer.java @@ -28,7 +28,7 @@ import org.apache.fop.fo.flow.FoPageSequence; * @version $Revision$ $Name$ */ public class BlockContainer -extends AbstractReferenceArea +extends BlockReferenceArea implements ReferenceArea { /** diff --git a/src/java/org/apache/fop/area/FootnoteRefArea.java b/src/java/org/apache/fop/area/FootnoteRefArea.java index 2d8e7db1f..1bcc141ec 100644 --- a/src/java/org/apache/fop/area/FootnoteRefArea.java +++ b/src/java/org/apache/fop/area/FootnoteRefArea.java @@ -28,7 +28,7 @@ import org.apache.fop.fo.flow.FoPageSequence; * @version $Revision$ $Name$ */ public class FootnoteRefArea - extends AbstractReferenceArea + extends BlockReferenceArea implements ReferenceArea { /** diff --git a/src/java/org/apache/fop/area/MainReferenceArea.java b/src/java/org/apache/fop/area/MainReferenceArea.java index 90545e426..9f8231cea 100644 --- a/src/java/org/apache/fop/area/MainReferenceArea.java +++ b/src/java/org/apache/fop/area/MainReferenceArea.java @@ -32,7 +32,7 @@ import org.apache.fop.fo.flow.FoPageSequence; * 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; diff --git a/src/java/org/apache/fop/area/NormalFlowRefArea.java b/src/java/org/apache/fop/area/NormalFlowRefArea.java index 8963982e7..19fb43ee3 100644 --- a/src/java/org/apache/fop/area/NormalFlowRefArea.java +++ b/src/java/org/apache/fop/area/NormalFlowRefArea.java @@ -27,7 +27,7 @@ import org.apache.fop.fo.flow.FoPageSequence; * @author pbw * @version $Revision$ $Name$ */ -public class NormalFlowRefArea extends AbstractReferenceArea +public class NormalFlowRefArea extends BlockReferenceArea implements ReferenceArea { /** diff --git a/src/java/org/apache/fop/area/RegionRefArea.java b/src/java/org/apache/fop/area/RegionRefArea.java index ca4a54d84..0bcdf166c 100644 --- a/src/java/org/apache/fop/area/RegionRefArea.java +++ b/src/java/org/apache/fop/area/RegionRefArea.java @@ -30,7 +30,7 @@ import org.apache.fop.fo.flow.FoPageSequence; * 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 @@ -60,18 +60,4 @@ implements ReferenceArea { 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; - } - } diff --git a/src/java/org/apache/fop/area/SpanReferenceArea.java b/src/java/org/apache/fop/area/SpanReferenceArea.java index fcf893945..6d99071ff 100644 --- a/src/java/org/apache/fop/area/SpanReferenceArea.java +++ b/src/java/org/apache/fop/area/SpanReferenceArea.java @@ -32,7 +32,7 @@ import org.apache.fop.fo.flow.FoPageSequence; * 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 |