[FOray-commit] SF.net SVN: foray: [7641] trunk/foray/foray-fotree/src/java/org/foray/fotree

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

Revision: 7641
Author:   victormote
Date:     2006-06-15 17:37:58 -0700 (Thu, 15 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7641&view=rev

Log Message:
-----------
Conform to axsl change: Remove unneeded parameter.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-06-15 23:43:42 UTC (rev 7640)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-06-16 00:37:58 UTC (rev 7641)
@@ -721,8 +721,8 @@
     /**
      * {@inheritDoc}
      */
-    public int traitExtent(FOContext context) {
-        return propertyList.getExtent(context);
+    public int traitExtent() {
+        return propertyList.getExtent();
     }
 
     /**

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-06-15 23:43:42 UTC (rev 7640)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-06-16 00:37:58 UTC (rev 7641)
@@ -963,10 +963,10 @@
                 Constants.FOPROP_PRECEDENCE);
     }
 
-    public int getExtent(FOContext context) {
+    public int getExtent() {
         Extent property = (Extent) getProperty(Constants.FOPROP_EXTENT);
         if (property != null) {
-            return property.getValue(context, fobj);
+            return property.getValue(fobj);
         }
         return Extent.getValueNoInstance();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java	2006-06-15 23:43:42 UTC (rev 7640)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java	2006-06-16 00:37:58 UTC (rev 7641)
@@ -70,7 +70,7 @@
     public int getYPositionVP_CR(FOContext context) {
         return getPageMaster().getYPositionRA_CR()
                 - getPageMaster().getHeightRA_CR()
-                + traitExtent(context);
+                + traitExtent();
     }
 
     /**
@@ -89,7 +89,7 @@
      * {@inheritDoc}
      */
     public int getHeightVP_CR(FOContext context) {
-        return traitExtent(context);
+        return traitExtent();
     }
 
     public FONodeProxy makeProxy(ProxyFactory factory) {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java	2006-06-15 23:43:42 UTC (rev 7640)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java	2006-06-16 00:37:58 UTC (rev 7641)
@@ -93,7 +93,7 @@
      * Inherited documentation: @inheritDoc
      */
     public int getHeightVP_CR(FOContext context) {
-        return traitExtent(context);
+        return traitExtent();
     }
 
     public FONodeProxy makeProxy(ProxyFactory factory) {

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java	2006-06-15 23:43:42 UTC (rev 7640)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java	2006-06-16 00:37:58 UTC (rev 7641)
@@ -58,7 +58,7 @@
     public int getXPositionVP_CR(FOContext context) {
         return getPageMaster().getXPositionRA_CR()
                 + getPageMaster().getWidthRA_CR()
-                - traitExtent(context);
+                - traitExtent();
     }
 
     /**
@@ -76,7 +76,7 @@
      * Inherited documentation: @inheritDoc
      */
     public int getWidthVP_CR(FOContext context) {
-        return traitExtent(context);
+        return traitExtent();
     }
 
     /**

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java	2006-06-15 23:43:42 UTC (rev 7640)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java	2006-06-16 00:37:58 UTC (rev 7641)
@@ -75,7 +75,7 @@
      * Inherited documentation: @inheritDoc
      */
     public int getWidthVP_CR(FOContext context) {
-        return traitExtent(context);
+        return traitExtent();
     }
 
     /**

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java	2006-06-15 23:43:42 UTC (rev 7640)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java	2006-06-16 00:37:58 UTC (rev 7641)
@@ -168,12 +168,10 @@
      * @return The extent, in millipoints, of this pages's region-before.
      */
     public int getBeforeExtent() {
-        /* TODO: Handle context better. */
-        FOContext context = null;
         if (getRegionBefore() == null) {
             return 0;
         }
-        return getRegionBefore().traitExtent(context);
+        return getRegionBefore().traitExtent();
     }
 
     /**
@@ -181,12 +179,10 @@
      * @return The extent, in millipoints, of this pages's region-after.
      */
     public int getAfterExtent() {
-        /* TODO: Handle context better. */
-        FOContext context = null;
         if (getRegionAfter() == null) {
             return 0;
         }
-        return getRegionAfter().traitExtent(context);
+        return getRegionAfter().traitExtent();
     }
 
     /**
@@ -194,12 +190,10 @@
      * @return The extent, in millipoints, of this pages's region-start.
      */
     public int getStartExtent() {
-        /* TODO: Handle context better. */
-        FOContext context = null;
         if (getRegionStart() == null) {
             return 0;
         }
-        return getRegionStart().traitExtent(context);
+        return getRegionStart().traitExtent();
     }
 
     /**
@@ -207,12 +201,10 @@
      * @return The extent, in millipoints, of this pages's region-end.
      */
     public int getEndExtent() {
-        /* TODO: Handle context better. */
-        FOContext context = null;
         if (getRegionEnd() == null) {
             return 0;
         }
-        return getRegionEnd().traitExtent(context);
+        return getRegionEnd().traitExtent();
     }
 
     /**

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java	2006-06-15 23:43:42 UTC (rev 7640)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbsoluteOffset.java	2006-06-16 00:37:58 UTC (rev 7641)
@@ -85,7 +85,7 @@
                 if (parent == null) {
                     return getValueNoInstance();
                 }
-                return parent.traitExtent(context);
+                return parent.traitExtent();
             }
             }
         }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java	2006-06-15 23:43:42 UTC (rev 7640)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/ColumnGap.java	2006-06-16 00:37:58 UTC (rev 7641)
@@ -77,7 +77,7 @@
                 if (parent == null) {
                     return getValueNoInstance();
                 }
-                return parent.traitExtent(context);
+                return parent.traitExtent();
             }
             }
         }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java	2006-06-15 23:43:42 UTC (rev 7640)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/Extent.java	2006-06-16 00:37:58 UTC (rev 7641)
@@ -72,16 +72,19 @@
                 propertyList));
     }
 
-    public int getValue(FOContext context, FObj fobj) {
+    public int getValue(FObj fobj) {
+        /* Null context is OK. The objects for these cannot be inside a
+         * marker.*/
+        FOContext context = null;
         if (this.value instanceof PropertyKeyword) {
             short keyword = ((PropertyKeyword) value).getValue();
             switch (keyword) {
             case Constants.FOVAL_INHERIT: {
-                FObj parent = fobj.effectiveParent(context);
+                FObj parent = fobj.realParent();
                 if (parent == null) {
                     return getValueNoInstance();
                 }
-                return parent.traitExtent(context);
+                return parent.traitExtent();
             }
             }
         }


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