From: Peter Bernard West Date: Mon, 26 Jan 2004 23:19:06 +0000 (+0000) Subject: Changes to accommodate new Tree and Node. X-Git-Tag: Alt-Design_pre_awt_renderer_import~93 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5c9802b65c3c3d68acf76a2571e17d8d1c193812;p=xmlgraphics-fop.git Changes to accommodate new Tree and Node. Updates license to 2.0. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197264 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/fop/datastructs/TNode.java b/src/java/org/apache/fop/datastructs/TNode.java index 7b21a30dd..355fb0378 100644 --- a/src/java/org/apache/fop/datastructs/TNode.java +++ b/src/java/org/apache/fop/datastructs/TNode.java @@ -1,59 +1,18 @@ /* - * TNode.java - * - * Created: Sat Oct 27 13:44:34 2001 - * - * - * ============================================================================ - * 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 - * apache@apache.org. - * - * 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 . For more information on the Apache - * Software Foundation, please see . - * - * - * @author Peter B. West - * @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; @@ -62,42 +21,39 @@ package org.apache.fop.datastructs; /** * A testbed for Node. + * + * @author Peter B. West + * @version $Revision$ $Name$ */ public class TNode extends Node { private Object content = null; - public TNode (Tree tree) throws TreeException { - super(tree); + public TNode () { + super(); } - public TNode(Tree tree, TNode parent, int index) - throws TreeException { - super(tree, parent, index); + public TNode(Tree tree, TNode parent, int index) { + super(parent, index); } - public TNode(Tree tree, TNode parent) throws TreeException { - super(tree, parent); + public TNode(TNode parent) { + super(parent); } /** - * @param tree the enclosing Tree instance. Needed to enable - * the call to the superclass constructor. * @param parent The parent TNode of this TNode. If null, * this must be the root node. * @param content An object which is the actual content of this node; * the contents of the TNode. */ - public TNode(Tree tree, TNode parent, Object content) - throws TreeException { - super(tree, parent); + public TNode(TNode parent, Object content) { + super(parent); this.content = content; } /** - * @param tree the enclosing Tree instance. Needed to enable - * the call to the superclass constructor. * @param parent The parent TNode of this TNode. If null, * this must be the root node. * @param index int index of this child in the parent node. @@ -105,9 +61,9 @@ public class TNode extends Node { * the contents of the TNode. */ - public TNode(Tree tree, TNode parent, int index, Object content) - throws TreeException, IndexOutOfBoundsException { - super(tree, parent, index); + public TNode(TNode parent, int index, Object content) + throws IndexOutOfBoundsException { + super(parent, index); this.content = content; }