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

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

Revision: 10014
          http://svn.sourceforge.net/foray/?rev=10014&view=rev
Author:   victormote
Date:     2007-07-17 12:45:06 -0700 (Tue, 17 Jul 2007)

Log Message:
-----------
Conform to axsl changes moving methods from Fo to new property-specific interfaces.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java	2007-07-17 19:04:35 UTC (rev 10013)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java	2007-07-17 19:45:06 UTC (rev 10014)
@@ -238,14 +238,15 @@
      * @return The adjustment to the start edge.
      */
     public int getStartAdjust() {
-        final TableCell tableCell = traitGeneratedBy();
-        if (tableCell.traitBorderCollapse(this) == BorderModel.SEPARATE) {
-            final int iSep = tableCell.traitBorderSeparationIpd(this);
-            return iSep / 2 + tableCell.traitBorderStartWidth(this)
-                               + tableCell.traitPaddingStart(this);
+        final TableRA tableArea = this.ancestorTableArea();
+        final Table table = tableArea.traitGeneratedBy();
+        if (table.traitBorderCollapse(this) == BorderModel.SEPARATE) {
+            final int iSep = table.traitBorderSeparationIpd(this);
+            return iSep / 2 + table.traitBorderStartWidth(this)
+                               + table.traitPaddingStart(this);
         }
-        return tableCell.traitBorderStartWidth(this) / 2
-                + tableCell.traitPaddingStart(this);
+        return table.traitBorderStartWidth(this) / 2
+                + table.traitPaddingStart(this);
     }
 
     /**

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-17 19:04:35 UTC (rev 10013)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-17 19:45:06 UTC (rev 10014)
@@ -101,6 +101,9 @@
 import org.axsl.fo.FoInlineContext;
 import org.axsl.fo.FoTreeException;
 import org.axsl.fo.fo.Marker;
+import org.axsl.fo.fo.prop.ActiveStatePa;
+import org.axsl.fo.fo.prop.AutoRestorePa;
+import org.axsl.fo.fo.prop.BorderCollapsePa;
 import org.axsl.fo.fo.prop.CommonAbsolutePositionPa;
 import org.axsl.fo.fo.prop.CommonAccessibilityPa;
 import org.axsl.fo.fo.prop.CommonAuralPa;
@@ -133,7 +136,8 @@
         CommonAccessibilityPa, CommonAbsolutePositionPa,
         CommonAuralPa, CommonBorderPaddingBgPa, CommonFontPa,
         CommonHyphenationPa, CommonMarginBlockPa, CommonMarginInlinePa,
-        CommonRelativePositionPa, HyphenationLadderCountPa {
+        CommonRelativePositionPa, ActiveStatePa, AutoRestorePa,
+        BorderCollapsePa, HyphenationLadderCountPa {
 
     /** A static empty and immutable list of children, suitable for return by
      * objects that have no children. */


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