From 515e983697f6a2e8f2683de9206ad17840071187 Mon Sep 17 00:00:00 2001
From: Glen Mazza <gmazza@apache.org>
Date: Wed, 13 Oct 2004 00:09:54 +0000
Subject: [PATCH] Endlich habe ich dem Insekt gefunden!  Jetzt kann FOText das
 Kind von FONode werden! ^u^

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198041 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/fop/fo/FOText.java     | 2 +-
 src/java/org/apache/fop/fo/flow/Block.java | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java
index 3ccc2a934..4bdc0c5b4 100644
--- a/src/java/org/apache/fop/fo/FOText.java
+++ b/src/java/org/apache/fop/fo/FOText.java
@@ -38,7 +38,7 @@ import org.apache.fop.layoutmgr.TextLayoutManager;
  * @author unascribed
  * @author <a href="mailto:mark-fop@inomial.com">Mark Lillywhite</a>
  */
-public class FOText extends FObj {
+public class FOText extends FONode {
 
     /**
      * the character array containing the text
diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java
index 203a916e7..034a7a685 100644
--- a/src/java/org/apache/fop/fo/flow/Block.java
+++ b/src/java/org/apache/fop/fo/flow/Block.java
@@ -29,9 +29,10 @@ import org.xml.sax.SAXParseException;
 // 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 @@ public class Block extends FObjMixed {
         // 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;
                 }
-- 
2.39.5