1.) Moved from FOPException to SAXParseException for addProperties()

2.) FONode: locator object added, its three components (file, line, col) removed
3.) FONode: new attributeError() method created for attribute problems in input FO.
4.) Removed some setup() methods in the FO's, placed them in addProperties() instead.


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

19 files changed, 82 insertions, 202 deletions

diff --git a/src/java/org/apache/fop/fo/flow/BasicLink.java b/src/java/org/apache/fop/fo/flow/BasicLink.java
index 4a4821bd7..89fbc7e0b 100644
--- a/src/java/org/apache/fop/fo/flow/BasicLink.java
+++ b/src/java/org/apache/fop/fo/flow/BasicLink.java
@@ -24,7 +24,6 @@ import org.xml.sax.Locator;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FOElementMapping;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.layoutmgr.AddLMVisitor;
@@ -57,8 +56,25 @@ public class BasicLink extends Inline {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
+
+        setupID();
+        String ext =  propertyList.get(PR_EXTERNAL_DESTINATION).getString();
+        String internal = propertyList.get(PR_INTERNAL_DESTINATION).getString();
+
+        // per spec, internal takes precedence if both specified
+        if (internal.length() > 0) {
+            link = internal;
+        } else if (ext.length() > 0) {
+            link = ext;
+            external = true;
+        } else {
+            // slightly stronger than spec "should be specified"
+            attributeError("Missing attribute:  Either external-destination or " +
+                "internal-destination must be specified.");
+        }
+        
         getFOInputHandler().startLink(this);
     }
 
