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

Revision: 8554
          http://svn.sourceforge.net/foray/?rev=8554&view=rev
Author:   victormote
Date:     2007-01-30 18:12:48 -0800 (Tue, 30 Jan 2007)

Log Message:
-----------
Conform to axsl changes for a new inner enumeration class.

Modified Paths:
--------------
    trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java
    trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java

Modified: trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java
===================================================================
--- trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java	2007-01-31 01:48:36 UTC (rev 8553)
+++ trunk/foray/foray-font/src/java/org/foray/font/FOrayFont.java	2007-01-31 02:12:48 UTC (rev 8554)
@@ -32,6 +32,7 @@
 import org.foray.font.format.Panose;
 
 import org.axsl.common.Baseline;
+import org.axsl.fontR.Font;
 
 import org.apache.commons.logging.Log;
 
@@ -378,7 +379,7 @@
      */
     public float normalLineHeightFactor(final int algorithm) {
         switch (algorithm) {
-        case LH_ALGORITHM_DEFAULT:
+        case Font.LineHeightAlgorithm.DEFAULT:
         default: {
             return FOrayFont.DEFAULT_LINE_HEIGHT_FACTOR;
         }

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	2007-01-31 01:48:36 UTC (rev 8553)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/prop/LineHeight.java	2007-01-31 02:12:48 UTC (rev 8554)
@@ -206,7 +206,7 @@
     public static float getValueMultiplierNoInstance(final FOContext context,
             final FObj fobj) {
         final FontUse fontUse = fobj.getPrimaryFont(context);
-        final int algorithm = Font.LH_ALGORITHM_DEFAULT;
+        final int algorithm = Font.LineHeightAlgorithm.DEFAULT;
         return fontUse.getFont().normalLineHeightFactor(algorithm);
     }
 


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