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

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

Revision: 10025
          http://svn.sourceforge.net/foray/?rev=10025&view=rev
Author:   victormote
Date:     2007-07-17 16:42:15 -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/Area.java
    trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-07-17 23:28:12 UTC (rev 10024)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-07-17 23:42:15 UTC (rev 10025)
@@ -858,24 +858,6 @@
     }
 
     /**
-     * Returns the page-width trait of this area.
-     * @return The page-width trait of this area.
-     * @see Fo#traitPageWidth()
-     */
-    public int traitPageWidth() {
-        return traitGeneratedBy().traitPageWidth();
-    }
-
-    /**
-     * Returns the page-height trait of this area.
-     * @return The page-height trait of this area.
-     * @see Fo#traitPageHeight()
-     */
-    public int traitPageHeight() {
-        return traitGeneratedBy().traitPageHeight();
-    }
-
-    /**
      * Tells which axis (horizontal or vertical) is the block-progression axis.
      * @return Either {@link AbsoluteAxis#HORIZONTAL} or
      * {@link AbsoluteAxis#VERTICAL}, or null if writing-mode is invalid.

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2007-07-17 23:28:12 UTC (rev 10024)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/PageRA.java	2007-07-17 23:42:15 UTC (rev 10025)
@@ -890,4 +890,20 @@
         return traitGeneratedBy().traitSpaceEndOptimum(this);
     }
 
+    /**
+     * Returns the page-width trait of this area.
+     * @return The page-width trait of this area.
+     */
+    public int traitPageWidth() {
+        return traitGeneratedBy().traitPageWidth();
+    }
+
+    /**
+     * Returns the page-height trait of this area.
+     * @return The page-height trait of this area.
+     */
+    public int traitPageHeight() {
+        return traitGeneratedBy().traitPageHeight();
+    }
+
 }

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 23:28:12 UTC (rev 10024)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-17 23:42:15 UTC (rev 10025)
@@ -132,8 +132,10 @@
 import org.axsl.fo.fo.prop.IndicateDestinationPa;
 import org.axsl.fo.fo.prop.InternalDestinationPa;
 import org.axsl.fo.fo.prop.LeaderPa;
+import org.axsl.fo.fo.prop.ListBlockPa;
 import org.axsl.fo.fo.prop.MediaUsagePa;
 import org.axsl.fo.fo.prop.NumberColumnsRepeatedPa;
+import org.axsl.fo.fo.prop.PageDimensionPa;
 import org.axsl.fo.fo.prop.TableBorderPrecedencePa;
 import org.axsl.font.Font;
 import org.axsl.font.FontConsumer;
@@ -163,9 +165,9 @@
         DestinationPlacementOffsetPa, DirectionPa, EmptyCellsPa, ExtentPa,
         ExternalDestinationPa, FloatPa, FlowNamePa, GlyphOrientationPa,
         IndicateDestinationPa,
-        InternalDestinationPa, LeaderPa,
+        InternalDestinationPa, LeaderPa, ListBlockPa,
         MediaUsagePa, NumberColumnsRepeatedPa,
-        TableBorderPrecedencePa {
+        PageDimensionPa, TableBorderPrecedencePa {
 
     /** 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.