Common base class for all outer regions (for easier access to the extent property).

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_KnuthStylePageBreaking@198513 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/fo/pagination/RegionBA.java b/src/java/org/apache/fop/fo/pagination/RegionBA.java
index b06e53138c5ad227d7943c1df91bfe0a0afae5e9..8a72cbd77d6327efa9ec1165b928db8c2f66420e 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionBA.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionBA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,16 +22,14 @@ package org.apache.fop.fo.pagination;
 import java.awt.Rectangle;
 
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropertyList;
 
 /**
  * Abstract base class for fo:region-before and fo:region-after.
  */
-public abstract class RegionBA extends Region {
+public abstract class RegionBA extends RegionOuter {
     // The value of properties relevant for fo:region-[before|after].
-    private Length extent;
     private int precedence;
     // End of property values
     
@@ -47,19 +45,11 @@ public abstract class RegionBA extends Region {
      */
     public void bind(PropertyList pList) throws FOPException {
         super.bind(pList);
-        extent = pList.get(PR_EXTENT).getLength();
         precedence = pList.get(PR_PRECEDENCE).getEnum();
     }
 
     /**
-     * Return the "extent" property.
-     */
-    public Length getExtent() {
-        return extent;
-    }
-
-    /**
-     * Return the "precedence" property.
+     * @return the "precedence" property.
      */
     public int getPrecedence() {
         return precedence;

diff --git a/src/java/org/apache/fop/fo/pagination/RegionOuter.java b/src/java/org/apache/fop/fo/pagination/RegionOuter.java
new file mode 100644 (file)
index 0000000..1fb5ce1
--- /dev/null
+++ b/src/java/org/apache/fop/fo/pagination/RegionOuter.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.fop.fo.pagination;
+
+import java.awt.Rectangle;
+
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.datatypes.FODimension;
+import org.apache.fop.datatypes.Length;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropertyList;
+
+/**
+ * @author Jeremias Maerki
+ */
+public abstract class RegionOuter extends Region {
+
+    private Length extent;
+    
+    /**
+     * @see org.apache.fop.fo.FONode#FONode(FONode)
+     */
+    protected RegionOuter(FONode parent) {
+        super(parent);
+    }
+
+    /**
+     * @see org.apache.fop.fo.FObj#bind(PropertyList)
+     */
+    public void bind(PropertyList pList) throws FOPException {
+        super.bind(pList);
+        extent = pList.get(PR_EXTENT).getLength();
+    }
+    
+    /**
+     * @return the "extent" property.
+     */
+    public Length getExtent() {
+        return extent;
+    }
+
+    
+
+    
+}

diff --git a/src/java/org/apache/fop/fo/pagination/RegionSE.java b/src/java/org/apache/fop/fo/pagination/RegionSE.java
index a47326778302b7bf31a71b67326759a56a52a240..25ca6680feb26882890f63c51b32d650be40d731 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RegionSE.java
+++ b/src/java/org/apache/fop/fo/pagination/RegionSE.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,16 +22,14 @@ package org.apache.fop.fo.pagination;
 import java.awt.Rectangle;
 
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.PropertyList;
 
 /**
  * Abstract base class for fo:region-start and fo:region-end.
  */
-public abstract class RegionSE extends Region {
+public abstract class RegionSE extends RegionOuter {
     // The value of properties relevant for fo:region-[start|end].
-    private Length extent;
     // End of property values
 
     /**
@@ -46,16 +44,8 @@ public abstract class RegionSE extends Region {
      */
     public void bind(PropertyList pList) throws FOPException {
         super.bind(pList);
-        extent = pList.get(PR_EXTENT).getLength();
     }
 
-    /**
-     * Return the "extent" property.
-     */
-    public Length getExtent() {
-        return extent;
-    }
-    
     /**
      * Adjust the viewport reference rectangle for a region as a function
      * of precedence.