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

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

Revision: 7890
          http://svn.sourceforge.net/foray/?rev=7890&view=rev
Author:   victormote
Date:     2006-09-04 15:42:36 -0700 (Mon, 04 Sep 2006)

Log Message:
-----------
Conform to axsl changes: Remove unneeded method.

Modified Paths:
--------------
    trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java

Modified: trunk/foray/foray-areatree/src/java/org/foray/area/Area.java
===================================================================
--- trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-09-04 22:01:46 UTC (rev 7889)
+++ trunk/foray/foray-areatree/src/java/org/foray/area/Area.java	2006-09-04 22:42:36 UTC (rev 7890)
@@ -340,7 +340,8 @@
         // Start at the padding-rectangle origin.
         int x = prOriginX();
         if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
-            final boolean goingRight = (this.traitIPDirection()
+            // Our BP Axis is vertical
+            final boolean goingRight = (this.traitIPDirectionOdd()
                     == Constants.DIRECTION_LEFT_TO_RIGHT);
             if (goingRight) {
                 x -= this.traitBorderStartWidth();
@@ -369,6 +370,7 @@
         // Start at the padding-rectangle origin.
         int y = prOriginY();
         if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
+            // Our BP Axis is vertical
             final boolean goingDown = (this.traitBPDirection()
                     == Constants.DIRECTION_TOP_TO_BOTTOM);
             if (goingDown) {
@@ -378,7 +380,7 @@
             }
         } else {
             // Our BP Axis is horizontal
-            final boolean goingUp = (this.traitIPDirection()
+            final boolean goingUp = (this.traitIPDirectionOdd()
                     == Constants.DIRECTION_BOTTOM_TO_TOP);
             if (goingUp) {
                 y -= this.traitBorderStartWidth();
@@ -438,7 +440,8 @@
         // Start at the content-rectangle origin.
         int x = crOriginX();
         if (this.getBPAxis() == Constants.AXIS_VERTICAL) {
-            final boolean goingRight = (this.traitIPDirection()
+            // Our BP Axis is vertical
+            final boolean goingRight = (this.traitIPDirectionOdd()
                     == Constants.DIRECTION_LEFT_TO_RIGHT);
             if (goingRight) {
                 x -= this.traitPaddingStart();
@@ -778,14 +781,18 @@
         return traitGeneratedBy().traitSpaceEndOptimum(this, ancestor.crIPD());
     }
 
-    public int traitBPDirection() {
+    public byte traitBPDirection() {
         return traitGeneratedBy().traitBPDirection(this);
     }
 
-    public int traitIPDirection() {
-        return traitGeneratedBy().traitIPDirection(this);
+    public byte traitIPDirectionOdd() {
+        return traitGeneratedBy().traitIPDirectionOdd(this);
     }
 
+    public byte traitIPDirectionEven() {
+        return traitGeneratedBy().traitIPDirectionEven(this);
+    }
+
     private int nearestBaseBPD() {
         int nearestBPD = -1;
         final Area nearest = this.ancestorGeneratedByBlockLevelFO();

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-09-04 22:01:46 UTC (rev 7889)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-09-04 22:42:36 UTC (rev 7890)
@@ -1647,13 +1647,6 @@
     /**
      * {@inheritDoc}
      */
-    public byte traitIPDirection(final FOContext context) {
-        return propertyList.traitIPDirection(context);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
     public byte traitBPDirection(final FOContext context) {
         return propertyList.traitBPDirection(context);
     }

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-09-04 22:01:46 UTC (rev 7889)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/PropertyList.java	2006-09-04 22:42:36 UTC (rev 7890)
@@ -2150,15 +2150,6 @@
      * DIRECTION_LEFT_TO_RIGHT, or DIRECTION_RIGHT_TO_LEFT, depending on
      * the writing-mode.
      */
-    public byte traitIPDirection(final FOContext context) {
-        return getWritingMode(context).getIPDirectionOdd();
-    }
-
-    /**
-     * @return One of DIRECTION_TOP_TO_BOTTOM, DIRECTION_BOTTOM_TO_TOP,
-     * DIRECTION_LEFT_TO_RIGHT, or DIRECTION_RIGHT_TO_LEFT, depending on
-     * the writing-mode.
-     */
     public byte traitBPDirection(final FOContext context) {
         return getWritingMode(context).getBPDirection();
     }


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