gmazza 2004/09/04 21:00:53
Modified:src/java/org/apache/fop/area AreaTreeHandler.java
src/java/org/apache/fop/fo FOInputHandler.java FONode.java
FOTreeBuilder.java FObj.java FObjMixed.java
XMLObj.java
src/java/org/apache/fop/fo/flow Block.java Table.java
src/java/org/apache/fop/fo/pagination Flow.java
LayoutMasterSet.java PageSequence.java
RegionBA.java RegionEnd.java
RepeatablePageMasterReference.java
src/java/org/apache/fop/layoutmgr PageLayoutManager.java
src/java/org/apache/fop/render/mif MIFHandler.java
src/java/org/apache/fop/render/rtf RTFHandler.java
Log:
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.
Revision ChangesPath
1.6 +3 -5 xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java
Index: AreaTreeHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTreeHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AreaTreeHandler.java 26 Aug 2004 20:58:30 - 1.5
+++ AreaTreeHandler.java 5 Sep 2004 04:00:51 - 1.6
@@ -351,8 +351,7 @@
* @param pageSequence the page sequence ending
* @throws FOPException if there is an error formatting the pages
*/
-public void endPageSequence(PageSequence pageSequence)
-throws FOPException {
+public void endPageSequence(PageSequence pageSequence) {
//areaTree.setFontInfo(fontInfo);
if (collectStatistics) {
@@ -377,8 +376,7 @@
* @param areaTree the area tree to format this page sequence into
* @throws FOPException if there is an error formatting the contents
*/
-private void formatPageSequence(PageSequence pageSeq)
-throws FOPException {
+private void formatPageSequence(PageSequence pageSeq) {
Title title = null;
if (pageSeq.getTitleFO() != null) {
title = getTitleArea(pageSeq.getTitleFO());
1.24 +2 -4 xml-fop/src/java/org/apache/fop/fo/FOInputHandler.java
Index: FOInputHandler.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOInputHandler.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- FOInputHandler.java 13 Jul 2004 00:16:22 - 1.23
+++ FOInputHandler.java 5 Sep 2004 04:00:51 - 1.24
@@ -144,11 +144,9 @@
}
/**
- *
* @param pageSeq PageSequence that is ending.
- * @throws FOPException For errors encountered.
*/
-public void endPageSequence(PageSequence pageSeq) throws FOPException {
+public void endPageSequence(PageSequence pageSeq) {
}
/**
1.42 +3 -3 xml-fop/src/java/org/apache/fop/fo/FONode.java
Index: FONode.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- FONode.java 4 Sep 2004 20:55:20 - 1.41
+++ FONode.java 5 Sep 2004 04:00:51 - 1.42
@@ -66,7 +66,7 @@
* Set the location information for this element
* @param locator the org.xml.sax.Locator object
*/
-public void setLocation(Locator locator) {
+public void setLocator(Locator locator) {
if (locator != null) {
this.locator = locator;
}
@@ -130,7 +130,7 @@
* @param locator location in fo source file.
*/
protected void addCharacters(char data[], int start, int length,
- Locator locator) {
+ Locator locator) throws SAXParseException {
// ignore
}
@@ -151,7 +151,7 @@
/**
* @param child child node to be added to the childNodes of this node
*/
-protected void addChildNode(FONode child) {
+protected void addChildNode(FONode child) throws SAXParseException {
}
/**
1.46 +5 -4 xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java
Index: FOTreeBuilder.java
===
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FOTreeBuilder.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- FOTreeBuilder.java1