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

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

Revision: 9181
          http://svn.sourceforge.net/foray/?rev=9181&view=rev
Author:   victormote
Date:     2007-04-13 10:45:10 -0700 (Fri, 13 Apr 2007)

Log Message:
-----------
Conform to axsl changes removing the absolute traitBorder??Width methods in favor of their relative equivalents.

Modified Paths:
--------------
    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/BorderWidth.java
    trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.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-04-13 17:33:09 UTC (rev 9180)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/TableCellRA.java	2007-04-13 17:45:10 UTC (rev 9181)
@@ -238,10 +238,10 @@
         final TableCell tableCell = traitGeneratedBy();
         if (tableCell.traitBorderCollapse(this) == BorderModel.SEPARATE) {
             final int iSep = tableCell.traitBorderSeparationIPD(this);
-            return iSep / 2 + tableCell.traitBorderLeftWidth(this)
+            return iSep / 2 + tableCell.traitBorderStartWidth(this, true)
                                + tableCell.traitPaddingLeft(this);
         }
-        return tableCell.traitBorderLeftWidth(this) / 2
+        return tableCell.traitBorderStartWidth(this, true) / 2
                 + tableCell.traitPaddingLeft(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-04-13 17:33:09 UTC (rev 9180)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2007-04-13 17:45:10 UTC (rev 9181)
@@ -1896,38 +1896,6 @@
     /**
      * {@inheritDoc}
      */
-    public int traitBorderLeftWidth(final FoContext context) {
-        return propertyList.getBorderWidth(context, AbsoluteCompass.LEFT,
-                true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public int traitBorderRightWidth(final FoContext context) {
-        return propertyList.getBorderWidth(context, AbsoluteCompass.RIGHT,
-                true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public int traitBorderTopWidth(final FoContext context) {
-        return propertyList.getBorderWidth(context, AbsoluteCompass.TOP,
-                true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public int traitBorderBottomWidth(final FoContext context) {
-        return propertyList.getBorderWidth(context, AbsoluteCompass.BOTTOM,
-                true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public int traitPaddingBefore(final FoContext context,
             final boolean isFirst) {
         return propertyList.getPadding(context, RelativeCompass.BEFORE,

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2007-04-13 17:33:09 UTC (rev 9180)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2007-04-13 17:45:10 UTC (rev 9181)
@@ -2663,7 +2663,8 @@
      * width is computed "is-last" in the reference area.
      * @return The width, in millipoints, of the border.
      */
-    public int getBorderWidth(final FoContext context, final Compass direction,
+    public int getBorderWidth(final FoContext context,
+            final RelativeCompass direction,
             final boolean isOuterEdge) {
         // If the border-style is "none", the width is zero
         if (getBorderStyle(context, direction) == FoValue.NONE) {

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-04-13 17:33:09 UTC (rev 9180)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/BorderWidth.java	2007-04-13 17:45:10 UTC (rev 9181)
@@ -125,7 +125,8 @@
         return collection;
     }
 
-    public int getValue(final FoContext context, final Compass direction,
+    public int getValue(final FoContext context,
+            final RelativeCompass direction,
             final FObj fobj, final boolean isOuterEdge) {
         if (value() instanceof PropertyCollection) {
             return getCollectionValue(context, direction, fobj, isOuterEdge);
@@ -166,7 +167,7 @@
     }
 
     private int getCollectionValue(final FoContext context,
-            final Compass direction, final FObj fobj,
+            final RelativeCompass direction, final FObj fobj,
             final boolean isOuterEdge) {
         final PropertyCollection collection = (PropertyCollection) value();
         final int whichElement = collection.whichElementForDirectional(
@@ -178,7 +179,7 @@
     }
 
     private int getKeywordValue(final FoContext context,
-            final Compass direction,
+            final RelativeCompass direction,
             final FObj fobj, final boolean isOuterEdge) {
         final PropertyKeyword kw = (PropertyKeyword) value();
         switch (kw.getValue()) {
@@ -209,18 +210,6 @@
                 return effectiveParent.traitBorderEndWidth(context,
                         isOuterEdge);
             }
-            if (direction == AbsoluteCompass.LEFT) {
-                return effectiveParent.traitBorderLeftWidth(context);
-            }
-            if (direction == AbsoluteCompass.RIGHT) {
-                return effectiveParent.traitBorderRightWidth(context);
-            }
-            if (direction == AbsoluteCompass.TOP) {
-                return effectiveParent.traitBorderTopWidth(context);
-            }
-            if (direction == AbsoluteCompass.BOTTOM) {
-                return effectiveParent.traitBorderBottomWidth(context);
-            }
         }
         }
         return getValueNoInstance();

Modified: trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java
===================================================================
--- trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java	2007-04-13 17:33:09 UTC (rev 9180)
+++ trunk/foray/foray-pioneer/src/java/org/foray/pioneer/TableCellPL.java	2007-04-13 17:45:10 UTC (rev 9181)
@@ -76,8 +76,8 @@
     public int getHeight(final FoContext context) {
         return areaContainer.crBPD()
                 + this.node.traitBorderSeparationBPD(context)
-                - (this.node.traitBorderTopWidth(context)
-                + this.node.traitBorderBottomWidth(context))
+                - (this.node.traitBorderBeforeWidth(context, true)
+                + this.node.traitBorderAfterWidth(context, true))
                 / 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: [9181] trunk/foray (Page 11)

Modular XSL-FO Implementation for Java.

foray-commit