pbwest 2002/11/04 06:54:56
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FONode.java
FoRoot.java
Log:
Node and TreeException extracted from Tree.
Revision Changes Path
No revision
No revision
1.19.2.21 +7 -6 xml-fop/src/org/apache/fop/fo/FONode.java
Index: FONode.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/FONode.java,v
retrieving revision 1.19.2.20
retrieving revision 1.19.2.21
diff -u -r1.19.2.20 -r1.19.2.21
--- FONode.java 30 Oct 2002 14:41:49 -0000 1.19.2.20
+++ FONode.java 4 Nov 2002 14:54:56 -0000 1.19.2.21
@@ -14,7 +14,8 @@
import org.apache.fop.datatypes.TextDecorations;
import org.apache.fop.datatypes.indirect.Inherit;
import org.apache.fop.datatypes.indirect.IndirectValue;
-import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.Node;
+import org.apache.fop.datastructs.TreeException;
import org.apache.fop.datastructs.ROBitSet;
import org.apache.fop.apps.FOPException;
import org.apache.fop.xml.FoXMLEvent;
@@ -46,7 +47,7 @@
* Class for nodes in the FO tree.
*/
-public class FONode extends FOTree.Node{
+public class FONode extends Node{
private static final String tag = "$Name$";
private static final String revision = "$Revision$";
@@ -135,9 +136,9 @@
public FONode
(FOTree foTree, int type, FONode parent, FoXMLEvent event, int attrSet,
HashMap sparsePropsMap, int[] sparseIndices, int numProps)
- throws Tree.TreeException, FOPException, PropertyException
+ throws TreeException, FOPException, PropertyException
{
- foTree.super(parent);
+ super(foTree, parent);
this.foTree = foTree;
this.type = type;
this.parent = parent;
1.1.2.13 +6 -6 xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java
Index: FoRoot.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FoRoot.java,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- FoRoot.java 30 Oct 2002 14:35:11 -0000 1.1.2.12
+++ FoRoot.java 4 Nov 2002 14:54:56 -0000 1.1.2.13
@@ -13,7 +13,7 @@
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
-import org.apache.fop.datastructs.Tree;
+import org.apache.fop.datastructs.TreeException;
import org.apache.fop.datatypes.Ints;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
@@ -78,7 +78,7 @@
*/
public FoRoot
(FOTree foTree, FoXMLEvent event)
- throws Tree.TreeException, FOPException, PropertyException
+ throws TreeException, FOPException, PropertyException
{
// This is the root node of the tree; hence the null argument
super(foTree, FObjectNames.ROOT, null, event, FOPropertySets.ROOT_SET,
@@ -125,7 +125,7 @@
layoutMasters = new FoLayoutMasterSet(foTree, this, ev);
// Clean up the fo:layout-master-set event
xmlevents.getEndElement(ev);
- } catch(Tree.TreeException e) {
+ } catch(TreeException e) {
throw new FOPException("TreeException: " + e.getMessage());
} catch(PropertyException e) {
throw new FOPException("PropertyException: " + e.getMessage());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
