PR:

Obtained from:
Submitted by:
Reviewed by:
1.)  AddChildNode(), characters() modified to throw SAXParseException to
allow AddChildNode() to do validation of its own.

2.)  Better child validation added to PageSequence.java.

3.)  Various other code cleanups.


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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java
index cebe2e164..bcaf8906b 100644
--- a/src/java/org/apache/fop/fo/FObj.java
+++ b/src/java/org/apache/fop/fo/FObj.java
@@ -102,7 +102,7 @@ public class FObj extends FONode implements Constants {
      */
     public void processNode(String elementName, Locator locator, 
                             Attributes attlist) throws SAXParseException {
-        setLocation(locator);
+        setLocator(locator);
         addProperties(attlist);
     }
 
@@ -225,7 +225,7 @@ public class FObj extends FONode implements Constants {
     /**
      * @see org.apache.fop.fo.FONode#addChildNode(FONode)
      */
-    protected void addChildNode(FONode child) {
+    protected void addChildNode(FONode child) throws SAXParseException {
         if (PropertySets.canHaveMarkers(getNameId()) && 
             child.getNameId() == FO_MARKER) {
                 addMarker((Marker) child);