[FOray-commit] SF.net SVN: foray: [7858] trunk/foray/foray-fotree/src/java/org/foray/ fotree
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [7858] trunk/foray/foray-fotree/src/java/org/foray/ fotree
|
From: <vic...@us...> - 2006-09-02 22:47:55
|
Revision: 7858
http://svn.sourceforge.net/foray/?rev=7858&view=rev
Author: victormote
Date: 2006-09-02 15:47:16 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
1. Don't let FObj subclass constructors throw exceptions.
2. Move the pre-existing exception-throwing logic to the new validateAncestry() method.
Modified Paths:
--------------
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractPageMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/StaticContent.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Table.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableAndCaption.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableBody.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCaption.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableCell.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableColumn.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableFooter.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableHeader.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/TableRow.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Title.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Wrapper.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/ObjectMakerExtensions.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/foray/obj/ContinuedLabel.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/ObjectMakerSVG.java
trunk/foray/foray-fotree/src/java/org/foray/fotree/svg/obj/SVGElement.java
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjMixed.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -35,8 +35,7 @@
protected StringBuffer textBuffer;
protected FObjMixed(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/FObjScaled.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -26,7 +26,6 @@
import org.axsl.common.Constants;
import org.axsl.foR.FOContext;
-import org.axsl.foR.FOTreeException;
/**
* Abstract base class for inline FOs that are scaleable. This currently
@@ -36,8 +35,7 @@
implements org.axsl.foR.FObjScaled {
public FObjScaled(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/ForeignXML.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -81,13 +81,8 @@
*/
public ForeignXML(final FObj parentFO,
final PropertyListUnparsed propertyList, final String tag,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parentFO, propertyList, systemId, line, column);
- if (! (getParent() instanceof InstreamForeignObject)) {
- throwException("Foreign XML must be inside "
- + "fo:instream-foreign-object.");
- }
this.domDocument = createDOMDocument();
this.currentElement = domDocument.getDocumentElement();
processAttributes(this.currentElement, propertyList.getAttributes());
@@ -95,6 +90,16 @@
}
/**
+ * {@inheritDoc}
+ */
+ protected void validateAncestry() throws FOTreeException {
+ if (! (getParent() instanceof InstreamForeignObject)) {
+ throwException("Foreign XML must be inside "
+ + "fo:instream-foreign-object.");
+ }
+ }
+
+ /**
* Create and return a DOM {@link Document} instance.
* @return The newly-created DOM {@link Document} instance.
*/
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/ObjectMakerFO.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -87,7 +87,6 @@
import org.foray.fotree.fo.obj.Wrapper;
import org.axsl.common.Constants;
-import org.axsl.foR.FOTreeException;
import org.xml.sax.Locator;
@@ -109,8 +108,7 @@
}
public static FObj makeObject(final String objectName, final FObj parent,
- final PropertyList propertyList, final Locator locator)
- throws FOTreeException {
+ final PropertyList propertyList, final Locator locator) {
final byte enumeration = enumerateObjectName(objectName);
String systemId = null;
int line = 0;
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractFlow.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -36,20 +36,18 @@
public abstract class AbstractFlow extends FObj {
protected AbstractFlow(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- if (! (parent instanceof PageSequence)) {
- throwException(getFullName() + " must be child of "
- + "fo:page-sequence.");
- }
}
/**
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ if (! (this.getParent() instanceof PageSequence)) {
+ throwException(getFullName() + " must be child of "
+ + "fo:page-sequence.");
+ }
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractPageMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractPageMaster.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractPageMaster.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -36,19 +36,18 @@
public AbstractPageMaster(final FObj parent,
final PropertyList propertyList, final String systemId,
- final int line, final int column) throws FOTreeException {
+ final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- if (! (parent instanceof LayoutMasterSet)) {
- throwException(getFullName() + " must be child "
- + "of fo:layout-master-set.");
- }
}
/**
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ if (! (this.getParent() instanceof LayoutMasterSet)) {
+ throwException(getFullName() + " must be child "
+ + "of fo:layout-master-set.");
+ }
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/AbstractTableBody.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -38,14 +38,19 @@
implements org.axsl.foR.fo.AbstractTableBody {
public AbstractTableBody(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- if (! (parent instanceof Table)) {
- throwException(getFullName() + " must be child of fo:table.");
- }
}
+ /**
+ * {@inheritDoc}
+ */
+ protected void validateAncestry() throws FOTreeException {
+ if (! (this.getParent() instanceof Table)) {
+ throwException(getFullName() + " must be child of fo:table.");
+ }
+ }
+
public Namespace getNamespace() {
return this.getFOTreeBuilder().getFONamespace();
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BasicLink.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -37,8 +37,7 @@
public class BasicLink extends Inline implements org.axsl.foR.fo.BasicLink {
public BasicLink(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BidiOverride.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,8 +39,7 @@
implements org.axsl.foR.fo.BidiOverride {
public BidiOverride(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Block.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -46,8 +46,7 @@
public class Block extends FObjMixed implements org.axsl.foR.fo.Block {
public Block(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BlockContainer.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,8 +39,7 @@
implements org.axsl.foR.fo.BlockContainer {
public BlockContainer(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Bookmark.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,25 +39,21 @@
*/
public class Bookmark extends FObj implements org.axsl.foR.fo.Bookmark {
public Bookmark(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- /*
- * Validate that this is a child of either fo:bookmark-tree or
- * fo:bookmark.
- */
- if (! (parent instanceof BookmarkTree)
- && ! (parent instanceof Bookmark)) {
- throwException(getFullName() + " must be child of "
- + "fo:bookmark-tree or fo:bookmark.");
- }
}
/**
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ /* Validate that this is a child of either fo:bookmark-tree or
+ * fo:bookmark. */
+ if (! (this.getParent() instanceof BookmarkTree)
+ && ! (this.getParent() instanceof Bookmark)) {
+ throwException(getFullName() + " must be child of "
+ + "fo:bookmark-tree or fo:bookmark.");
+ }
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTitle.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -41,8 +41,7 @@
implements org.axsl.foR.fo.BookmarkTitle {
public BookmarkTitle(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/BookmarkTree.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,20 +39,18 @@
implements org.axsl.foR.fo.BookmarkTree {
public BookmarkTree(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- // Validate that this is a child of fo:root.
- if (! (parent instanceof Root)) {
- throwException(getFullName() + " must be child of fo:root.");
- }
}
/**
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ // Validate that this is a child of fo:root.
+ if (! (this.getParent() instanceof Root)) {
+ throwException(getFullName() + " must be child of fo:root.");
+ }
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Character.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -40,8 +40,7 @@
public class Character extends FObj implements org.axsl.foR.fo.Character {
public Character(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ColorProfile.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,10 +39,8 @@
implements org.axsl.foR.fo.ColorProfile {
public ColorProfile(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- logWarning(getFullName() + " not implemented.");
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -43,20 +43,19 @@
public ConditionalPageMasterReference(final FObj parent,
final PropertyList propertyList, final String systemId,
- final int line, final int column) throws FOTreeException {
+ final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- /* Validate ancestry. */
- if (! (parent instanceof RepeatablePMAlternatives)) {
- throwException(getFullName() + " must be child of "
- + "fo:repeatable-page-master-alternatives.");
- }
}
/**
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ /* Validate ancestry. */
+ if (! (this.getParent() instanceof RepeatablePMAlternatives)) {
+ throwException(getFullName() + " must be child of "
+ + "fo:repeatable-page-master-alternatives.");
+ }
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Declarations.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,8 +39,7 @@
implements org.axsl.foR.fo.Declarations {
public Declarations(final FObj parent,final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ExternalGraphic.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -62,8 +62,7 @@
protected int pixelsPerInch = 96;
public ExternalGraphic(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Float.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -38,8 +38,7 @@
public class Float extends FObj implements org.axsl.foR.fo.Float {
public Float(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Flow.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -38,8 +38,7 @@
public class Flow extends AbstractFlow implements org.axsl.foR.fo.Flow {
public Flow(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Footnote.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -38,8 +38,7 @@
public class Footnote extends FObj implements org.axsl.foR.fo.Footnote {
public Footnote(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/FootnoteBody.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,8 +39,7 @@
implements org.axsl.foR.fo.FootnoteBody {
public FootnoteBody(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InitialPropertySet.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -40,7 +40,7 @@
public InitialPropertySet(final FObj parent,
final PropertyList propertyList, final String systemId,
- final int line, final int column) throws FOTreeException {
+ final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Inline.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,19 +39,17 @@
public class Inline extends FObjMixed implements org.axsl.foR.fo.Inline {
public Inline(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- if (parent instanceof Flow) {
- throwException(getFullName() + " cannot be child of fo:flow.");
- }
}
/**
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ if (this.getParent() instanceof Flow) {
+ throwException(getFullName() + " cannot be child of fo:flow.");
+ }
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InlineContainer.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,8 +39,7 @@
implements org.axsl.foR.fo.InlineContainer {
public InlineContainer(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/InstreamForeignObject.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -45,7 +45,7 @@
public InstreamForeignObject(final FObj parent,
final PropertyList propertyList, final String systemId,
- final int line, final int column) throws FOTreeException {
+ final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/LayoutMasterSet.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -53,12 +53,8 @@
private HashMap regionMap;
public LayoutMasterSet(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- if (! (parent instanceof Root)) {
- throwException(getFullName() + " must be child of fo:root.");
- }
this.simplePageMasters = new HashMap();
this.pageSequenceMasters = new HashMap();
this.regionMap = new HashMap();
@@ -68,7 +64,9 @@
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ if (! (this.getParent() instanceof Root)) {
+ throwException(getFullName() + " must be child of fo:root.");
+ }
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Leader.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -42,8 +42,7 @@
public class Leader extends FObjMixed implements org.axsl.foR.fo.Leader {
public Leader(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListBlock.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -38,8 +38,7 @@
public class ListBlock extends FObj implements org.axsl.foR.fo.ListBlock {
public ListBlock(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItem.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,8 +39,7 @@
public class ListItem extends FObj implements org.axsl.foR.fo.ListItem {
public ListItem(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemBody.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -40,8 +40,7 @@
implements org.axsl.foR.fo.ListItemBody {
public ListItemBody(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/ListItemLabel.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -40,8 +40,7 @@
implements org.axsl.foR.fo.ListItemLabel {
public ListItemLabel(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Marker.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -43,9 +43,14 @@
public class Marker extends FObjMixed implements org.axsl.foR.fo.Marker {
public Marker(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ protected void validateAncestry() throws FOTreeException {
// Validate that we are inside an fo:flow.
if (getFlow(null) == null) {
throwException(getFullName() + " must be descendant of fo:flow.");
@@ -67,13 +72,6 @@
/**
* {@inheritDoc}
*/
- protected void validateAncestry() throws FOTreeException {
- return;
- }
-
- /**
- * {@inheritDoc}
- */
protected void validateProperties() throws FOTreeException {
return;
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiCase.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,8 +39,7 @@
public class MultiCase extends FObj implements org.axsl.foR.fo.MultiCase {
public MultiCase(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiProperties.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,8 +39,7 @@
implements org.axsl.foR.fo.MultiProperties {
public MultiProperties(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiPropertySet.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,8 +39,7 @@
implements org.axsl.foR.fo.MultiPropertySet {
public MultiPropertySet(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiSwitch.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,8 +39,7 @@
implements org.axsl.foR.fo.MultiSwitch {
public MultiSwitch(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/MultiToggle.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -40,8 +40,7 @@
implements org.axsl.foR.fo.MultiToggle {
public MultiToggle(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterReference.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageMasterReference.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -27,9 +27,7 @@
import org.foray.fotree.FObj;
import org.foray.fotree.PropertyList;
-import org.axsl.foR.FOTreeException;
-
/**
* Abstract base class for PageMasterReference classes.
* Provides implementation for handling the master-reference attribute and
@@ -40,7 +38,7 @@
public PageMasterReference(final FObj parent,
final PropertyList propertyList, final String systemId,
- final int line, final int column) throws FOTreeException {
+ final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumber.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -41,8 +41,7 @@
public class PageNumber extends FObj implements org.axsl.foR.fo.PageNumber {
public PageNumber(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageNumberCitation.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -44,7 +44,7 @@
public PageNumberCitation(final FObj parent,
final PropertyList propertyList, final String systemId,
- final int line, final int column) throws FOTreeException {
+ final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequence.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -65,12 +65,8 @@
private SimplePageMaster simplePageMaster;
public PageSequence(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- if (!(parent instanceof Root)) {
- throwException(getFullName() + " must be child of fo:root.");
- }
flowMap = new HashMap();
}
@@ -78,7 +74,9 @@
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ if (!(this.getParent() instanceof Root)) {
+ throwException(getFullName() + " must be child of fo:root.");
+ }
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/PageSequenceMaster.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -50,22 +50,18 @@
// but the actual FO's are MasterReferences.
public PageSequenceMaster(final FObj parent,
final PropertyList propertyList, final String systemId,
- final int line, final int column) throws FOTreeException {
+ final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- /* Validate ancestry. */
- if (!(parent instanceof LayoutMasterSet)) {
- throwException(getFullName() + " must be child "
- + "of fo:layout-master-set.");
- }
- currentSubSequenceNumber = -1;
- currentSubSequence = null;
}
/**
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ if (!(this.getParent() instanceof LayoutMasterSet)) {
+ throwException(getFullName() + " must be child "
+ + "of fo:layout-master-set.");
+ }
}
/**
@@ -83,6 +79,8 @@
}
public void start() throws FOTreeException {
+ currentSubSequenceNumber = -1;
+ currentSubSequence = null;
/* Validate properties. */
final String masterName = this.traitMasterName();
if (masterName == null) {
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Region.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -37,20 +37,18 @@
public abstract class Region extends FObj implements org.axsl.foR.fo.Region {
protected Region(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- if (! (parent instanceof SimplePageMaster)) {
- throwException(getFullName() + " must be child of "
- + "simple-page-master.");
- }
}
/**
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ if (! (this.getParent() instanceof SimplePageMaster)) {
+ throwException(getFullName() + " must be child of "
+ + "simple-page-master.");
+ }
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionAfter.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -40,9 +40,14 @@
implements org.axsl.foR.fo.RegionAfter {
public RegionAfter(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start() throws FOTreeException {
getPageMaster().addRegionAfter(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBefore.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -40,9 +40,14 @@
implements org.axsl.foR.fo.RegionBefore {
public RegionBefore(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start() throws FOTreeException {
getPageMaster().addRegionBefore(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionBody.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -40,9 +40,14 @@
implements org.axsl.foR.fo.RegionBody {
public RegionBody(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start() throws FOTreeException {
getPageMaster().addRegionBody(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionEnd.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,9 +39,14 @@
public class RegionEnd extends Region implements org.axsl.foR.fo.RegionEnd {
public RegionEnd(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start() throws FOTreeException {
getPageMaster().addRegionEnd(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RegionStart.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -40,9 +40,14 @@
implements org.axsl.foR.fo.RegionStart {
public RegionStart(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void start() throws FOTreeException {
getPageMaster().addRegionStart(this);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMAlternatives.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -47,20 +47,18 @@
public RepeatablePMAlternatives(final FObj parent,
final PropertyList propertyList, final String systemId,
- final int line, final int column) throws FOTreeException {
+ final int line, final int column) {
super(parent, propertyList, systemId, line, column);
-
- if (! (parent instanceof PageSequenceMaster)) {
- throwException(getFullName() + " must be child of "
- + "fo:page-sequence-master.");
- }
}
/**
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ if (! (this.getParent() instanceof PageSequenceMaster)) {
+ throwException(getFullName() + " must be child of "
+ + "fo:page-sequence-master.");
+ }
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RepeatablePMReference.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -47,20 +47,18 @@
public RepeatablePMReference(final FObj parent,
final PropertyList propertyList, final String systemId,
- final int line, final int column) throws FOTreeException {
+ final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- /* Validate ancestry. */
- if (! (parent instanceof PageSequenceMaster)) {
- throwException(getFullName() + " must be child of "
- + "fo:page-sequence-master.");
- }
}
/**
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ if (! (this.getParent() instanceof PageSequenceMaster)) {
+ throwException(getFullName() + " must be child of "
+ + "fo:page-sequence-master.");
+ }
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/RetrieveMarker.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -39,8 +39,7 @@
implements org.axsl.foR.fo.RetrieveMarker {
public RetrieveMarker(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/Root.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -65,19 +65,17 @@
private HashMap unmatchedReferences = new HashMap();
public Root(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- if (parent != null) {
- throwException(getFullName() + " cannot have a parent.");
- }
}
/**
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ if (this.getParent() != null) {
+ throwException(getFullName() + " cannot have a parent.");
+ }
}
/**
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SimplePageMaster.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -49,8 +49,7 @@
private RegionBody regionBody;
public SimplePageMaster(final FObj parent, final PropertyList propertyList,
- final String systemId, final int line, final int column)
- throws FOTreeException {
+ final String systemId, final int line, final int column) {
super(parent, propertyList, systemId, line, column);
}
Modified: trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java
===================================================================
--- trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2006-09-02 22:07:15 UTC (rev 7857)
+++ trunk/foray/foray-fotree/src/java/org/foray/fotree/fo/obj/SinglePageMasterReference.java 2006-09-02 22:47:16 UTC (rev 7858)
@@ -45,20 +45,18 @@
public SinglePageMasterReference(final FObj parent,
final PropertyList propertyList, final String systemId,
- final int line, final int column) throws FOTreeException {
+ final int line, final int column) {
super(parent, propertyList, systemId, line, column);
- /* Validate ancestry. */
- if (! (parent instanceof PageSequenceMaster)) {
- throwException(getFullName() + " must be child of "
- + "fo:page-sequence-master.");
- }
}
/**
* {@inheritDoc}
*/
protected void validateAncestry() throws FOTreeException {
- return;
+ if (! (this.getParent() instanceof PageSequenceMast...
[truncated message content] |
