Rectangle2D viewArea renamed area for consistency with superclass

Area.  Setting and getting of geometry now in Area.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197553 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/area/AbstractViewport.java b/src/java/org/apache/fop/area/AbstractViewport.java
index 4bfc194de28c57d87820a0845cdc736d9179ce03..0536b75027863c30bcff884571e22df2735747b7 100644 (file)
--- a/src/java/org/apache/fop/area/AbstractViewport.java
+++ b/src/java/org/apache/fop/area/AbstractViewport.java
@@ -33,9 +33,6 @@ public class AbstractViewport
 extends Area
 implements Viewport {
     
-    /** The viewport rectange */
-    protected Rectangle2D viewArea = null;
-    
     /** Does the viewport rectange clip the reference-area? */
     protected boolean clip = true;
 
@@ -62,46 +59,30 @@ implements Viewport {
     /**
      * @param pageSeq
      * @param generatedBy
-     * @param viewArea the viewport rectangle
+     * @param area the viewport rectangle
      * @param parent
      * @param sync
      */
     public AbstractViewport(
-            Rectangle2D viewArea,
+            Rectangle2D area,
             FoPageSequence pageSeq,
             FONode generatedBy,
             Node parent,
             Object sync) {
         super(pageSeq, generatedBy, parent, sync);
-        this.viewArea = viewArea;
+        this.area = area;
     }
     /**
      * @param pageSeq
      * @param generatedBy
-     * @param viewArea the viewport rectangle
+     * @param area the viewport rectangle
      */
     public AbstractViewport(
-            Rectangle2D viewArea,
+            Rectangle2D area,
             FoPageSequence pageSeq,
             FONode generatedBy) {
         super(pageSeq, generatedBy);
-        this.viewArea = viewArea;
-    }
-    /* (non-Javadoc)
-     * @see org.apache.fop.area.Viewport#getViewArea()
-     */
-    public Rectangle2D getViewArea() {
-        synchronized (sync) {
-            return viewArea;
-        }
-    }
-    /* (non-Javadoc)
-     * @see org.apache.fop.area.Viewport#setViewArea(java.awt.geom.Rectangle2D)
-     */
-    public void setViewArea(Rectangle2D viewArea) {
-        synchronized (sync) {
-            this.viewArea = viewArea;
-        }
+        this.area = area;
     }
     /* (non-Javadoc)
      * @see org.apache.fop.area.Viewport#setReferenceArea(org.apache.fop.area.ReferenceArea)