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

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

Revision: 7295
Author:   victormote
Date:     2006-05-29 08:51:15 -0700 (Mon, 29 May 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7295&view=rev

Log Message:
-----------
Conform to axsl changes regarding removal of line-height traits, using half-leading traits instead.

Modified Paths:
--------------
    trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.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-05-27 19:14:38 UTC (rev 7294)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObj.java	2006-05-29 15:51:15 UTC (rev 7295)
@@ -896,41 +896,6 @@
     /**
      * {@inheritDoc}
      */
-    public int traitLineHeightMin() {
-        return propertyList.traitLineHeight(Property.MINIMUM);
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    public int traitLineHeightOpt() {
-        return propertyList.traitLineHeight(Property.OPTIMUM);
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    public int traitLineHeightMax() {
-        return propertyList.traitLineHeight(Property.MAXIMUM);
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    public short traitLineHeightConditionality() {
-        return propertyList.traitLineHeightConditionality();
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
-    public int traitLineHeightPrecedence() {
-        return propertyList.traitLineHeightPrecedence();
-    }
-    
-    /**
-     * {@inheritDoc}
-     */
     public int traitEndIndent(int ipdContainingRA) {
         return propertyList.getIndent(Constants.DIRECTION_END,
                 ipdContainingRA);

Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java	2006-05-27 19:14:38 UTC (rev 7294)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java	2006-05-29 15:51:15 UTC (rev 7295)
@@ -224,7 +224,7 @@
     public static int getPrecedenceNoInstance(FObj fobj) {
         FObj parent = fobj.getFObjParent();
         if (parent != null) {
-            return parent.traitLineHeightPrecedence();
+            return parent.traitHalfLeadingPrecedence();
         }
         return DtSpace.PRECEDENCE_FORCE;
     }
@@ -240,7 +240,7 @@
     public static short getConditionalityNoInstance(FObj fobj) {
         FObj parent = fobj.getFObjParent();
         if (parent != null) {
-            return parent.traitLineHeightConditionality();
+            return parent.traitHalfLeadingConditionality();
         }
         return Constants.FOVAL_RETAIN;
     }


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