Switch from IllegalArgumentException to SAXParseException for errors found in the input FO.

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

14 files changed, 28 insertions, 14 deletions

diff --git a/src/java/org/apache/fop/fo/flow/BasicLink.java b/src/java/org/apache/fop/fo/flow/BasicLink.java
index b3db13535..08592886e 100644
--- a/src/java/org/apache/fop/fo/flow/BasicLink.java
+++ b/src/java/org/apache/fop/fo/flow/BasicLink.java
@@ -20,6 +20,7 @@ package org.apache.fop.fo.flow;
 
 // XML
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -140,7 +141,7 @@ public class BasicLink extends Inline {
     /**
      * @see org.apache.fop.fo.FONode#end
      */
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         super.endOfNode();
         getFOInputHandler().endLink();
     }
diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java
index b01fb3b53..f44d65c00 100644
--- a/src/java/org/apache/fop/fo/flow/Block.java
+++ b/src/java/org/apache/fop/fo/flow/Block.java
@@ -21,6 +21,7 @@ package org.apache.fop.fo.flow;
 // XML
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -237,7 +238,7 @@ public class Block extends FObjMixed {
     /**
      * @see org.apache.fop.fo.FONode#end
      */
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         handleWhiteSpace();
         getFOInputHandler().endBlock(this);
     }
diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java
index f72ddd403..1575a81f7 100644
--- a/src/java/org/apache/fop/fo/flow/Footnote.java
+++ b/src/java/org/apache/fop/fo/flow/Footnote.java
@@ -21,6 +21,7 @@ package org.apache.fop.fo.flow;
 // XML
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -78,7 +79,7 @@ public class Footnote extends FObj {
         fotv.serveFootnote(this);
     }
     
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         super.endOfNode();
         getFOInputHandler().endFootnote(this);
     }
diff --git a/src/java/org/apache/fop/fo/flow/FootnoteBody.java b/src/java/org/apache/fop/fo/flow/FootnoteBody.java
index 34504e4e4..9564350db 100644
--- a/src/java/org/apache/fop/fo/flow/FootnoteBody.java
+++ b/src/java/org/apache/fop/fo/flow/FootnoteBody.java
@@ -21,6 +21,7 @@ package org.apache.fop.fo.flow;
 // XML
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -60,7 +61,7 @@ public class FootnoteBody extends FObj {
         fotv.serveFootnoteBody(this);
     }
 
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         super.endOfNode();
         getFOInputHandler().endFootnoteBody(this);
     }
diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java
index 64819ad46..a7d15f21f 100644
--- a/src/java/org/apache/fop/fo/flow/Inline.java
+++ b/src/java/org/apache/fop/fo/flow/Inline.java
@@ -20,6 +20,7 @@ package org.apache.fop.fo.flow;
 
 // XML
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -138,7 +139,7 @@ public class Inline extends FObjMixed {
     /**
      * @see org.apache.fop.fo.FONode#end
      */
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         getFOInputHandler().endInline(this);
     }
 
diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java
index f90ef8759..2aa9c5441 100644
--- a/src/java/org/apache/fop/fo/flow/ListBlock.java
+++ b/src/java/org/apache/fop/fo/flow/ListBlock.java
@@ -20,6 +20,7 @@ package org.apache.fop.fo.flow;
 
 // XML
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -136,7 +137,7 @@ public class ListBlock extends FObj {
         fotv.serveListBlock(this);
     }
 
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         super.endOfNode();
         getFOInputHandler().endList(this);
     }
diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java
index 35862bd7d..5fa73636a 100644
--- a/src/java/org/apache/fop/fo/flow/ListItem.java
+++ b/src/java/org/apache/fop/fo/flow/ListItem.java
@@ -20,6 +20,7 @@ package org.apache.fop.fo.flow;
 
 // XML
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -145,7 +146,7 @@ public class ListItem extends FObj {
         fotv.serveListItem(this);
     }
 
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         super.endOfNode();
         getFOInputHandler().endListItem(this);
     }
diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java
index 938f91b11..358453a8e 100644
--- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java
+++ b/src/java/org/apache/fop/fo/flow/ListItemLabel.java
@@ -20,6 +20,7 @@ package org.apache.fop.fo.flow;
 
 // XML
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -83,7 +84,7 @@ public class ListItemLabel extends FObj {
         fotv.serveListItemLabel(this);
     }
 
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         super.endOfNode();
         getFOInputHandler().endListLabel();
     }
diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java
index 16929732e..0035afea7 100644
--- a/src/java/org/apache/fop/fo/flow/PageNumber.java
+++ b/src/java/org/apache/fop/fo/flow/PageNumber.java
@@ -20,6 +20,7 @@ package org.apache.fop.fo.flow;
 
 // XML
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -128,7 +129,7 @@ public class PageNumber extends FObj {
         fotv.servePageNumber(this);
     }
 
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         getFOInputHandler().endPageNumber(this);
     }
     
diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java
index 42000aa3e..3a430f52b 100644
--- a/src/java/org/apache/fop/fo/flow/Table.java
+++ b/src/java/org/apache/fop/fo/flow/Table.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 
 // XML
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -201,7 +202,7 @@ public class Table extends FObj {
         fotv.serveTable(this);
     }
 
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         getFOInputHandler().endTable(this);
     }
 
diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java
index 8444617f5..20e392181 100644
--- a/src/java/org/apache/fop/fo/flow/TableBody.java
+++ b/src/java/org/apache/fop/fo/flow/TableBody.java
@@ -21,6 +21,7 @@ package org.apache.fop.fo.flow;
 // XML
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -104,7 +105,7 @@ public class TableBody extends FObj {
         fotv.serveTableBody(this);
     }
 
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         getFOInputHandler().endBody(this);
     }
 
diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java
index 55631475b..4dcf265cf 100644
--- a/src/java/org/apache/fop/fo/flow/TableCell.java
+++ b/src/java/org/apache/fop/fo/flow/TableCell.java
@@ -21,6 +21,7 @@ package org.apache.fop.fo.flow;
 // XML
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -348,7 +349,7 @@ public class TableCell extends FObj {
         fotv.serveTableCell(this);
     }
 
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         getFOInputHandler().endCell(this);
     }
     
diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java
index a8f7d4fc6..7f7089783 100644
--- a/src/java/org/apache/fop/fo/flow/TableColumn.java
+++ b/src/java/org/apache/fop/fo/flow/TableColumn.java
@@ -20,6 +20,7 @@ package org.apache.fop.fo.flow;
 
 // XML
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -123,7 +124,7 @@ public class TableColumn extends FObj {
         fotv.serveTableColumn(this);
     }
 
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         getFOInputHandler().endColumn(this);
     }
     
diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java
index 39c34b512..4b3a1b41f 100644
--- a/src/java/org/apache/fop/fo/flow/TableRow.java
+++ b/src/java/org/apache/fop/fo/flow/TableRow.java
@@ -20,6 +20,7 @@ package org.apache.fop.fo.flow;
 
 // XML
 import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 // FOP
 import org.apache.fop.apps.FOPException;
@@ -144,7 +145,7 @@ public class TableRow extends FObj {
         fotv.serveTableRow(this);
     }
 
-    protected void endOfNode() {
+    protected void endOfNode() throws SAXParseException {
         getFOInputHandler().endRow(this);
     }