pbwest 2004/01/26 15:20:18
Modified: src/java/org/apache/fop/datastructs Tag:
FOP_0-20-0_Alt-Design TNodeTest.java
Log:
Changes to accommodate new TNode.
Updates license to 2.0.
Revision Changes Path
No revision
No revision
1.1.2.2 +58 -96 xml-fop/src/java/org/apache/fop/datastructs/Attic/TNodeTest.java
Index: TNodeTest.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/datastructs/Attic/TNodeTest.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- TNodeTest.java 5 Jul 2003 19:06:35 -0000 1.1.2.1
+++ TNodeTest.java 26 Jan 2004 23:20:18 -0000 1.1.2.2
@@ -1,59 +1,18 @@
/*
- * TNodeTest.java
- *
- * $Id$
- *
- *
- * ============================================================================
- * The Apache Software License, Version 1.1
- * ============================================================================
- *
- * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modifica-
- * tion, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 3. The end-user documentation included with the redistribution, if any, must
- * include the following acknowledgment: "This product includes software
- * developed by the Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself, if
- * and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "FOP" and "Apache Software Foundation" must not be used to
- * endorse or promote products derived from this software without prior
- * written permission. For written permission, please contact
- * [EMAIL PROTECTED]
- *
- * 5. Products derived from this software may not be called "Apache", nor may
- * "Apache" appear in their name, without prior written permission of the
- * Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * on behalf of the Apache Software Foundation and was originally created by
- * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
- * Software Foundation, please see <http://www.apache.org/>.
- *
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
- * @version $Revision$ $Name$
+ Copyright 2004 The Apache Software Foundation.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
*/
package org.apache.fop.datastructs;
@@ -61,6 +20,9 @@
/**
* A test class for <tt>TNode</tt>.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
+ * @version $Revision$ $Name$
*/
public class TNodeTest{
@@ -69,20 +31,20 @@
public static void main(String[] args)
throws TreeException {
Tree tree = new Tree();
- TNode root = new TNode(tree, null, "Root");
- TNode child1 = new TNode(tree, root, "1-1");
- TNode child2 = new TNode(tree, root, "1-2");
- TNode child3 = new TNode(tree, root, "1-3");
- TNode child2_1 = new TNode(tree, (TNode)root.getChild(1), "1-2-1");
- TNode child2_2 = new TNode(tree, (TNode)root.getChild(1), "1-2-2");
- TNode child3_1 = new TNode(tree, (TNode)root.getChild(2), "1-3-1");
- TNode child3_2 = new TNode(tree, (TNode)root.getChild(2), "1-3-2");
- TNode child3_3 = new TNode(tree, (TNode)root.getChild(2), "1-3-3");
- TNode child1_1 = new TNode(tree, (TNode)root.getChild(0), "1-1-1");
+ TNode root = new TNode(null, "Root");
+ TNode child1 = new TNode(root, "1-1");
+ TNode child2 = new TNode(root, "1-2");
+ TNode child3 = new TNode(root, "1-3");
+ TNode child2_1 = new TNode((TNode)root.getChild(1), "1-2-1");
+ TNode child2_2 = new TNode((TNode)root.getChild(1), "1-2-2");
+ TNode child3_1 = new TNode((TNode)root.getChild(2), "1-3-1");
+ TNode child3_2 = new TNode((TNode)root.getChild(2), "1-3-2");
+ TNode child3_3 = new TNode((TNode)root.getChild(2), "1-3-3");
+ TNode child1_1 = new TNode((TNode)root.getChild(0), "1-1-1");
System.out.println("Pre-order traversal:root:");
- preorder(root, tree.getModCount());
+ preorder(root);
System.out.println("Post-order traversal:root:");
- postorder(root, tree.getModCount());
+ postorder(root);
System.out.println("Preceding siblings 3-2");
precedingsibling(child3_2);
System.out.println("Following siblings 3-2");
@@ -100,17 +62,17 @@
System.out.println("Following siblings root");
followingsibling(root);
System.out.println("Pre-order traversal:2:");
- preorder(child2, tree.getModCount());
+ preorder(child2);
System.out.println("Post-order traversal:3:");
- postorder(child3, tree.getModCount());
+ postorder(child3);
System.out.println("Ancestors:3-2");
- ancestors(child3_2, tree.getModCount());
+ ancestors(child3_2);
// Check the copySubTree function
System.out.println("copySubTree child3 to child2_1");
child2_1.copySubTree(child3, 0);
System.out.println("Pre-order traversal:root:");
- preorder(root, tree.getModCount());
+ preorder(root);
System.out.println("copySubTree child3_3 to root");
try {
root.copySubTree(child3_3, 0);
@@ -119,7 +81,7 @@
}
System.out.println("Pre-order traversal:root:");
- preorder(root, tree.getModCount());
+ preorder(root);
System.out.println("copySubTree child3 to child3_3");
try {
child3_3.copySubTree(child3, 0);
@@ -128,37 +90,37 @@
}
System.out.println("Pre-order traversal:root:");
- preorder(root, tree.getModCount());
+ preorder(root);
// Test the cutSubTree method
System.out.println("cutSubTree child2_1");
- TNode subtree = (TNode)(child2_1.cutSubTree());
+ TNode subtree = (TNode)(child2_1.deleteSubTree());
Tree tree2 = new Tree(subtree);
System.out.println("Pre-order traversal:tree2.getRoot():");
- preorder((TNode)(tree2.getRoot()), tree2.getModCount());
+ preorder((TNode)(tree2.getRoot()));
System.out.println("Post-order traversal:tree2.getRoot():");
- postorder((TNode)(tree2.getRoot()), tree2.getModCount());
+ postorder((TNode)(tree2.getRoot()));
System.out.println("Get the first child of tree 2 root");
TNode firstChild = (TNode)(tree2.getRoot().getChild(0));
System.out.println("Cut the first child of tree 2 root");
- subtree = (TNode)(firstChild.cutSubTree());
+ subtree = (TNode)(firstChild.deleteSubTree());
System.out.println("Pre-order traversal:tree2.getRoot():");
- preorder((TNode)(tree2.getRoot()), tree2.getModCount());
+ preorder((TNode)(tree2.getRoot()));
System.out.println("Post-order traversal:tree2.getRoot():");
- postorder((TNode)(tree2.getRoot()), tree2.getModCount());
+ postorder((TNode)(tree2.getRoot()));
System.out.println("Insert as first child of child2");
child2.addSubTree(0, subtree);
System.out.println("Pre-order traversal:root:");
- preorder(root, tree.getModCount());
+ preorder(root);
System.out.println("Post-order traversal:root:");
- postorder(root, tree.getModCount());
+ postorder(root);
// Test for fast-fail
System.out.println("Setting up PreOrder iterator");
- TNode.PreOrder iterator = root.new PreOrder(tree.getModCount());
+ TNode.PreOrder iterator = root.new PreOrder();
System.out.println("Adding child4");
- TNode child4 = new TNode(tree, root, "1-4");
+ TNode child4 = new TNode(root, "1-4");
System.out.println("Iterating");
try {
while (iterator.hasNext()) {
@@ -172,7 +134,7 @@
TNode.FollowingSibling listiterator =
child3_2.new FollowingSibling();
System.out.println("Perturbing child3-2 parent; adding 3-4");
- TNode child3_4 = new TNode(tree, child3, "1-3-3");
+ TNode child3_4 = new TNode(child3, "1-3-3");
try {
while (listiterator.hasNext()) {
TNode next = (TNode) listiterator.next();
@@ -184,9 +146,9 @@
System.out.println("Setting up Ancestor Iterator on 1-1");
TNode.Ancestor aiterator =
- child1_1.new Ancestor(tree.getModCount());
+ child1_1.new Ancestor();
System.out.println("Perturbing root; adding 5");
- TNode child5 = new TNode(tree, root, "1-5");
+ TNode child5 = new TNode(root, "1-5");
try {
while (aiterator.hasNext()) {
TNode next = (TNode) aiterator.next();
@@ -197,35 +159,35 @@
}
System.out.println("Delete child1 nodes");
- int delcount = child1.deleteSubTree();
+ int delcount = child1.deleteCountSubTree();
System.out.println("# deleted: "+delcount);
System.out.println("Pre-order traversal:root:");
- preorder((TNode)tree.getRoot(), tree.getModCount());
+ preorder((TNode)tree.getRoot());
System.out.println("Delete all nodes");
- delcount = root.deleteSubTree();
+ delcount = root.deleteCountSubTree();
System.out.println("# deleted: "+delcount);
System.out.println("Pre-order traversal:root:");
- preorder((TNode)tree.getRoot(), tree.getModCount());
+ preorder((TNode)tree.getRoot());
}
- private static void preorder(TNode node, int age) {
- TNode.PreOrder iterator = node.new PreOrder(age);
+ private static void preorder(TNode node) {
+ TNode.PreOrder iterator = node.new PreOrder();
while (iterator.hasNext()) {
TNode next = (TNode) iterator.next();
System.out.println((String)next.getContent());
}
}
- private static void postorder(TNode node, int age) {
- TNode.PostOrder iterator = node.new PostOrder(age);
+ private static void postorder(TNode node) {
+ TNode.PostOrder iterator = node.new PostOrder();
while (iterator.hasNext()) {
TNode next = (TNode) iterator.next();
System.out.println((String)next.getContent());
}
}
- private static void ancestors(TNode node, int age) {
- TNode.Ancestor iterator = node.new Ancestor(age);
+ private static void ancestors(TNode node) {
+ TNode.Ancestor iterator = node.new Ancestor();
while (iterator.hasNext()) {
TNode next = (TNode) iterator.next();
System.out.println((String)next.getContent());
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
