gmazza 2004/10/12 17:09:55
Modified: src/java/org/apache/fop/fo FOText.java
src/java/org/apache/fop/fo/flow Block.java
Log:
Endlich habe ich dem Insekt gefunden! Jetzt kann FOText das Kind von FONode werden!
^u^
Revision Changes Path
1.28 +1 -1 xml-fop/src/java/org/apache/fop/fo/FOText.java
Index: FOText.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOText.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- FOText.java 12 Oct 2004 05:07:46 -0000 1.27
+++ FOText.java 13 Oct 2004 00:09:54 -0000 1.28
@@ -38,7 +38,7 @@
* @author unascribed
* @author <a href="mailto:[EMAIL PROTECTED]">Mark Lillywhite</a>
*/
-public class FOText extends FObj {
+public class FOText extends FONode {
/**
* the character array containing the text
1.43 +4 -3 xml-fop/src/java/org/apache/fop/fo/flow/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/Block.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- Block.java 12 Oct 2004 05:07:46 -0000 1.42
+++ Block.java 13 Oct 2004 00:09:54 -0000 1.43
@@ -29,9 +29,10 @@
// FOP
import org.apache.fop.datatypes.ColorType;
import org.apache.fop.fo.CharIterator;
-import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FObjMixed;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.FOText;
import org.apache.fop.fo.PropertySets;
import org.apache.fop.fo.RecursiveCharIterator;
import org.apache.fop.layoutmgr.BlockLayoutManager;
@@ -170,8 +171,8 @@
// Handle whitespace based on values of properties
// Handle a sequence of inline-producing child nodes in
// one pass
- if (child instanceof FObj && ("fo:text".equals(child.getName())
- || PropertySets.generatesInlineAreas(child.getNameId()))) {
+ if (child instanceof FOText
+ || PropertySets.generatesInlineAreas(child.getNameId())) {
if (firstInlineChild == null) {
firstInlineChild = child;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
