Merged branch https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/inlineblock back into Trunk.

Revisions: 227462 to HEAD (231261)

This adds support for block-level content inside fo:inline.

The full set of changes on the branch can be extracted by:
svn log http://svn.apache.org/repos/asf/xmlgraphics/fop/branches/inlineblock -r 227462:231261

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@232250 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 61 insertions, 0 deletions

diff --git a/src/java/org/apache/fop/fo/NullCharIterator.java b/src/java/org/apache/fop/fo/NullCharIterator.java
new file mode 100644
index 000000000..01c054c45
--- /dev/null
+++ b/src/java/org/apache/fop/fo/NullCharIterator.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2005 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.fo;
+
+import java.util.NoSuchElementException;
+
+/**
+ * Class providing an iterator for zero characters. Used by the Block FO.
+ */
+public class NullCharIterator extends CharIterator {
+
+    private static CharIterator instance;
+    
+    public static CharIterator getInstance() {
+        if (instance == null) {
+            instance = new NullCharIterator();
+        }
+        return instance;
+    }
+
+    /**
+     * Constructor
+     */
+    public NullCharIterator() {
+        //nop
+    }
+
+    /** @see java.util.Iterator#hasNext() */
+    public boolean hasNext() {
+        return false;
+    }
+
+    /** @see org.apache.fop.fo.CharIterator#nextChar() */
+    public char nextChar() throws NoSuchElementException {
+        throw new NoSuchElementException();
+    }
+
+}
+
diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java
index 50f04a28e..f5d8ceb05 100644
--- a/src/java/org/apache/fop/fo/flow/Block.java
+++ b/src/java/org/apache/fop/fo/flow/Block.java
@@ -29,6 +29,7 @@ import org.apache.fop.fo.Constants;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOText;
 import org.apache.fop.fo.FObjMixed;
+import org.apache.fop.fo.NullCharIterator;
 import org.apache.fop.fo.PropertyList;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.RecursiveCharIterator;
@@ -507,6 +508,11 @@ public class Block extends FObjMixed {
         }
     }
      
+    /** @see org.apache.fop.fo.FONode#charIterator() */
+    public CharIterator charIterator() {
+        return NullCharIterator.getInstance();
+    }
+
     /**
      * @see org.apache.fop.fo.FONode#getName()
      */