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

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

Revision: 8832
          http://svn.sourceforge.net/foray/?rev=8832&view=rev
Author:   victormote
Date:     2007-03-14 11:36:25 -0700 (Wed, 14 Mar 2007)

Log Message:
-----------
Conform to axsl changes removing some methods allowing external placement of the table header, footer, and body.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.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 18:16:26 UTC (rev 8831)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AbstractTableContainer.java	2007-03-14 18:36:25 UTC (rev 8832)
@@ -42,12 +42,6 @@
         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.
@@ -75,32 +69,4 @@
         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;
-    }
-
 }

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 18:16:26 UTC (rev 8831)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/AbstractTableBodyPL.java	2007-03-14 18:36:25 UTC (rev 8832)
@@ -67,14 +67,6 @@
         super(tableBody, layout);
     }
 
-    public void setYPosition(final int value) {
-        ((AbstractTableContainer) areaContainerRef.get()).setYPosition(value);
-    }
-
-    public int getYPosition() {
-        return ((AbstractTableContainer) areaContainerRef.get()).getYPosition();
-    }
-
     public int getHeight(final FOContext context) {
         return ((AbstractTableContainer) areaContainerRef.get()).crBPD()
                 + getReal().traitSpaceBeforeOptimum(context)

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java	2007-03-14 18:16:26 UTC (rev 8831)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TablePL.java	2007-03-14 18:36:25 UTC (rev 8832)
@@ -33,7 +33,6 @@
 import org.axsl.areaW.NormalBlockArea;
 import org.axsl.areaW.TableArea;
 import org.axsl.common.FoValue;
-import org.axsl.foR.FOContext;
 import org.axsl.foR.FONode;
 import org.axsl.foR.fo.Marker;
 import org.axsl.foR.fo.RetrieveMarker;
@@ -116,8 +115,6 @@
                     return Status.OK;
                 }
             } else if (fo instanceof TableBody) {
-                final TableBodyPL tableBodyPL =
-                        (TableBodyPL) getLayoutProxy(fo);
                 TableHeader th = node.getTableHeader();
                 final TableHeaderPL tableHeaderPL = (TableHeaderPL)
                         getLayoutProxy(th);
@@ -182,29 +179,11 @@
                     if (areaContainer.crBPD() > 0) {
                         area.incrementProgressionDimension(
                                 areaContainer.crBPD());
-                        if (node.getTableFooter() != null
-                                && ! node.traitTableOmitFooterAtBreak(area)) {
-                            // move footer to bottom of area and move up body
-                            final int yPosition = getTableFooterYPosition(area,
-                                    tf);
-                            tableBodyPL.setYPosition(yPosition);
-                            tableFooterPL.setYPosition(yPosition
-                                    + tableBodyPL.getHeight(area));
-                        }
                         status = Status.AREA_FULL_SOME;
                     }
                     return status;
                 }
                 this.bodyCount++;
-                if (node.getTableFooter() != null
-                        && ! node.traitTableOmitFooterAtBreak(area)) {
-                    // move footer to bottom of area and move up body
-                    // space before and after footer will make this wrong
-                    final int yPosition = getTableFooterYPosition(area, tf);
-                    tableBodyPL.setYPosition(yPosition);
-                    tableFooterPL.setYPosition(yPosition
-                            + tableBodyPL.getHeight(area));
-                }
             }
         }
 
@@ -255,12 +234,12 @@
         return Status.OK;
     }
 
-    // FIXME: this seems odd.
-    public int getTableFooterYPosition(final FOContext context,
-            final TableFooter tFooter) {
-        final TableFooterPL tfPL = (TableFooterPL) getLayoutProxy(tFooter);
-        return tfPL.getYPosition() - tFooter.traitSpaceBeforeOptimum(context);
-    }
+//    // FIXME: this seems odd.
+//    public int getTableFooterYPosition(final FOContext context,
+//            final TableFooter tFooter) {
+//        final TableFooterPL tfPL = (TableFooterPL) getLayoutProxy(tFooter);
+//        return tfPL.getYPosition() - tFooter.traitSpaceBeforeOptimum(context);
+//    }
 
     /**
      * {@inheritDoc}


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