Adjust for no-children content model.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@195531 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/org/apache/fop/fo/flow/FoCharacter.java b/src/org/apache/fop/fo/flow/FoCharacter.java
index 848a95ce605d73ec40f150ac325299df35606c8b..84d6198b198f7ac03cc5f5dd61ae55645cf40444 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoCharacter.java
+++ b/src/org/apache/fop/fo/flow/FoCharacter.java
@@ -101,21 +101,20 @@ public class FoCharacter extends FONode {
     }
 
     /**
+     * Construct an fo:character node.  This node has no children.
      * @param foTree the FO tree being built
      * @param parent the parent FONode of this node
      * @param event the <tt>FoXMLEvent</tt> that triggered the creation of
      * this node
-     * @param attrSet the index of the attribute set applying to the node.
+     * @param stateFlags - passed down from the parent.  Includes the
+     * attribute set information.
      */
     public FoCharacter
-                (FOTree foTree, FONode parent, FoXMLEvent event, int attrSet)
+            (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.CHARACTER, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices);
-        FoXMLEvent ev;
-        String nowProcessing;
-
+                          stateFlags, sparsePropsMap, sparseIndices);
         makeSparsePropsSet();
     }
 

diff --git a/src/org/apache/fop/fo/flow/FoExternalGraphic.java b/src/org/apache/fop/fo/flow/FoExternalGraphic.java
index d2884c2590e956b4e58c693603c7009112b71bd3..fa0df3121cfbd1fb7906ece973a620108296921a 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoExternalGraphic.java
+++ b/src/org/apache/fop/fo/flow/FoExternalGraphic.java
@@ -99,21 +99,20 @@ public class FoExternalGraphic extends FONode {
     }
 
     /**
+     * Construct an fo:external-graphic node.  This node has no children.
      * @param foTree the FO tree being built
      * @param parent the parent FONode of this node
      * @param event the <tt>FoXMLEvent</tt> that triggered the creation of
      * this node
-     * @param attrSet the index of the attribute set applying to the node.
+     * @param stateFlags - passed down from the parent.  Includes the
+     * attribute set information.
      */
     public FoExternalGraphic
-                (FOTree foTree, FONode parent, FoXMLEvent event, int attrSet)
+            (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.EXTERNAL_GRAPHIC, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices);
-        FoXMLEvent ev;
-        String nowProcessing;
-
+                          stateFlags, sparsePropsMap, sparseIndices);
         makeSparsePropsSet();
     }
 

diff --git a/src/org/apache/fop/fo/flow/FoInitialPropertySet.java b/src/org/apache/fop/fo/flow/FoInitialPropertySet.java
index 6549894c56f39b0b2e5cc9a46ecd78dffccf44ba..a43e866d70948b2736d04ac2340807847c2fcf58 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoInitialPropertySet.java
+++ b/src/org/apache/fop/fo/flow/FoInitialPropertySet.java
@@ -86,21 +86,20 @@ public class FoInitialPropertySet extends FONode {
     }
 
     /**
+     * Construct an fo:initial-property-set node.  This node has no children.
      * @param foTree the FO tree being built
      * @param parent the parent FONode of this node
      * @param event the <tt>FoXMLEvent</tt> that triggered the creation of
      * this node
-     * @param attrSet the index of the attribute set applying to the node.
+     * @param stateFlags - passed down from the parent.  Includes the
+     * attribute set information.
      */
     public FoInitialPropertySet
-                (FOTree foTree, FONode parent, FoXMLEvent event, int attrSet)
+            (FOTree foTree, FONode parent, FoXMLEvent event, int stateFlags)
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.INITIAL_PROPERTY_SET, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices);
-        FoXMLEvent ev;
-        String nowProcessing;
-
+                          stateFlags, sparsePropsMap, sparseIndices);
         makeSparsePropsSet();
     }