[FOray-commit] SF.net SVN: foray: [8825] trunk/foray

[<vic...@us...>]

Revision: 8825
          http://svn.sourceforge.net/foray/?rev=8825&view=rev
Author:   victormote
Date:     2007-03-14 09:47:34 -0700 (Wed, 14 Mar 2007)

Log Message:
-----------
Roll GenericContainer into AbstractTableContainer.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java

Removed Paths:
-------------
    trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java	2007-03-14 16:08:03 UTC (rev 8824)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java	2007-03-14 16:47:34 UTC (rev 8825)
@@ -38,10 +38,16 @@
 /**
  * Abstract superclass for table-body, table-header, and table-footer areas.
  */
-public abstract class AbstractTableContainer extends GenericContainer
+public abstract class AbstractTableContainer extends ContainerRA
         implements BackgroundArea,
         org.axsl.areaW.AbstractTableContainer {
 
+    /** The x position of this container (content rectangle??). */
+    private int xPosition = 0;
+
+    /** The y position of this container (content rectangle??).*/
+    private int yPosition = 0;
+
     /**
      * Constructor.
      * @param generatedBy The FO node generating this area.
@@ -69,4 +75,32 @@
         return this.traitBackgroundImage();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public void setXPosition(final int xPosition) {
+        this.xPosition = xPosition;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int getXPosition() {
+        return this.xPosition;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setYPosition(final int yPosition) {
+        this.yPosition = yPosition;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int getYPosition() {
+        return this.yPosition;
+    }
+
 }

Deleted: trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java	2007-03-14 16:08:03 UTC (rev 8824)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/GenericContainer.java	2007-03-14 16:47:34 UTC (rev 8825)
@@ -1,86 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- *      http://www.foray.org
- *
- * 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.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- *      Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.area;
-
-import org.axsl.foR.FObj;
-import org.axsl.foR.fo.RetrieveMarker;
-
-/**
- * Abstract superclass for generic container Areas.
- */
-public abstract class GenericContainer extends ContainerRA
-        implements org.axsl.areaW.GenericContainer {
-
-    /** The x position of this container (content rectangle??). */
-    private int xPosition = 0;
-
-    /** The y position of this container (content rectangle??).*/
-    private int yPosition = 0;
-
-    /**
-     * Constructor.
-     * @param generatedBy The FO node generating this area.
-     * @param parentArea The parent area.
-     * @param retrieveMarker The ancestor retrieve-marker, if any, for this
-     * area.
-     */
-    public GenericContainer(final FObj generatedBy, final Area parentArea,
-            final RetrieveMarker retrieveMarker) {
-        super(generatedBy, parentArea, retrieveMarker);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void setXPosition(final int xPosition) {
-        this.xPosition = xPosition;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public int getXPosition() {
-        return this.xPosition;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public void setYPosition(final int yPosition) {
-        this.yPosition = yPosition;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public int getYPosition() {
-        return this.yPosition;
-    }
-
-}

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java	2007-03-14 16:08:03 UTC (rev 8824)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java	2007-03-14 16:47:34 UTC (rev 8825)
@@ -28,11 +28,11 @@
 
 package org.foray.pioneer;
 
+import org.axsl.areaW.AbstractTableContainer;
 import org.axsl.areaW.Area;
 import org.axsl.areaW.AreaWException;
 import org.axsl.areaW.BlockContainerRA;
 import org.axsl.areaW.ContainerRA;
-import org.axsl.areaW.GenericContainer;
 import org.axsl.areaW.NormalBlockArea;
 import org.axsl.areaW.TableArea;
 import org.axsl.common.FoValue;
@@ -68,15 +68,15 @@
     }
 
     public void setYPosition(final int value) {
-        ((GenericContainer) areaContainerRef.get()).setYPosition(value);
+        ((AbstractTableContainer) areaContainerRef.get()).setYPosition(value);
     }
 
     public int getYPosition() {
-        return ((GenericContainer) areaContainerRef.get()).getYPosition();
+        return ((AbstractTableContainer) areaContainerRef.get()).getYPosition();
     }
 
     public int getHeight(final FOContext context) {
-        return ((GenericContainer) areaContainerRef.get()).crBPD()
+        return ((AbstractTableContainer) areaContainerRef.get()).crBPD()
                 + getReal().traitSpaceBeforeOptimum(context)
                 + getReal().traitSpaceAfterOptimum(context);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.