@@ -106,44 +122,6 @@ public class BasicLink extends Inline {
     }
 
     /**
-     * @todo check if needed; not being called currently
-     */
-    private void setup() {
-        String destination;
-        int linkType;
-
-        // Common Accessibility Properties
-        CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
-        // Common Aural Properties
-        CommonAural mAurProps = propMgr.getAuralProps();
-
-        // Common Border, Padding, and Background Properties
-        CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
-        CommonBackground bProps = propMgr.getBackgroundProps();
-
-        // Common Margin Properties-Inline
-        CommonMarginInline mProps = propMgr.getMarginInlineProps();
-
-        // Common Relative Position Properties
-        CommonRelativePosition mRelProps = propMgr.getRelativePositionProps();
-
-        String ext =  propertyList.get(PR_EXTERNAL_DESTINATION).getString();
-        setupID();
-
-        String internal = propertyList.get(PR_INTERNAL_DESTINATION).getString();
-
-        if (ext.length() > 0) {
-            link = ext;
-            external = true;
-        } else if (internal.length() > 0) {
-            link = internal;
-        } else {
-            getLogger().error("basic-link requires an internal or external destination");
-        }
-    }
-
-    /**
      * @return true (BasicLink can contain Markers)
     */
     protected boolean containsMarkers() {
@@ -156,7 +134,6 @@ public class BasicLink extends Inline {
      * @param aLMV the AddLMVisitor object that can access this object.
      */
     public void acceptVisitor(AddLMVisitor aLMV) {
-        setup();
         aLMV.serveBasicLink(this);
     }
 }
diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java
index 06ff3b5c6..69131a5be 100644
--- a/src/java/org/apache/fop/fo/flow/Block.java
+++ b/src/java/org/apache/fop/fo/flow/Block.java
@@ -24,7 +24,6 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.CharIterator;
 import org.apache.fop.fo.FONode;
@@ -100,7 +99,7 @@ public class Block extends FObjMixed {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         this.span = this.propertyList.get(PR_SPAN).getEnum();
         this.wsTreatment =
@@ -112,89 +111,33 @@ public class Block extends FObjMixed {
           this.propertyList.get(PR_LINEFEED_TREATMENT).getEnum();
 
         setupID();
+        this.align = this.propertyList.get(PR_TEXT_ALIGN).getEnum();
+        this.alignLast =
+          this.propertyList.get(PR_TEXT_ALIGN_LAST).getEnum();
+        this.breakAfter = this.propertyList.get(PR_BREAK_AFTER).getEnum();
+        this.lineHeight = this.propertyList.get(
+                            PR_LINE_HEIGHT).getLength().getValue();
+        this.startIndent = this.propertyList.get(
+                             PR_START_INDENT).getLength().getValue();
+        this.endIndent = this.propertyList.get(
+                           PR_END_INDENT).getLength().getValue();
+        this.spaceBefore = this.propertyList.get(
+                             PR_SPACE_BEFORE | CP_OPTIMUM).getLength().getValue();
+        this.spaceAfter = this.propertyList.get(
+                            PR_SPACE_AFTER | CP_OPTIMUM).getLength().getValue();
+        this.textIndent = this.propertyList.get(
+                            PR_TEXT_INDENT).getLength().getValue();
+        this.keepWithNext =
+          this.propertyList.get(PR_KEEP_WITH_NEXT).getEnum();
+
+        this.blockWidows =
+          this.propertyList.get(PR_WIDOWS).getNumber().intValue();
+        this.blockOrphans =
+          this.propertyList.get(PR_ORPHANS).getNumber().intValue();
 
         getFOInputHandler().startBlock(this);
     }
 
-    private void setup() {
-
-            // Common Accessibility Properties
-            CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
-            // Common Aural Properties
-            CommonAural mAurProps = propMgr.getAuralProps();
-
-            // Common Border, Padding, and Background Properties
-            CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
-            CommonBackground bProps = propMgr.getBackgroundProps();
-
-            // Common Font Properties
-            //this.fontState = propMgr.getFontState(area.getFontInfo());
-
-            // Common Hyphenation Properties
-            CommonHyphenation mHyphProps = propMgr.getHyphenationProps();
-
-            // Common Margin Properties-Block
-            CommonMarginBlock mProps = propMgr.getMarginProps();
-
-            // Common Relative Position Properties
-            CommonRelativePosition mRelProps =
-              propMgr.getRelativePositionProps();
-
-            // this.propertyList.get("break-after");
-            // this.propertyList.get("break-before");
-            // this.propertyList.get("color");
-            // this.propertyList.get("text-depth");
-            // this.propertyList.get("text-altitude");
-            // this.propertyList.get("hyphenation-keep");
-            // this.propertyList.get("hyphenation-ladder-count");
-            setupID();
-            // this.propertyList.get("keep-together");
-            // this.propertyList.get("keep-with-next");
-            // this.propertyList.get("keep-with-previous");
-            // this.propertyList.get("last-line-end-indent");
-            // this.propertyList.get("linefeed-treatment");
-            // this.propertyList.get("line-height");
-            // this.propertyList.get("line-height-shift-adjustment");
-            // this.propertyList.get("line-stacking-strategy");
-            // this.propertyList.get("orphans");
-            // this.propertyList.get("white-space-treatment");
-            // this.propertyList.get("span");
-            // this.propertyList.get("text-align");
-            // this.propertyList.get("text-align-last");
-            // this.propertyList.get("text-indent");
-            // this.propertyList.get("visibility");
-            // this.propertyList.get("white-space-collapse");
-            // this.propertyList.get("widows");
-            // this.propertyList.get("wrap-option");
-            // this.propertyList.get("z-index");
-
-            this.align = this.propertyList.get(PR_TEXT_ALIGN).getEnum();
-            this.alignLast =
-              this.propertyList.get(PR_TEXT_ALIGN_LAST).getEnum();
-            this.breakAfter = this.propertyList.get(PR_BREAK_AFTER).getEnum();
-            this.lineHeight = this.propertyList.get(
-                                PR_LINE_HEIGHT).getLength().getValue();
-            this.startIndent = this.propertyList.get(
-                                 PR_START_INDENT).getLength().getValue();
-            this.endIndent = this.propertyList.get(
-                               PR_END_INDENT).getLength().getValue();
-            this.spaceBefore = this.propertyList.get(
-                                 PR_SPACE_BEFORE | CP_OPTIMUM).getLength().getValue();
-            this.spaceAfter = this.propertyList.get(
-                                PR_SPACE_AFTER | CP_OPTIMUM).getLength().getValue();
-            this.textIndent = this.propertyList.get(
-                                PR_TEXT_INDENT).getLength().getValue();
-            this.keepWithNext =
-              this.propertyList.get(PR_KEEP_WITH_NEXT).getEnum();
-
-            this.blockWidows =
-              this.propertyList.get(PR_WIDOWS).getNumber().intValue();
-            this.blockOrphans =
-              this.propertyList.get(PR_ORPHANS).getNumber().intValue();
-
-    }
-
     /**
      * @return true (Block can contain Markers)
      */
diff --git a/src/java/org/apache/fop/fo/flow/BlockContainer.java b/src/java/org/apache/fop/fo/flow/BlockContainer.java
index 51bef9036..29adbbe7e 100644
--- a/src/java/org/apache/fop/fo/flow/BlockContainer.java
+++ b/src/java/org/apache/fop/fo/flow/BlockContainer.java
@@ -19,7 +19,6 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
@@ -30,6 +29,7 @@ import org.apache.fop.fo.properties.CommonBorderAndPadding;
 import org.apache.fop.fo.properties.CommonMarginBlock;
 
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 /**
  * Class modelling the fo:block-container object. See Sec. 6.5.3 of the XSL-FO
@@ -59,7 +59,7 @@ public class BlockContainer extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         this.span = this.propertyList.get(PR_SPAN).getEnum();
         setupID();
diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
index d1c66374d..3c12b7899 100644
--- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
+++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
@@ -26,7 +26,6 @@ import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXParseException;
 
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.layoutmgr.AddLMVisitor;
@@ -75,7 +74,7 @@ public class ExternalGraphic extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         getFOInputHandler().image(this);
     }
diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java
index df36b7724..f234927e9 100644
--- a/src/java/org/apache/fop/fo/flow/Footnote.java
+++ b/src/java/org/apache/fop/fo/flow/Footnote.java
@@ -24,7 +24,6 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.layoutmgr.AddLMVisitor;
 import org.apache.fop.fo.FObj;
@@ -48,7 +47,7 @@ public class Footnote extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         getFOInputHandler().startFootnote(this);
     }
diff --git a/src/java/org/apache/fop/fo/flow/FootnoteBody.java b/src/java/org/apache/fop/fo/flow/FootnoteBody.java
index 413a6bda4..1674ecc31 100644
--- a/src/java/org/apache/fop/fo/flow/FootnoteBody.java
+++ b/src/java/org/apache/fop/fo/flow/FootnoteBody.java
@@ -24,7 +24,6 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.layoutmgr.AddLMVisitor;
@@ -52,7 +51,7 @@ public class FootnoteBody extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         getFOInputHandler().startFootnoteBody(this);
     }
diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java
index b60c20141..adb33d0d1 100644
--- a/src/java/org/apache/fop/fo/flow/Inline.java
+++ b/src/java/org/apache/fop/fo/flow/Inline.java
@@ -59,12 +59,12 @@ public class Inline extends FObjMixed {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
 
         if (parent.getName().equals("fo:flow")) {
-            throw new FOPException("inline formatting objects cannot"
-                                   + " be directly under flow");
+            throw new SAXParseException("inline formatting objects cannot"
+                                   + " be directly under flow", locator);
         }
 
         // Common Accessibility Properties
diff --git a/src/java/org/apache/fop/fo/flow/InlineContainer.java b/src/java/org/apache/fop/fo/flow/InlineContainer.java
index a58135351..050507da4 100644
--- a/src/java/org/apache/fop/fo/flow/InlineContainer.java
+++ b/src/java/org/apache/fop/fo/flow/InlineContainer.java
@@ -20,12 +20,12 @@ package org.apache.fop.fo.flow;
 
 // XML
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.layoutmgr.AddLMVisitor;
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.properties.CommonBackground;
 import org.apache.fop.fo.properties.CommonBorderAndPadding;
 import org.apache.fop.fo.properties.CommonMarginInline;
@@ -47,7 +47,7 @@ public class InlineContainer extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         // Common Border, Padding, and Background Properties
         CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java
index 6f76e4ebc..d36b3c72a 100644
--- a/src/java/org/apache/fop/fo/flow/ListBlock.java
+++ b/src/java/org/apache/fop/fo/flow/ListBlock.java
@@ -23,7 +23,6 @@ import org.xml.sax.Attributes;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
@@ -63,56 +62,28 @@ public class ListBlock extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
+        setupID();
+
+        this.align = this.propertyList.get(PR_TEXT_ALIGN).getEnum();
+        this.alignLast = this.propertyList.get(PR_TEXT_ALIGN_LAST).getEnum();
+        this.lineHeight =
+            this.propertyList.get(PR_LINE_HEIGHT).getLength().getValue();
+        this.startIndent =
+            this.propertyList.get(PR_START_INDENT).getLength().getValue();
+        this.endIndent =
+            this.propertyList.get(PR_END_INDENT).getLength().getValue();
+        this.spaceBefore =
+            this.propertyList.get(PR_SPACE_BEFORE | CP_OPTIMUM).getLength().getValue();
+        this.spaceAfter =
+            this.propertyList.get(PR_SPACE_AFTER | CP_OPTIMUM).getLength().getValue();
+        this.spaceBetweenListRows = 0;    // not used at present
+        this.backgroundColor =
+            this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
         getFOInputHandler().startList(this);
     }
 
-    private void setup() throws FOPException {
-
-            // Common Accessibility Properties
-            CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
-
-            // Common Aural Properties
-            CommonAural mAurProps = propMgr.getAuralProps();
-
-            // Common Border, Padding, and Background Properties
-            CommonBorderAndPadding bap = propMgr.getBorderAndPadding();
-            CommonBackground bProps = propMgr.getBackgroundProps();
-
-            // Common Margin Properties-Block
-            CommonMarginBlock mProps = propMgr.getMarginProps();
-
-            // Common Relative Position Properties
-            CommonRelativePosition mRelProps = propMgr.getRelativePositionProps();
-
-            // this.propertyList.get("break-after");
-            // this.propertyList.get("break-before");
-            setupID();
-            // this.propertyList.get("keep-together");
-            // this.propertyList.get("keep-with-next");
-            // this.propertyList.get("keep-with-previous");
-            // this.propertyList.get("provisional-distance-between-starts");
-            // this.propertyList.get("provisional-label-separation");
-
-            this.align = this.propertyList.get(PR_TEXT_ALIGN).getEnum();
-            this.alignLast = this.propertyList.get(PR_TEXT_ALIGN_LAST).getEnum();
-            this.lineHeight =
-                this.propertyList.get(PR_LINE_HEIGHT).getLength().getValue();
-            this.startIndent =
-                this.propertyList.get(PR_START_INDENT).getLength().getValue();
-            this.endIndent =
-                this.propertyList.get(PR_END_INDENT).getLength().getValue();
-            this.spaceBefore =
-                this.propertyList.get(PR_SPACE_BEFORE | CP_OPTIMUM).getLength().getValue();
-            this.spaceAfter =
-                this.propertyList.get(PR_SPACE_AFTER | CP_OPTIMUM).getLength().getValue();
-            this.spaceBetweenListRows = 0;    // not used at present
-            this.backgroundColor =
-                this.propertyList.get(PR_BACKGROUND_COLOR).getColorType();
-
-    }
-
     /**
      * @return false (ListBlock does not generate inline areas)
      */
diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java
index 75a2cd37f..25d753918 100644
--- a/src/java/org/apache/fop/fo/flow/ListItem.java
+++ b/src/java/org/apache/fop/fo/flow/ListItem.java
@@ -63,7 +63,7 @@ public class ListItem extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         getFOInputHandler().startListItem(this);
     }
diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java
index 24146d539..81b631282 100644
--- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java
+++ b/src/java/org/apache/fop/fo/flow/ListItemLabel.java
@@ -23,7 +23,6 @@ import org.xml.sax.Attributes;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 import org.apache.fop.layoutmgr.AddLMVisitor;
@@ -45,7 +44,7 @@ public class ListItemLabel extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         getFOInputHandler().startListLabel();
     }
diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java
index bfcbf7250..a090d78fc 100644
--- a/src/java/org/apache/fop/fo/flow/Marker.java
+++ b/src/java/org/apache/fop/fo/flow/Marker.java
@@ -20,9 +20,9 @@ package org.apache.fop.fo.flow;
 
 // XML
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.layoutmgr.AddLMVisitor;
@@ -48,7 +48,7 @@ public class Marker extends FObjMixed {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         this.markerClassName =
             this.propertyList.get(PR_MARKER_CLASS_NAME).getString();
diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java
index 7df1350a5..ba8e4327b 100644
--- a/src/java/org/apache/fop/fo/flow/PageNumber.java
+++ b/src/java/org/apache/fop/fo/flow/PageNumber.java
@@ -24,7 +24,6 @@ import org.xml.sax.Locator;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.layoutmgr.AddLMVisitor;
@@ -69,7 +68,7 @@ public class PageNumber extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         setup();
         getFOInputHandler().startPageNumber(this);
diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
index e023f96cd..3ae22e385 100644
--- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
+++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
@@ -24,7 +24,6 @@ import org.xml.sax.Locator;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.layoutmgr.AddLMVisitor;
@@ -61,7 +60,7 @@ public class RetrieveMarker extends FObjMixed {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         this.retrieveClassName =
             this.propertyList.get(PR_RETRIEVE_CLASS_NAME).getString();
diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java
index 5babb90bb..55b0a7abf 100644
--- a/src/java/org/apache/fop/fo/flow/Table.java
+++ b/src/java/org/apache/fop/fo/flow/Table.java
@@ -26,7 +26,6 @@ import org.xml.sax.Attributes;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
@@ -79,7 +78,7 @@ public class Table extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         setupID();
         getFOInputHandler().startTable(this);
diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java
index 8f6197d17..4aa034b11 100644
--- a/src/java/org/apache/fop/fo/flow/TableBody.java
+++ b/src/java/org/apache/fop/fo/flow/TableBody.java
@@ -24,7 +24,6 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
@@ -56,13 +55,13 @@ public class TableBody extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         setupID();
         getFOInputHandler().startBody(this);
     }
 
-    private void setup() throws FOPException {
+    private void setup() {
         // Common Accessibility Properties
         CommonAccessibility mAccProps = propMgr.getAccessibilityProps();
 
diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java
index dd06524b6..412fdc02a 100644
--- a/src/java/org/apache/fop/fo/flow/TableCell.java
+++ b/src/java/org/apache/fop/fo/flow/TableCell.java
@@ -24,7 +24,6 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
@@ -122,7 +121,7 @@ public class TableCell extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         doSetup();    // init some basic property values
         getFOInputHandler().startCell(this);
diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java
index 936cdddb7..172b15475 100644
--- a/src/java/org/apache/fop/fo/flow/TableColumn.java
+++ b/src/java/org/apache/fop/fo/flow/TableColumn.java
@@ -24,7 +24,6 @@ import org.xml.sax.Locator;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.FONode;
@@ -68,7 +67,7 @@ public class TableColumn extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         initialize();    // init some basic property values
         getFOInputHandler().startColumn(this);
diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java
index 71c89590d..54db3cd6a 100644
--- a/src/java/org/apache/fop/fo/flow/TableRow.java
+++ b/src/java/org/apache/fop/fo/flow/TableRow.java
@@ -23,7 +23,6 @@ import org.xml.sax.Attributes;
 import org.xml.sax.SAXParseException;
 
 // FOP
-import org.apache.fop.apps.FOPException;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.KeepValue;
 import org.apache.fop.fo.FONode;
@@ -66,7 +65,7 @@ public class TableRow extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */
-    protected void addProperties(Attributes attlist) throws FOPException {
+    protected void addProperties(Attributes attlist) throws SAXParseException {
         super.addProperties(attlist);
         setupID();
         getFOInputHandler().startRow(this);