Re: svn commit: r264863 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java

[Finn Bock]

[EMAIL PROTECTED] wrote:

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java
URL: 
http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java?rev=264863&r1=264862&r2=264863&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/FOText.java Tue Aug 30 
14:09:41 2005
@@ -24,11 +24,13 @@
 // FOP
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
+import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.flow.Block;
 import org.apache.fop.fo.pagination.Root;
 import org.apache.fop.fo.properties.CommonFont;
 import org.apache.fop.fo.properties.CommonHyphenation;
 import org.apache.fop.fo.properties.CommonTextDecoration;
+import org.apache.fop.fo.properties.EnumLength;
 import org.apache.fop.fo.properties.Property;
 import org.apache.fop.fo.properties.SpaceProperty;
 
@@ -83,6 +85,7 @@
     private int textTransform;
     private Property wordSpacing;
     private int wrapOption;
+    private EnumLength baselineShift;

That is wrong, EnumLength is an implementation detail which must never 
be used in the fo tree code. Always use Length for properties that is 
defined as <length>.

     // End of property values
 
     /**
@@ -161,6 +164,7 @@
         wordSpacing = pList.get(Constants.PR_WORD_SPACING);
         wrapOption = pList.get(Constants.PR_WRAP_OPTION).getEnum();
         textDecoration = pList.getTextDecorationProps();
+        baselineShift = (EnumLength) pList.get(Constants.PR_BASELINE_SHIFT);

Don't use cast, but call the coerce methods pList.get(XXX).getLength();

I have already committed the fix for this.

regards,
finn