klease 02/02/25 13:28:01 Modified: src/org/apache/fop/fo FONode.java InlineCharIterator.java src/org/apache/fop/fo/flow Block.java Log: Use CharUtilities instead of CharClass Revision Changes Path 1.25 +3 -2 xml-fop/src/org/apache/fop/fo/FONode.java Index: FONode.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- FONode.java 21 Nov 2001 22:13:36 -0000 1.24 +++ FONode.java 25 Feb 2002 21:28:01 -0000 1.25 @@ -1,5 +1,5 @@ /* - * $Id: FONode.java,v 1.24 2001/11/21 22:13:36 klease Exp $ + * $Id: FONode.java,v 1.25 2002/02/25 21:28:01 klease Exp $ * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. * For details on use and redistribution please refer to the * LICENSE file included with these sources. @@ -11,6 +11,7 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.apps.StreamRenderer; import org.apache.fop.layout.Area; +import org.apache.fop.util.CharUtilities; import org.apache.log.Logger; @@ -121,7 +122,7 @@ } public CharIterator charIterator() { - return new OneCharIterator(CharClass.CODE_EOT); + return new OneCharIterator(CharUtilities.CODE_EOT); } } 1.2 +3 -2 xml-fop/src/org/apache/fop/fo/InlineCharIterator.java Index: InlineCharIterator.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/InlineCharIterator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- InlineCharIterator.java 21 Nov 2001 22:13:36 -0000 1.1 +++ InlineCharIterator.java 25 Feb 2002 21:28:01 -0000 1.2 @@ -1,6 +1,7 @@ package org.apache.fop.fo; import org.apache.fop.layout.BorderAndPadding; +import org.apache.fop.util.CharUtilities; import java.util.Iterator; import java.util.ListIterator; import java.util.NoSuchElementException; @@ -36,7 +37,7 @@ public char nextChar() throws NoSuchElementException { if (bStartBoundary) { bStartBoundary=false; - return CharClass.CODE_EOT; + return CharUtilities.CODE_EOT; } try { return super.nextChar(); @@ -46,7 +47,7 @@ // Check end boundary char if (bEndBoundary) { bEndBoundary=false; - return CharClass.CODE_EOT; + return CharUtilities.CODE_EOT; } else throw e; } 1.49 +10 -8 xml-fop/src/org/apache/fop/fo/flow/Block.java Index: Block.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/flow/Block.java,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- Block.java 21 Nov 2001 22:13:36 -0000 1.48 +++ Block.java 25 Feb 2002 21:28:01 -0000 1.49 @@ -1,5 +1,5 @@ /* - * $Id: Block.java,v 1.48 2001/11/21 22:13:36 klease Exp $ + * $Id: Block.java,v 1.49 2002/02/25 21:28:01 klease Exp $ * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. * For details on use and redistribution please refer to the * LICENSE file included with these sources. @@ -15,6 +15,7 @@ import org.apache.fop.apps.FOPException; import org.apache.fop.layoutmgr.LayoutManager; import org.apache.fop.layoutmgr.BlockLayoutManager; +import org.apache.fop.util.CharUtilities; import org.xml.sax.Attributes; @@ -406,8 +407,8 @@ LFchecker lfCheck = new LFchecker(charIter); while (charIter.hasNext()) { - switch (CharClass.classOf(charIter.nextChar())) { - case CharClass.XMLWHITESPACE: + switch (CharUtilities.classOf(charIter.nextChar())) { + case CharUtilities.XMLWHITESPACE: /* Some kind of whitespace character, except linefeed. */ boolean bIgnore=false; @@ -440,7 +441,7 @@ } break; - case CharClass.LINEFEED: + case CharUtilities.LINEFEED: /* A linefeed */ lfCheck.reset(); bPrevWasLF=true; // for following whitespace @@ -468,14 +469,14 @@ } break; - case CharClass.EOT: + case CharUtilities.EOT: // A "boundary" objects such as non-character inline // or nested block object was encountered. // If any whitespace run in progress, finish it. // FALL THROUGH - case CharClass.UCWHITESPACE: // Non XML-whitespace - case CharClass.NONWHITESPACE: + case CharUtilities.UCWHITESPACE: // Non XML-whitespace + case CharUtilities.NONWHITESPACE: /* Any other character */ bInWS = bPrevWasLF=false; lfCheck.reset(); @@ -503,7 +504,8 @@ bNextIsLF=true; break; } - else if (CharClass.classOf(c)!=CharClass.XMLWHITESPACE) { + else if (CharUtilities.classOf(c) != + CharUtilities.XMLWHITESPACE) { break; } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]