Thread: [FOray-commit] SF.net SVN: foray: [9556] trunk/foray (Page 13)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9556
          http://svn.sourceforge.net/foray/?rev=9556&view=rev
Author:   victormote
Date:     2007-05-21 14:51:41 -0700 (Mon, 21 May 2007)

Log Message:
-----------
Conform to axsl changes removing method parameters in favor of FoContext information.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
    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/Leader.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java
===================================================================

--- trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2007-05-21 20:38:29 UTC (rev 9555)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/LeaderArea.java	2007-05-21 21:51:41 UTC (rev 9556)
@@ -334,8 +334,7 @@
      * @return The minimum length of this leader, in millipoints.
      */
     public int traitLeaderLengthMin() {
-        final int percentBase = this.ancestorArea().crIPD();
-        return this.traitGeneratedBy().traitLeaderLengthMin(this, percentBase);
+        return this.traitGeneratedBy().traitLeaderLengthMin(this);
     }
 
     /**
@@ -343,8 +342,7 @@
      * @return The optimum length of this leader, in millipoints.
      */
     public int traitLeaderLengthOpt() {
-        final int percentBase = this.ancestorArea().crIPD();
-        return this.traitGeneratedBy().traitLeaderLengthOpt(this, percentBase);
+        return this.traitGeneratedBy().traitLeaderLengthOpt(this);
     }
 
     /**
@@ -352,8 +350,7 @@
      * @return The maximum length of this leader, in millipoints.
      */
     public int traitLeaderLengthMax() {
-        final int percentBase = this.ancestorArea().crIPD();
-        return this.traitGeneratedBy().traitLeaderLengthMax(this, percentBase);
+        return this.traitGeneratedBy().traitLeaderLengthMax(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-05-21 20:38:29 UTC (rev 9555)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-05-21 21:51:41 UTC (rev 9556)
@@ -1532,28 +1532,22 @@
     /**
      * {@inheritDoc}
      */
-    public int traitLeaderLengthMin(final FoContext context,
-            final int parentAreaContentIPD) {
-        return propertyList.getLeaderLengthMinimum(this, context,
-                parentAreaContentIPD);
+    public int traitLeaderLengthMin(final FoContext context) {
+        return propertyList.getLeaderLengthMinimum(this, context);
     }
 
     /**
      * {@inheritDoc}
      */
-    public int traitLeaderLengthOpt(final FoContext context,
-            final int parentAreaContentIPD) {
-        return propertyList.getLeaderLengthOptimum(this, context,
-                parentAreaContentIPD);
+    public int traitLeaderLengthOpt(final FoContext context) {
+        return propertyList.getLeaderLengthOptimum(this, context);
     }
 
     /**
      * {@inheritDoc}
      */
-    public int traitLeaderLengthMax(final FoContext context,
-            final int parentAreaContentIPD) {
-        return propertyList.getLeaderLengthMaximum(this, context,
-                parentAreaContentIPD);
+    public int traitLeaderLengthMax(final FoContext context) {
+        return propertyList.getLeaderLengthMaximum(this, context);
     }
 
     /**

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2007-05-21 20:38:29 UTC (rev 9555)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2007-05-21 21:51:41 UTC (rev 9556)
@@ -2235,19 +2235,16 @@
      * @param context An object that knows how to resolve FO Tree context
      * issues.
      * @param subProperty The length-range specifier.
-     * @param parentAreaContentIPD The IPD of the parent Area content-rectangle.
      * @return The leader-length property.
      */
     private int getLeaderLength(final FObj fobj, final FoContext context,
-            final LengthRange subProperty, final int parentAreaContentIPD) {
+            final LengthRange subProperty) {
         final LeaderLength property = (LeaderLength) getProperty(
                 FoProperty.LEADER_LENGTH);
         if (property != null) {
-            return property.getValue(context, subProperty, fobj,
-                    parentAreaContentIPD);
+            return property.getValue(context, subProperty, fobj);
         }
-        return LeaderLength.getValueNoInstance(subProperty, fobj,
-                parentAreaContentIPD);
+        return LeaderLength.getValueNoInstance(subProperty, fobj, context);
     }
 
     /**
@@ -2255,15 +2252,11 @@
      * @param fobj The FObj to which the property belongs.
      * @param context An object that knows how to resolve FO Tree context
      * issues.
-     * @param parentAreaContentIPD The IPD of the content-rectangle of the
-     * parent area, per XSL-FO 1.0, Sec. 7.21.4. This value is needed for
-     * computations that are percent-based, but is ignored for others.
      * @return The leader-length.minimum property.
      */
-    public int getLeaderLengthMinimum(final FObj fobj, final FoContext context,
-            final int parentAreaContentIPD) {
-        return getLeaderLength(fobj, context, LengthRange.MINIMUM,
-                parentAreaContentIPD);
+    public int getLeaderLengthMinimum(final FObj fobj,
+            final FoContext context) {
+        return getLeaderLength(fobj, context, LengthRange.MINIMUM);
     }
 
     /**
@@ -2271,15 +2264,11 @@
      * @param fobj The FObj to which the property belongs.
      * @param context An object that knows how to resolve FO Tree context
      * issues.
-     * @param parentAreaContentIPD The IPD of the content-rectangle of the
-     * parent area, per XSL-FO 1.0, Sec. 7.21.4. This value is needed for
-     * computations that are percent-based, but is ignored for others.
      * @return The leader-length.optimum property.
      */
-    public int getLeaderLengthOptimum(final FObj fobj, final FoContext context,
-            final int parentAreaContentIPD) {
-        return getLeaderLength(fobj, context, LengthRange.OPTIMUM,
-                parentAreaContentIPD);
+    public int getLeaderLengthOptimum(final FObj fobj,
+            final FoContext context) {
+        return getLeaderLength(fobj, context, LengthRange.OPTIMUM);
     }
 
     /**
@@ -2287,15 +2276,11 @@
      * @param fobj The FObj to which the property belongs.
      * @param context An object that knows how to resolve FO Tree context
      * issues.
-     * @param parentAreaContentIPD The IPD of the content-rectangle of the
-     * parent area, per XSL-FO 1.0, Sec. 7.21.4. This value is needed for
-     * computations that are percent-based, but is ignored for others.
      * @return The leader-length.maximum property.
      */
-    public int getLeaderLengthMaximum(final FObj fobj, final FoContext context,
-            final int parentAreaContentIPD) {
-        return getLeaderLength(fobj, context, LengthRange.MAXIMUM,
-                parentAreaContentIPD);
+    public int getLeaderLengthMaximum(final FObj fobj,
+            final FoContext context) {
+        return getLeaderLength(fobj, context, LengthRange.MAXIMUM);
     }
 
     /**

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java	2007-05-21 20:38:29 UTC (rev 9555)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java	2007-05-21 21:51:41 UTC (rev 9556)
@@ -49,6 +49,22 @@
  */
 public class Leader extends FObjMixed implements org.axsl.foR.fo.Leader {
 
+    /** A constant IPD value used for testing submitted property values. */
+    private static final int TEST_IPD = 1000000;
+
+    /** A static context useful for testing submitted property values. */
+    private static final FoContext TEST_CONTEXT = new FoContext() {
+        public GraftingPoint getGraftingPoint() {
+            return null;
+        }
+        public int ipdNearestBlockLevel() {
+            return 0;
+        }
+        public int bpdNearestBlockLevel() {
+            return TEST_IPD;
+        }
+    };
+
     /** The parent of this node. */
     private FObj parent;
 
@@ -79,15 +95,13 @@
         /* Using a null context here is OK, because we are not computing
          * a length to be used anywhere, only testing the relative values of
          * the min, max, and optimum. */
-        final FoContext context = null;
-        final int testConstant = 1000000;
-        if (traitLeaderLengthMin(context, testConstant)
-                > traitLeaderLengthOpt(context, testConstant)) {
+        if (traitLeaderLengthMin(TEST_CONTEXT)
+                > traitLeaderLengthOpt(TEST_CONTEXT)) {
             throwException("leader-length.minimum may not exceed "
                     + "leader-length.optimum");
         }
-        if (traitLeaderLengthOpt(context, testConstant)
-                > traitLeaderLengthMax(context, testConstant)) {
+        if (traitLeaderLengthOpt(TEST_CONTEXT)
+                > traitLeaderLengthMax(TEST_CONTEXT)) {
             throwException("leader-length.optimum may not exceed "
                     + "leader-length.maximum");
         }
@@ -159,7 +173,7 @@
      * {@inheritDoc}
      */
     public int inlineSizeOptimum(final int lineLength) {
-        return traitLeaderLengthOpt(null, lineLength);
+        return traitLeaderLengthOpt(null);
     }
 
     /**
@@ -167,14 +181,14 @@
      */
     public int inlineSizeOptimum(final FoContext context,
             final int lineLength) {
-        return traitLeaderLengthOpt(context, lineLength);
+        return traitLeaderLengthOpt(context);
     }
 
     /**
      * {@inheritDoc}
      */
     public int inlineSizeMinimum(final int lineLength) {
-        return traitLeaderLengthMin(null, lineLength);
+        return traitLeaderLengthMin(null);
     }
 
     /**
@@ -182,14 +196,14 @@
      */
     public int inlineSizeMinimum(final FoContext context,
             final int lineLength) {
-        return traitLeaderLengthMin(context, lineLength);
+        return traitLeaderLengthMin(context);
     }
 
     /**
      * {@inheritDoc}
      */
     public int inlineSizeMaximum(final int lineLength) {
-        return traitLeaderLengthMax(null, lineLength);
+        return traitLeaderLengthMax(null);
     }
 
     /**
@@ -197,7 +211,7 @@
      */
     public int inlineSizeMaximum(final FoContext context,
             final int lineLength) {
-        return traitLeaderLengthMax(context, lineLength);
+        return traitLeaderLengthMax(context);
     }
 
     /**

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java	2007-05-21 20:38:29 UTC (rev 9555)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LeaderLength.java	2007-05-21 21:51:41 UTC (rev 9556)
@@ -137,12 +137,10 @@
      * @param subProperty The length-range for the property needed (MINIMUM,
      * OPTIMUM, OR MAXIMUM).
      * @param fobj The FO for which this value is needed.
-     * @param parentAreaCRIPD The inline-progression-dimension of the parent
-     * area's content-rectangle.
      * @return The value of this property.
      */
     public int getValue(final FoContext context, final LengthRange subProperty,
-            final FObj fobj, final int parentAreaCRIPD) {
+            final FObj fobj) {
         if (value() instanceof DtLengthRange) {
             final DtLengthRange lengthRange = (DtLengthRange) value();
             ExprNumeric length = null;
@@ -167,17 +165,16 @@
                 return 0;
             }
             return length.getLength(fobj.traitFontSize(context),
-                    parentAreaCRIPD);
+                    context.ipdNearestBlockLevel());
         }
         if (value() instanceof FoPropertyKeyword) {
             final FoPropertyKeyword kw = (FoPropertyKeyword) value();
             if (kw.getValue() == FoValue.INHERIT) {
                 return getValueInherited(context, subProperty, fobj,
-                        parentAreaCRIPD);
+                        context.ipdNearestBlockLevel());
             }
         }
-        // This is an error that should already have been caught.
-        return getValueNoInstance(subProperty, fobj, parentAreaCRIPD);
+        throw this.unexpectedRetrieval();
     }
 
     /**
@@ -196,19 +193,16 @@
         final FObj effectiveParent = fobj.effectiveParent(context);
         switch (subProperty) {
         case MINIMUM: {
-            return effectiveParent.traitLeaderLengthMin(context,
-                    parentAreaCRIPD);
+            return effectiveParent.traitLeaderLengthMin(context);
         }
         case OPTIMUM: {
-            return effectiveParent.traitLeaderLengthOpt(context,
-                    parentAreaCRIPD);
+            return effectiveParent.traitLeaderLengthOpt(context);
         }
         case MAXIMUM: {
-            return effectiveParent.traitLeaderLengthMax(context,
-                    parentAreaCRIPD);
+            return effectiveParent.traitLeaderLengthMax(context);
         }
         }
-        return getValueNoInstance(subProperty, fobj, parentAreaCRIPD);
+        return getValueNoInstance(subProperty, fobj, context);
     }
 
     /**
@@ -216,12 +210,11 @@
      * @param subProperty The length-range for the property needed (MINIMUM,
      * OPTIMUM, OR MAXIMUM).
      * @param fobj The FO for which this value is needed.
-     * @param parentAreaCRIPD The inline-progression-dimension of the parent
-     * area's content-rectangle.
+     * @param foContext An object that knows how to resolve FO context issues.
      * @return The initial value for this property.
      */
     public static int getValueNoInstance(final LengthRange subProperty,
-            final FObj fobj, final int parentAreaCRIPD) {
+            final FObj fobj, final FoContext foContext) {
         // These values are the initial values from the spec
         switch (subProperty) {
         case MINIMUM: {
@@ -231,7 +224,7 @@
             return DEFAULT_OPTIMUM_VALUE;
         }
         case MAXIMUM: {
-            return parentAreaCRIPD;
+            return foContext.ipdNearestBlockLevel();
         }
         }
         return 0;


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




Thread: [FOray-commit] SF.net SVN: foray: [9556] trunk/foray (Page 13)

Modular XSL-FO Implementation for Java.

foray-commit