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

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

Revision: 9927
          http://svn.sourceforge.net/foray/?rev=9927&view=rev
Author:   victormote
Date:     2007-07-05 14:22:34 -0700 (Thu, 05 Jul 2007)

Log Message:
-----------
Conform to axsl changes rolling up method parameters into new FoContext methods.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
    trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.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/prop/AbstractBorderWidth.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java
    trunk/foray/foray-fotree/src/javatest/org/foray/fotree/AbstractPropertyTest.java
    trunk/foray/foray-fotree/src/javatest/org/foray/fotree/fo/prop/AbstractTestBorderWidth.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.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-05 20:36:42 UTC (rev 9926)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2007-07-05 21:22:34 UTC (rev 9927)
@@ -869,28 +869,28 @@
      * {@inheritDoc}
      */
     public int traitBorderStartWidth() {
-        return traitGeneratedBy().traitBorderStartWidth(this, traitIsFirst());
+        return traitGeneratedBy().traitBorderStartWidth(this);
     }
 
     /**
      * {@inheritDoc}
      */
     public int traitBorderEndWidth() {
-        return traitGeneratedBy().traitBorderEndWidth(this, traitIsLast());
+        return traitGeneratedBy().traitBorderEndWidth(this);
     }
 
     /**
      * {@inheritDoc}
      */
     public int traitBorderBeforeWidth() {
-        return traitGeneratedBy().traitBorderBeforeWidth(this, traitIsFirst());
+        return traitGeneratedBy().traitBorderBeforeWidth(this);
     }
 
     /**
      * {@inheritDoc}
      */
     public int traitBorderAfterWidth() {
-        return traitGeneratedBy().traitBorderAfterWidth(this, traitIsLast());
+        return traitGeneratedBy().traitBorderAfterWidth(this);
     }
 
     /**

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2007-07-05 20:36:42 UTC (rev 9926)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/AreaNode.java	2007-07-05 21:22:34 UTC (rev 9927)
@@ -770,4 +770,18 @@
         return ancestor.crBpd();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public boolean isFirst() {
+        return this.nearestArea().traitIsFirst();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean isLast() {
+        return this.nearestArea().traitIsLast();
+    }
+
 }

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-05 20:36:42 UTC (rev 9926)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java	2007-07-05 21:22:34 UTC (rev 9927)
@@ -238,10 +238,10 @@
         final TableCell tableCell = traitGeneratedBy();
         if (tableCell.traitBorderCollapse(this) == BorderModel.SEPARATE) {
             final int iSep = tableCell.traitBorderSeparationIpd(this);
-            return iSep / 2 + tableCell.traitBorderStartWidth(this, true)
+            return iSep / 2 + tableCell.traitBorderStartWidth(this)
                                + tableCell.traitPaddingStart(this, true);
         }
-        return tableCell.traitBorderStartWidth(this, true) / 2
+        return tableCell.traitBorderStartWidth(this) / 2
                 + tableCell.traitPaddingStart(this, true);
     }
 

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-05 20:36:42 UTC (rev 9926)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-07-05 21:22:34 UTC (rev 9927)
@@ -1822,37 +1822,32 @@
     /**
      * {@inheritDoc}
      */
-    public int traitBorderBeforeWidth(final FoContext context,
-            final boolean isFirst) {
+    public int traitBorderBeforeWidth(final FoContext context) {
         return propertyList.getBorderWidth(this, context,
-                RelativeCompass.BEFORE, isFirst);
+                RelativeCompass.BEFORE);
     }
 
     /**
      * {@inheritDoc}
      */
