Attribute set constants moved from FOPropertySets to FONode.

numProps arg to FONode constructor removed.

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

diff --git a/src/org/apache/fop/fo/flow/FoBasicLink.java b/src/org/apache/fop/fo/flow/FoBasicLink.java
index cd7ad3309ecb797b43b6c7a32ca06a25b743439e..86fb6a3caa30ca2ef1ebf085b72614b9b300dde4 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoBasicLink.java
+++ b/src/org/apache/fop/fo/flow/FoBasicLink.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -106,7 +105,7 @@ public class FoBasicLink extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.BASIC_LINK, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoBidiOverride.java b/src/org/apache/fop/fo/flow/FoBidiOverride.java
index aeefbbc092506d8f525922711e1fa187e8fb5f93..2e7f37cfefcafbaad350b34a27898d830b596a7f 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoBidiOverride.java
+++ b/src/org/apache/fop/fo/flow/FoBidiOverride.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -93,7 +92,7 @@ public class FoBidiOverride extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.BIDI_OVERRIDE, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoBlock.java b/src/org/apache/fop/fo/flow/FoBlock.java
index 8410f2abdcd0bcd30ee1d8b8212793e01fe45331..972ece2286344dde2ab2067dc2d519c36aa738a3 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoBlock.java
+++ b/src/org/apache/fop/fo/flow/FoBlock.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -51,6 +50,7 @@ public class FoBlock extends FONode {
 
     static {
         // Collect the sets of properties that apply
+        System.out.println("In static block of FoBlock.");
         BitSet propsets = new BitSet();
         propsets.or(PropertySets.accessibilitySet);
         propsets.or(PropertySets.auralSet);
@@ -105,6 +105,7 @@ public class FoBlock extends FONode {
             sparsePropsMap.put
                         (Ints.consts.get(next), Ints.consts.get(propx++));
         }
+        System.out.println("End of static block of FoBlock.");
     }
 
     /**
@@ -119,7 +120,8 @@ public class FoBlock extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.BLOCK, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
+        System.out.println("Back from super constructor of FoBlock.");
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoBlockContainer.java b/src/org/apache/fop/fo/flow/FoBlockContainer.java
index c04d07710ef9883640f4052b6e1d09c5333a4474..c3324816eee59ff8d392627d20a3721eb3e07f47 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoBlockContainer.java
+++ b/src/org/apache/fop/fo/flow/FoBlockContainer.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -105,7 +104,7 @@ public class FoBlockContainer extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.BLOCK_CONTAINER, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoCharacter.java b/src/org/apache/fop/fo/flow/FoCharacter.java
index 0cfc5358a2fcde237e330776680c804be1cfa101..848a95ce605d73ec40f150ac325299df35606c8b 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoCharacter.java
+++ b/src/org/apache/fop/fo/flow/FoCharacter.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -113,7 +112,7 @@ public class FoCharacter extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.CHARACTER, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoExternalGraphic.java b/src/org/apache/fop/fo/flow/FoExternalGraphic.java
index 8de06b8dfdb1f1ca23f37e9ea269358a07e71e31..d2884c2590e956b4e58c693603c7009112b71bd3 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoExternalGraphic.java
+++ b/src/org/apache/fop/fo/flow/FoExternalGraphic.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -111,7 +110,7 @@ public class FoExternalGraphic extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.EXTERNAL_GRAPHIC, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoFloat.java b/src/org/apache/fop/fo/flow/FoFloat.java
index c49041d30e934d3d3217dfe22e48c4accaa985f5..dcd0a74598ca24a81441cc08cce1932a840a578a 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoFloat.java
+++ b/src/org/apache/fop/fo/flow/FoFloat.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -84,7 +83,7 @@ public class FoFloat extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.FLOAT, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoFlow.java b/src/org/apache/fop/fo/flow/FoFlow.java
index 047e67059d9544fc183d0623cc48b2384e5e0723..3d6e3c891f2c3d63ecab459de5688219614d43d6 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoFlow.java
+++ b/src/org/apache/fop/fo/flow/FoFlow.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FObjects;
@@ -79,8 +78,7 @@ public class FoFlow extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.FLOW, parent, event,
-              FOPropertySets.FLOW_SET, sparsePropsMap, sparseIndices,
-              numProps);
+              FONode.FLOW_SET, sparsePropsMap, sparseIndices);
         xmlevents = foTree.getXmlevents();
         FoXMLEvent ev;
         try {
@@ -90,7 +88,9 @@ public class FoFlow extends FONode {
             // Generate the flow object
             System.out.println("Generating first block for flow.");
             FObjects.fobjects.makeFlowObject
-                            (foTree, this, ev, FOPropertySets.FLOW_SET);
+                            (foTree, this, ev, FONode.FLOW_SET);
+            // Clear the blockage
+            ev = xmlevents.getEndElement(ev);
             // Get the rest of the %block;s
             do {
                 ev = xmlevents.expectBlock();
@@ -99,7 +99,8 @@ public class FoFlow extends FONode {
                     System.out.println
                         ("Generating subsequent block for flow.");
                     FObjects.fobjects.makeFlowObject
-                            (foTree, this, ev, FOPropertySets.FLOW_SET);
+                            (foTree, this, ev, FONode.FLOW_SET);
+                    ev = xmlevents.getEndElement(ev);
                 }
             } while (ev != null);
         } catch(UnexpectedStartElementException e) {

diff --git a/src/org/apache/fop/fo/flow/FoFootnote.java b/src/org/apache/fop/fo/flow/FoFootnote.java
index 083fa507a33423937e16eaadaa0a3b378eec5bee..830b15944f6f019ed6ce753e84366ec15c352a98 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoFootnote.java
+++ b/src/org/apache/fop/fo/flow/FoFootnote.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -83,7 +82,7 @@ public class FoFootnote extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.FOOTNOTE, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoFootnoteBody.java b/src/org/apache/fop/fo/flow/FoFootnoteBody.java
index 3b98fdeef2788ce4f46eb8fb5ef0612a8f2ea6c2..2bc8f8319cd458a29784a3d65bc56e63e9aecaa6 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoFootnoteBody.java
+++ b/src/org/apache/fop/fo/flow/FoFootnoteBody.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -83,7 +82,7 @@ public class FoFootnoteBody extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.FOOTNOTE_BODY, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoInitialPropertySet.java b/src/org/apache/fop/fo/flow/FoInitialPropertySet.java
index b83cec481cfdd1d3331ae68e220195e77ffe24a0..6549894c56f39b0b2e5cc9a46ecd78dffccf44ba 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoInitialPropertySet.java
+++ b/src/org/apache/fop/fo/flow/FoInitialPropertySet.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -98,7 +97,7 @@ public class FoInitialPropertySet extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.INITIAL_PROPERTY_SET, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoInline.java b/src/org/apache/fop/fo/flow/FoInline.java
index 218fa806a22dfcb267371388172be2351f1c45b3..db2954ba89a080cbf7bda41bb610d80294fb822a 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoInline.java
+++ b/src/org/apache/fop/fo/flow/FoInline.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -108,7 +107,7 @@ public class FoInline extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.INLINE, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoInlineContainer.java b/src/org/apache/fop/fo/flow/FoInlineContainer.java
index 5e7bd81eac8eac86a0e84652faf9e93d2206b50d..9755bd45310d9920dd29d946029c3eaa84cfcf7f 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoInlineContainer.java
+++ b/src/org/apache/fop/fo/flow/FoInlineContainer.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -105,7 +104,7 @@ public class FoInlineContainer extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.INLINE_CONTAINER, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java b/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java
index 44971d23ea478774d50ffbab2daefc90fb21e4f8..caab0983d2e0a23ab3edfaa56ebf7e9a4d0b1f0b 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java
+++ b/src/org/apache/fop/fo/flow/FoInstreamForeignObject.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -110,7 +109,7 @@ public class FoInstreamForeignObject extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.INSTREAM_FOREIGN_OBJECT, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoLeader.java b/src/org/apache/fop/fo/flow/FoLeader.java
index 62f03e9b1fce468f770963d85b28110a8b1d3aeb..a119aabb0ef53dff4751c5fb359aa9d7f1a17bb9 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoLeader.java
+++ b/src/org/apache/fop/fo/flow/FoLeader.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -111,7 +110,7 @@ public class FoLeader extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.LEADER, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoListBlock.java b/src/org/apache/fop/fo/flow/FoListBlock.java
index 74083a33e3c0ff200dc6d806330b7ccfd7d98f0b..2475b4677f9de5b3e2c624cd91846f3b3703a9f3 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoListBlock.java
+++ b/src/org/apache/fop/fo/flow/FoListBlock.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -98,7 +97,7 @@ public class FoListBlock extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.LIST_BLOCK, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoListItem.java b/src/org/apache/fop/fo/flow/FoListItem.java
index 7777e74d5cc818f73d3094ff045e91be8111d595..7f46bed55de22d1d90eec9ddf74b6d539d33ef66 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoListItem.java
+++ b/src/org/apache/fop/fo/flow/FoListItem.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -97,7 +96,7 @@ public class FoListItem extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.LIST_ITEM, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoListItemBody.java b/src/org/apache/fop/fo/flow/FoListItemBody.java
index 88bb1d58abdbb5500aa19916cc27936aea5b230b..0a476acf646717cdbf8d71cae2328860da853101 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoListItemBody.java
+++ b/src/org/apache/fop/fo/flow/FoListItemBody.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -85,7 +84,7 @@ public class FoListItemBody extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.LIST_ITEM_BODY, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoListItemLabel.java b/src/org/apache/fop/fo/flow/FoListItemLabel.java
index 5e0f7be97a34bf0a79d91ce4b19e56984375b5b6..4895647fd88f78ddd5933dd5eb3b5e410aa7f7f2 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoListItemLabel.java
+++ b/src/org/apache/fop/fo/flow/FoListItemLabel.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -85,7 +84,7 @@ public class FoListItemLabel extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.LIST_ITEM_LABEL, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoMarker.java b/src/org/apache/fop/fo/flow/FoMarker.java
index 4359de50ccac120d098d4d4ead2ef8da701b8e64..70e72129d7b2ab9202a61a7fec621e80721c0fab 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoMarker.java
+++ b/src/org/apache/fop/fo/flow/FoMarker.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -76,7 +75,7 @@ public class FoMarker extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.MARKER, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoMultiCase.java b/src/org/apache/fop/fo/flow/FoMultiCase.java
index 55d2044362aa57f699d90b28e0687bfd4eaf1e24..398338dadde02b8b9d4d6685362b68184f20eab6 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoMultiCase.java
+++ b/src/org/apache/fop/fo/flow/FoMultiCase.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -87,7 +86,7 @@ public class FoMultiCase extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.MULTI_CASE, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoMultiProperties.java b/src/org/apache/fop/fo/flow/FoMultiProperties.java
index 7482104b071ab5b673eb5995c6697400cf0c4ad3..6e83e535b20a195f583a2ea6a66d600765dd5ca7 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoMultiProperties.java
+++ b/src/org/apache/fop/fo/flow/FoMultiProperties.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -84,7 +83,7 @@ public class FoMultiProperties extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.MULTI_PROPERTIES, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoMultiPropertySet.java b/src/org/apache/fop/fo/flow/FoMultiPropertySet.java
index 6c7ac8a18bf3256270c6a6d663db21f9a172a5f7..ba22df820d70f0a894a019aedcb2e7d50a3b075d 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoMultiPropertySet.java
+++ b/src/org/apache/fop/fo/flow/FoMultiPropertySet.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -84,7 +83,7 @@ public class FoMultiPropertySet extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.MULTI_PROPERTY_SET, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoMultiSwitch.java b/src/org/apache/fop/fo/flow/FoMultiSwitch.java
index 8e37ca87efdfdf3f816bd79c6b7a13f28640540c..1f65ab20f65f4b386662c394225f73dad2b8a655 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoMultiSwitch.java
+++ b/src/org/apache/fop/fo/flow/FoMultiSwitch.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -85,7 +84,7 @@ public class FoMultiSwitch extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.MULTI_SWITCH, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoMultiToggle.java b/src/org/apache/fop/fo/flow/FoMultiToggle.java
index 857477d220ede6ab59cf0dacb7ec46519cbe83af..5e88b4e8a1a0a121c7cace1a2d5d08f9cbf9fb66 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoMultiToggle.java
+++ b/src/org/apache/fop/fo/flow/FoMultiToggle.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -85,7 +84,7 @@ public class FoMultiToggle extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.MULTI_TOGGLE, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoNoFo.java b/src/org/apache/fop/fo/flow/FoNoFo.java
index 29541fb0fa3ab67e7ffb5f1a8144a3f28e2b481f..8b95cd12f82ce1f0099d8bc6179dfda3438e4c92 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoNoFo.java
+++ b/src/org/apache/fop/fo/flow/FoNoFo.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -76,7 +75,7 @@ public class FoNoFo extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.NO_FO, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoPageNumber.java b/src/org/apache/fop/fo/flow/FoPageNumber.java
index 58f71e93bb28bba17d9a059abb45c30539e1d8ec..e11a28c2752803028e42f76680b707f7db489f79 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoPageNumber.java
+++ b/src/org/apache/fop/fo/flow/FoPageNumber.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -109,7 +108,7 @@ public class FoPageNumber extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.PAGE_NUMBER, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoPageNumberCitation.java b/src/org/apache/fop/fo/flow/FoPageNumberCitation.java
index 9a2527ebac1ff277860f49f544bb09419c8ff973..a4e912e07405a3712bdf2e53960177905866cfdb 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoPageNumberCitation.java
+++ b/src/org/apache/fop/fo/flow/FoPageNumberCitation.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -110,7 +109,7 @@ public class FoPageNumberCitation extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.PAGE_NUMBER_CITATION, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoPageSequence.java b/src/org/apache/fop/fo/flow/FoPageSequence.java
index 6d77526820c9b1d0ac8614b76ff282b08c4c1d12..b7fbfe4d39873ab00428ae6c99c05d41ee9f39cc 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoPageSequence.java
+++ b/src/org/apache/fop/fo/flow/FoPageSequence.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -99,8 +98,7 @@ public class FoPageSequence extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.PAGE_SEQUENCE, parent, event,
-              FOPropertySets.PAGESEQ_SET, sparsePropsMap, sparseIndices,
-              numProps);
+              FONode.PAGESEQ_SET, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
         // Look for optional title

diff --git a/src/org/apache/fop/fo/flow/FoPcdata.java b/src/org/apache/fop/fo/flow/FoPcdata.java
index c47b7a30a85cff6ff838c3bce2ecd90f7eae36df..bd91c5de97b611e0ca236cc26caa27540dac30e7 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoPcdata.java
+++ b/src/org/apache/fop/fo/flow/FoPcdata.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -116,7 +115,7 @@ public class FoPcdata extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.PCDATA, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         characters = event.getChars();
         FoXMLEvent ev;
         String nowProcessing;

diff --git a/src/org/apache/fop/fo/flow/FoRetrieveMarker.java b/src/org/apache/fop/fo/flow/FoRetrieveMarker.java
index 21c14ceac2e344114b4da3b1c05972a0fa978d44..4909f72febd6b0ad4cdba6b284ad339f67b17f69 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoRetrieveMarker.java
+++ b/src/org/apache/fop/fo/flow/FoRetrieveMarker.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -85,7 +84,7 @@ public class FoRetrieveMarker extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.RETRIEVE_MARKER, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoStaticContent.java b/src/org/apache/fop/fo/flow/FoStaticContent.java
index 91f813a23a09844015925d6a7ae2147b993a362e..776ccb9ff244de854c5d162b85458b6e4abe9582 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoStaticContent.java
+++ b/src/org/apache/fop/fo/flow/FoStaticContent.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FObjects;
@@ -80,8 +79,7 @@ public class FoStaticContent extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.STATIC_CONTENT, parent, event,
-              FOPropertySets.STATIC_SET, sparsePropsMap, sparseIndices,
-              numProps);
+              FONode.STATIC_SET, sparsePropsMap, sparseIndices);
         xmlevents = foTree.getXmlevents();
         FoXMLEvent ev;
         try {
@@ -92,7 +90,9 @@ public class FoStaticContent extends FONode {
             // Generate the flow object
             System.out.println("Generating first block for static-content.");
             FObjects.fobjects.makeFlowObject
-                            (foTree, this, ev, FOPropertySets.STATIC_SET);
+                            (foTree, this, ev, FONode.STATIC_SET);
+            // Clear the blockage
+            ev = xmlevents.getEndElement(ev);
             // Get the rest of the %block;s
             do {
                 ev = xmlevents.expectBlock();
@@ -101,7 +101,8 @@ public class FoStaticContent extends FONode {
                     System.out.println
                         ("Generating subsequent block for static-content.");
                     FObjects.fobjects.makeFlowObject
-                            (foTree, this, ev, FOPropertySets.STATIC_SET);
+                            (foTree, this, ev, FONode.STATIC_SET);
+                    ev = xmlevents.getEndElement(ev);
                 }
             } while (ev != null);
         } catch(UnexpectedStartElementException e) {

diff --git a/src/org/apache/fop/fo/flow/FoTable.java b/src/org/apache/fop/fo/flow/FoTable.java
index a37907e580e6b97eb76934a659b663bcfbcd26a1..7cd22dddca33fafb4ad5614c9c1f3f55d8616621 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTable.java
+++ b/src/org/apache/fop/fo/flow/FoTable.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -110,7 +109,7 @@ public class FoTable extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.TABLE, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoTableAndCaption.java b/src/org/apache/fop/fo/flow/FoTableAndCaption.java
index 822e6b036755916b0cb0f0bfe3b8386a43940020..46e4cbca8feb0a8da88189605d55e18f1ab47b1e 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableAndCaption.java
+++ b/src/org/apache/fop/fo/flow/FoTableAndCaption.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -98,7 +97,7 @@ public class FoTableAndCaption extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.TABLE_AND_CAPTION, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoTableBody.java b/src/org/apache/fop/fo/flow/FoTableBody.java
index 76a58125cafa572e5d420692ff40a6ddba839f81..f6451460faf0b1f3f1be7abb1fed5337912db50e 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableBody.java
+++ b/src/org/apache/fop/fo/flow/FoTableBody.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -93,7 +92,7 @@ public class FoTableBody extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.TABLE_BODY, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoTableCaption.java b/src/org/apache/fop/fo/flow/FoTableCaption.java
index fd3b551b8407cbdf996ec5e30512c00c80e3b7c9..ea71b14e34e781a2f3779ea9189e347db889cce3 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableCaption.java
+++ b/src/org/apache/fop/fo/flow/FoTableCaption.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -95,7 +94,7 @@ public class FoTableCaption extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.TABLE_CAPTION, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoTableCell.java b/src/org/apache/fop/fo/flow/FoTableCell.java
index 7dd1b04e062c55856b8c9b7aedc085370ed5cdbb..e45c419036d855ec6811ac7cf02e8ae52a5a5358 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableCell.java
+++ b/src/org/apache/fop/fo/flow/FoTableCell.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -105,7 +104,7 @@ public class FoTableCell extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.TABLE_CELL, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoTableColumn.java b/src/org/apache/fop/fo/flow/FoTableColumn.java
index 760c16434a4fb05d7a8a151ff4a6d34d24520e0f..54ff4dd8dac9da50c3e6e11d9174df7a00a6151f 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableColumn.java
+++ b/src/org/apache/fop/fo/flow/FoTableColumn.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -93,7 +92,7 @@ public class FoTableColumn extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.TABLE_COLUMN, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoTableFooter.java b/src/org/apache/fop/fo/flow/FoTableFooter.java
index f94de38466f195432910070cc71898abcd6c9e9d..5b3d2b4524d1690927e0d51547d547c3052fc66f 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableFooter.java
+++ b/src/org/apache/fop/fo/flow/FoTableFooter.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -93,7 +92,7 @@ public class FoTableFooter extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.TABLE_FOOTER, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoTableHeader.java b/src/org/apache/fop/fo/flow/FoTableHeader.java
index 86074d941aa3cad05b6819301a01c9aea0d0c7c4..854dadbe5d959e9ea653477b50f80f176acbf442 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableHeader.java
+++ b/src/org/apache/fop/fo/flow/FoTableHeader.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -93,7 +92,7 @@ public class FoTableHeader extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.TABLE_HEADER, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoTableRow.java b/src/org/apache/fop/fo/flow/FoTableRow.java
index 805bbabd2976aad5181d77d0ac9c6a49bc3a5d04..93c82bf0570e64e2dc83e4fd46470f0e1be5781a 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTableRow.java
+++ b/src/org/apache/fop/fo/flow/FoTableRow.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -100,7 +99,7 @@ public class FoTableRow extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.TABLE_ROW, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/flow/FoTitle.java b/src/org/apache/fop/fo/flow/FoTitle.java
index 48d961ccd3262f5f85d0dfadd8ae30fd70ab8530..5db9fa9c7e76c8c6d2fdbceeb9b99d0372387cea 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoTitle.java
+++ b/src/org/apache/fop/fo/flow/FoTitle.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FObjects;
@@ -100,8 +99,7 @@ public class FoTitle extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.TITLE, parent, event,
-              FOPropertySets.TITLE_SET, sparsePropsMap, sparseIndices,
-              numProps);
+              FONode.TITLE_SET, sparsePropsMap, sparseIndices);
         xmlevents = foTree.getXmlevents();
         FoXMLEvent ev = null;
         do {
@@ -117,7 +115,8 @@ public class FoTitle extends FONode {
             if (ev != null) {
                 // Generate the flow object
                 FObjects.fobjects.makeFlowObject
-                            (foTree, this, ev, FOPropertySets.TITLE_SET);
+                            (foTree, this, ev, FONode.TITLE_SET);
+                ev = xmlevents.getEndElement(ev);
             }
         } while (ev != null);
 

diff --git a/src/org/apache/fop/fo/flow/FoWrapper.java b/src/org/apache/fop/fo/flow/FoWrapper.java
index 91083e8badb1ab90cf9817e20435ef3f89bbea4d..6b280ffab97eafb3c254bc5e788046c5a59ac3ea 100644 (file)
--- a/src/org/apache/fop/fo/flow/FoWrapper.java
+++ b/src/org/apache/fop/fo/flow/FoWrapper.java
@@ -11,7 +11,6 @@ package org.apache.fop.fo.flow;
 
 // FOP
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -76,7 +75,7 @@ public class FoWrapper extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.WRAPPER, parent, event,
-                          attrSet, sparsePropsMap, sparseIndices, numProps);
+                          attrSet, sparsePropsMap, sparseIndices);
         FoXMLEvent ev;
         String nowProcessing;
 

diff --git a/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java b/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
index 5c3a559c87f0db1f30618cde6012bfbc4999541c..ec57b31bb1e3e4d319ab31d687719fdeeb30b361 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
+++ b/src/org/apache/fop/fo/pagination/FoLayoutMasterSet.java
@@ -7,7 +7,6 @@ import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FOTree;
 import org.apache.fop.fo.FONode;
@@ -105,8 +104,7 @@ public class FoLayoutMasterSet extends FONode {
         throws TreeException, FOPException, PropertyException
     {
         super(foTree, FObjectNames.LAYOUT_MASTER_SET, parent, event,
-              FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
-              numProps);
+              FONode.LAYOUT_SET, sparsePropsMap, sparseIndices);
         setupPageMasters(event);
         // No need to clean up the build tree, because the whole subtree
         // will be deleted.

diff --git a/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java b/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java
index 62d7ee3958d7ef2f4bb54c3018df33ce31c8a9a6..f8816f8f37d605e01a34a0c74a78147d6d5eea4c 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java
+++ b/src/org/apache/fop/fo/pagination/FoPageSequenceMaster.java
@@ -23,7 +23,6 @@ import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.expr.PropertyException;
 import org.apache.fop.fo.properties.Property;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FOTree;
 import org.apache.fop.fo.FONode;
@@ -191,8 +190,7 @@ public class FoPageSequenceMaster extends FONode {
         throws TreeException, FOPException, PropertyException
     {
         super(foTree, FObjectNames.PAGE_SEQUENCE_MASTER, parent, event,
-              FOPropertySets.SEQ_MASTER_SET, sparsePropsMap, sparseIndices,
-              numProps);
+              FONode.SEQ_MASTER_SET, sparsePropsMap, sparseIndices);
         // Process sequence members here
         try {
             do {
@@ -244,8 +242,8 @@ public class FoPageSequenceMaster extends FONode {
             throws TreeException, FOPException, PropertyException
         {
             super(foTree, FObjectNames.SINGLE_PAGE_MASTER_REFERENCE, parent,
-                    event, FOPropertySets.SEQ_MASTER_SET, s_p_m_r_PropsMap,
-                    s_p_m_r_Indices, s_p_m_r_numProps);
+                    event, FONode.SEQ_MASTER_SET, s_p_m_r_PropsMap,
+                    s_p_m_r_Indices);
             this.makeSparsePropsSet();
         }
 
@@ -266,8 +264,8 @@ public class FoPageSequenceMaster extends FONode {
             throws TreeException, FOPException, PropertyException
         {
             super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_REFERENCE,
-                    parent, event, FOPropertySets.SEQ_MASTER_SET,
-                    r_p_m_r_PropsMap, r_p_m_r_Indices, r_p_m_r_numProps);
+                    parent, event, FONode.SEQ_MASTER_SET,
+                    r_p_m_r_PropsMap, r_p_m_r_Indices);
             this.makeSparsePropsSet();
         }
 
@@ -292,8 +290,8 @@ public class FoPageSequenceMaster extends FONode {
             throws TreeException, FOPException, PropertyException
         {
             super(foTree, FObjectNames.REPEATABLE_PAGE_MASTER_ALTERNATIVES,
-                    parent, event, FOPropertySets.SEQ_MASTER_SET,
-                    r_p_m_a_PropsMap, r_p_m_a_Indices, r_p_m_a_numProps);
+                    parent, event, FONode.SEQ_MASTER_SET,
+                    r_p_m_a_PropsMap, r_p_m_a_Indices);
 
             // Process conditional-page-master-references here
             try {
@@ -325,8 +323,8 @@ public class FoPageSequenceMaster extends FONode {
             throws TreeException, FOPException, PropertyException
             {
                 super(foTree, FObjectNames.CONDITIONAL_PAGE_MASTER_REFERENCE,
-                        parent, event, FOPropertySets.SEQ_MASTER_SET,
-                        c_p_m_r_PropsMap, c_p_m_r_Indices, c_p_m_r_numProps);
+                        parent, event, FONode.SEQ_MASTER_SET,
+                        c_p_m_r_PropsMap, c_p_m_r_Indices);
                 this.makeSparsePropsSet();
             }
 

diff --git a/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java b/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java
index 6074ef416de9860b4b9054bcbc88edbb35da6ef7..8b696bd122406f56856876708aea7dec40df3c48 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java
+++ b/src/org/apache/fop/fo/pagination/FoRegionBeforeAfter.java
@@ -12,7 +12,6 @@ package org.apache.fop.fo.pagination;
 // FOP
 import org.apache.fop.fo.FOAttributes;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -90,8 +89,8 @@ public class FoRegionBeforeAfter extends FONode {
                 (FOTree foTree, int foType, FONode parent, FoXMLEvent event)
         throws TreeException, FOPException
     {
-        super(foTree, foType, parent, event, FOPropertySets.LAYOUT_SET,
-                sparsePropsMap, sparseIndices, numProps);
+        super(foTree, foType, parent, event, FONode.LAYOUT_SET,
+                sparsePropsMap, sparseIndices);
     }
 
 }

diff --git a/src/org/apache/fop/fo/pagination/FoRegionBody.java b/src/org/apache/fop/fo/pagination/FoRegionBody.java
index 5a5244c26d9768570f94657025e79580a78ef284..8e2038d9d71300b1e3fcb7e0f35de2a7dd52c6dc 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoRegionBody.java
+++ b/src/org/apache/fop/fo/pagination/FoRegionBody.java
@@ -10,9 +10,7 @@
 package org.apache.fop.fo.pagination;
 
 // FOP
-import org.apache.fop.fo.FOAttributes;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -92,8 +90,7 @@ public class FoRegionBody extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.REGION_BODY, parent, event,
-              FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
-              numProps);
+              FONode.LAYOUT_SET, sparsePropsMap, sparseIndices);
         makeSparsePropsSet();
     }
 

diff --git a/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java b/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java
index a780bac633b36b2a987cc6610f4063fd5a850207..9af5e3c28e3d9c7ba43ef680cc03e37b5f83268f 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java
+++ b/src/org/apache/fop/fo/pagination/FoRegionStartEnd.java
@@ -12,7 +12,6 @@ package org.apache.fop.fo.pagination;
 // FOP
 import org.apache.fop.fo.FOAttributes;
 import org.apache.fop.fo.PropNames;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.PropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
@@ -89,8 +88,8 @@ public class FoRegionStartEnd extends FONode {
                 (FOTree foTree, int foType, FONode parent, FoXMLEvent event)
         throws TreeException, FOPException
     {
-        super(foTree, foType, parent, event, FOPropertySets.LAYOUT_SET,
-                sparsePropsMap, sparseIndices, numProps);
+        super(foTree, foType, parent, event, FONode.LAYOUT_SET,
+                sparsePropsMap, sparseIndices);
     }
 
 }

diff --git a/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java b/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java
index 455a60cb512761fc6fa83c62358704bb7d14eac0..de4a4ec81e4c3b85c778e44e5bb58c07bb223598 100644 (file)
--- a/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java
+++ b/src/org/apache/fop/fo/pagination/FoSimplePageMaster.java
@@ -16,7 +16,6 @@ import org.apache.fop.xml.XMLEvent;
 import org.apache.fop.xml.FoXMLEvent;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.PropertySets;
-import org.apache.fop.fo.FOPropertySets;
 import org.apache.fop.fo.FObjectNames;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOTree;
@@ -94,8 +93,7 @@ public class FoSimplePageMaster extends FONode {
         throws TreeException, FOPException
     {
         super(foTree, FObjectNames.SIMPLE_PAGE_MASTER, parent, event,
-              FOPropertySets.LAYOUT_SET, sparsePropsMap, sparseIndices,
-              numProps);
+              FONode.LAYOUT_SET, sparsePropsMap, sparseIndices);
         // Process regions here
         FoXMLEvent regionEv;
         if ((regionEv = xmlevents.expectStartElement