-    public int traitBorderAfterWidth(final FoContext context,
-            final boolean isLast) {
-        return propertyList.getBorderWidth(this, context, RelativeCompass.AFTER,
-                isLast);
+    public int traitBorderAfterWidth(final FoContext context) {
+        return propertyList.getBorderWidth(this, context,
+                RelativeCompass.AFTER);
     }
 
     /**
      * {@inheritDoc}
      */
-    public int traitBorderStartWidth(final FoContext context,
-            final boolean isFirst) {
-        return propertyList.getBorderWidth(this, context, RelativeCompass.START,
-                isFirst);
+    public int traitBorderStartWidth(final FoContext context) {
+        return propertyList.getBorderWidth(this, context,
+                RelativeCompass.START);
     }
 
     /**
      * {@inheritDoc}
      */
-    public int traitBorderEndWidth(final FoContext context,
-            final boolean isLast) {
-        return propertyList.getBorderWidth(this, context, RelativeCompass.END,
-                isLast);
+    public int traitBorderEndWidth(final FoContext context) {
+        return propertyList.getBorderWidth(this, context, RelativeCompass.END);
     }
 
     /**

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2007-07-05 20:36:42 UTC (rev 9926)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2007-07-05 21:22:34 UTC (rev 9927)
@@ -753,7 +753,7 @@
              * specified? Or do we need to look for the properties using just
              * the absolute properties? */
             indent += this.getPadding(fobj, context, direction, false);
-            indent += this.getBorderWidth(fobj, context, direction, false);
+            indent += this.getBorderWidth(fobj, context, direction);
             return indent;
         }
 
@@ -2884,14 +2884,10 @@
      * @param context An object that knows how to resolve FO Tree context
      * issues.
      * @param direction The direction for which the border width is needed.
-     * @param isOuterEdge For "before" and "start", set this to "true" if the
-     * area for which this width is computed "is-first" in the reference area.
-     * For "after" and "end", set this to "true" if the area for which this
-     * width is computed "is-last" in the reference area.
      * @return The width, in millipoints, of the border.
      */
     public int getBorderWidth(final FObj fobj, final FoContext context,
-            final RelativeCompass direction, final boolean isOuterEdge) {
+            final RelativeCompass direction) {
         /* If the border-style is "none", the width is zero. */
         if (getBorderStyle(fobj, context, direction)
                 == org.axsl.common.value.BorderStyle.NONE) {
@@ -2908,7 +2904,7 @@
         abstractBorderWidth = (AbstractBorderWidth) getProperty(
                 rawPropertyType);
         if (abstractBorderWidth != null) {
-            return abstractBorderWidth.getValue(context, fobj, isOuterEdge);
+            return abstractBorderWidth.getValue(context, fobj);
         }
 
         /* Now try the corresponding explicit value, e.g. "border-top-width". */
@@ -2919,7 +2915,7 @@
         abstractBorderWidth = (AbstractBorderWidth) getProperty(
                 rawPropertyType);
         if (abstractBorderWidth != null) {
-            return abstractBorderWidth.getValue(context, fobj, isOuterEdge);
+            return abstractBorderWidth.getValue(context, fobj);
         }
 
         /* Now try the lowest-level shorthand, e.g. "border-top". */
@@ -2929,7 +2925,7 @@
         if (abstractBorder != null) {
             abstractBorderWidth = abstractBorder.getBorderWidth();
             if (abstractBorderWidth != null) {
-                return abstractBorderWidth.getValue(context, fobj, isOuterEdge);
+                return abstractBorderWidth.getValue(context, fobj);
             }
         }
 
@@ -2937,7 +2933,7 @@
         final BorderWidth borderWidth = (BorderWidth) getProperty(
                 FoProperty.BORDER_WIDTH);
         if (borderWidth != null) {
-            return borderWidth.getValue(context, direction, fobj, isOuterEdge);
+            return borderWidth.getValue(context, direction, fobj);
         }
 
         /* Now try the least-precise shorthand, that is, "border". */
@@ -2948,7 +2944,7 @@
         }
 
         if (abstractBorderWidth != null) {
-            return abstractBorderWidth.getValue(context, fobj, isOuterEdge);
+            return abstractBorderWidth.getValue(context, fobj);
         }
         return AbstractBorderWidth.getValueNoInstance();
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbstractBorderWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbstractBorderWidth.java	2007-07-05 20:36:42 UTC (rev 9926)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/AbstractBorderWidth.java	2007-07-05 21:22:34 UTC (rev 9927)
@@ -110,16 +110,13 @@
      * Returns the value of this property.
      * @param context An object that knows how to resolve FO context issues.
      * @param fobj The FO for which this value is needed.
-     * @param isOuterEdge Indicates whether the border width sought is on the
-     * outer edge.
      * @return The value of this property.
      */
-    public int getValue(final FoContext context, final FObj fobj,
-            final boolean isOuterEdge) {
+    public int getValue(final FoContext context, final FObj fobj) {
         final RelativeCompass direction = this.getRelativeCompass(context,
                 fobj);
         if (value().canEvalKeyword()) {
-            return getKeywordValue(context, direction, fobj, isOuterEdge);
+            return getKeywordValue(context, direction, fobj);
         }
         if (value().canEvalLength()) {
             final int length = this.convertValueToLength(value(), fobj,
@@ -140,7 +137,7 @@
              * then the border should have a width of zero.
              */
             if (condition == FoValue.DISCARD) {
-                if (! isOuterEdge) {
+                if (! isOuterEdge(context, fobj)) {
                     return 0;
                 }
             }
@@ -167,13 +164,10 @@
      * @param context An object that knows how to resolve FO context issues.
      * @param direction The direction for which the border width is needed.
      * @param fobj The FO for which this value is needed.
-     * @param isOuterEdge Indicates whether the border width sought is on the
-     * outer edge.
      * @return The value of this property.
      */
     private int getKeywordValue(final FoContext context,
-            final RelativeCompass direction,
-            final FObj fobj, final boolean isOuterEdge) {
+            final RelativeCompass direction, final FObj fobj) {
         final FoPropertyKeyword kw = (FoPropertyKeyword) value();
         switch (kw.getValue()) {
         case THIN: {
@@ -188,20 +182,16 @@
         case INHERIT: {
             final FObj effectiveParent = fobj.effectiveParent(context);
             if (direction == RelativeCompass.BEFORE) {
-                return effectiveParent.traitBorderBeforeWidth(context,
-                        isOuterEdge);
+                return effectiveParent.traitBorderBeforeWidth(context);
             }
             if (direction == RelativeCompass.AFTER) {
-                return effectiveParent.traitBorderAfterWidth(context,
-                        isOuterEdge);
+                return effectiveParent.traitBorderAfterWidth(context);
             }
             if (direction == RelativeCompass.START) {
-                return effectiveParent.traitBorderStartWidth(context,
-                        isOuterEdge);
+                return effectiveParent.traitBorderStartWidth(context);
             }
             if (direction == RelativeCompass.END) {
-                return effectiveParent.traitBorderEndWidth(context,
-                        isOuterEdge);
+                return effectiveParent.traitBorderEndWidth(context);
             }
         }
         }
@@ -263,4 +253,30 @@
         return value;
     }
 
+    /**
+     * Indicates whether the context is on the outer edge of its parent
+     * reference area.
+     * @param context An object that knows how to resolve FO context issues.
+     * @param fobj The FO for which this property exists.
+     * @return True iff the context is on the outer edge of its parent reference
+     * area.
+     */
+    protected boolean isOuterEdge(final FoContext context, final FObj fobj) {
+        final RelativeCompass direction = this.getRelativeCompass(context,
+                fobj);
+        switch (direction) {
+        case BEFORE:
+        case START: {
+            return context.isFirst();
+        }
+        case AFTER:
+        case END: {
+            return context.isLast();
+        }
+        default: {
+            throw new NullPointerException("RelativeCompass cannot be null");
+        }
+        }
+    }
+
 }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java	2007-07-05 20:36:42 UTC (rev 9926)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java	2007-07-05 21:22:34 UTC (rev 9927)
@@ -128,18 +128,15 @@
      * @param context An object that knows how to resolve FO context issues.
      * @param direction The direction for which the border width is needed.
      * @param fobj The FO for which this value is needed.
-     * @param isOuterEdge Indicates whether the border width sought is on the
-     * outer edge.
      * @return The value of this property.
      */
     public int getValue(final FoContext context,
-            final RelativeCompass direction,
-            final FObj fobj, final boolean isOuterEdge) {
+            final RelativeCompass direction, final FObj fobj) {
         if (value() instanceof ValueCollection) {
-            return getCollectionValue(context, direction, fobj, isOuterEdge);
+            return getCollectionValue(context, direction, fobj);
         }
         if (value().canEvalKeyword()) {
-            return getKeywordValue(context, direction, fobj, isOuterEdge);
+            return getKeywordValue(context, direction, fobj);
         }
         throw this.unexpectedRetrieval();
     }
@@ -149,13 +146,10 @@
      * @param context An object that knows how to resolve FO context issues.
      * @param direction The direction for which the border width is needed.
      * @param fobj The FO for which this value is needed.
-     * @param isOuterEdge Indicates whether the border width sought is on the
-     * outer edge.
      * @return The value of this property.
      */
     private int getCollectionValue(final FoContext context,
-            final RelativeCompass direction, final FObj fobj,
-            final boolean isOuterEdge) {
+            final RelativeCompass direction, final FObj fobj) {
         final ValueCollection collection = (ValueCollection) value();
         final int whichElement = PropertyCollection.whichElementForDirectional(
                 direction, collection.getCount());
@@ -190,13 +184,10 @@
      * @param context An object that knows how to resolve FO context issues.
      * @param direction The direction for which the border width is needed.
      * @param fobj The FO for which this value is needed.
-     * @param isOuterEdge Indicates whether the border width sought is on the
-     * outer edge.
      * @return The value of this property.
      */
     private int getKeywordValue(final FoContext context,
-            final RelativeCompass direction,
-            final FObj fobj, final boolean isOuterEdge) {
+            final RelativeCompass direction, final FObj fobj) {
         /* TODO: Implement this. */
         return 0;
     }

Modified: trunk/foray/foray-fotree/src/javatest/org/foray/fotree/AbstractPropertyTest.java
===================================================================
--- trunk/foray/foray-fotree/src/javatest/org/foray/fotree/AbstractPropertyTest.java	2007-07-05 20:36:42 UTC (rev 9926)
+++ trunk/foray/foray-fotree/src/javatest/org/foray/fotree/AbstractPropertyTest.java	2007-07-05 21:22:34 UTC (rev 9927)
@@ -64,6 +64,12 @@
         public int heightContainingBlock() {
             return 9 * 72000;
         }
+        public boolean isFirst() {
+            return false;
+        }
+        public boolean isLast() {
+            return false;
+        }
     };
 
     /**

Modified: trunk/foray/foray-fotree/src/javatest/org/foray/fotree/fo/prop/AbstractTestBorderWidth.java
===================================================================
--- trunk/foray/foray-fotree/src/javatest/org/foray/fotree/fo/prop/AbstractTestBorderWidth.java	2007-07-05 20:36:42 UTC (rev 9926)
+++ trunk/foray/foray-fotree/src/javatest/org/foray/fotree/fo/prop/AbstractTestBorderWidth.java	2007-07-05 21:22:34 UTC (rev 9927)
@@ -55,8 +55,7 @@
      */
     private int getPropertyValue(final AbstractBorderWidth property,
             final FObj testFobj) {
-        final int testLength = property.getValue(STD_FO_CONTEXT, testFobj,
-                false);
+        final int testLength = property.getValue(STD_FO_CONTEXT, testFobj);
         return testLength;
     }
 

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java	2007-07-05 20:36:42 UTC (rev 9926)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/OverrideGraftingContext.java	2007-07-05 21:22:34 UTC (rev 9927)
@@ -111,4 +111,18 @@
         return this.wrappedContext.heightContainingBlock();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public boolean isFirst() {
+        return this.wrappedContext.isFirst();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean isLast() {
+        return this.wrappedContext.isLast();
+    }
+
 }

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java	2007-07-05 20:36:42 UTC (rev 9926)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java	2007-07-05 21:22:34 UTC (rev 9927)
@@ -76,8 +76,8 @@
     public int getHeight(final FoContext context) {
         return areaContainer.crBpd()
                 + this.node.traitBorderSeparationBpd(context)
-                - (this.node.traitBorderBeforeWidth(context, true)
-                + this.node.traitBorderAfterWidth(context, true))
+                - (this.node.traitBorderBeforeWidth(context)
+                + this.node.traitBorderAfterWidth(context))
                 / 2;
     }
 


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: [9927] trunk/foray (Page 17)

Modular XSL-FO Implementation for Java.

foray-commit