Removed references to modCount, used for

ConcurrentModificationException detection.  Removed
references to the setting of the containing Tree instance in
Nodes.
Updated license to 2.0.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@197263 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/datastructs/Tree.java b/src/java/org/apache/fop/datastructs/Tree.java
index 035da572fbc6a2863247f0ece01037901b7e4ee2..c88712449080b501272d9efec949116b2289242a 100644 (file)
--- a/src/java/org/apache/fop/datastructs/Tree.java
+++ b/src/java/org/apache/fop/datastructs/Tree.java
@@ -1,55 +1,19 @@
 /*
+   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.
+
  * $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
- *    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 <jtauber@jtauber.com>. For more  information on the Apache 
- * Software Foundation, please see <http://www.apache.org/>.
- *  
- *
  */
 
 package org.apache.fop.datastructs;
@@ -73,18 +37,6 @@ package org.apache.fop.datastructs;
 
 public class Tree {
 
-    /**
-     * The number of times the tree has been <i>structurally modified</i>.
-     * See the discussion of the <tt>modCount</tt> field in
-     * <tt>AbstractList</tt>.
-     */
-    protected int modCount = 0;
-
-    /**
-     * Count of the nodes in this tree.
-     */
-    //protected int nodeCount = 0;
-    
     /**
      * The root node of this tree.
      */
@@ -93,51 +45,9 @@ public class Tree {
     public Tree() {}
 
     public Tree(Node subtree) {
-        subtree.setSubTreeTree(this);
         root = subtree;
     }
 
-    public int modified() {
-        // In the Tree class, this function updates the modCount
-        // N.B. This method is always called from within a synchronized
-        // method.
-        synchronized (this) {
-            return ++modCount;
-        }
-    }
-
-    /**
-     * Get the value of the <i>modCount</i> field, used to warn of concurrent
-     * modification of the tree during certain unsynchronized operations.
-     * @return - the <tt>int</tt> <i>modCount</i>.
-     */
-    public int getModCount() {
-        synchronized (this) {
-            return modCount;
-        }
-    }
-
-    /**
-     * Test the <i>modCount</i> field value.
-     * @param value - the value to test against <i>modCount</i>.
-     * @return <tt>boolean</tt> test result.
-     */
-    public boolean modCountEqualTo(int value) {
-        synchronized (this) {
-            return value == modCount;
-        }
-    }
-
-    /**
-     * Get the number of nodes in the tree.
-     * @return the number of nodes.
-     */
-    /*
-    public int size() {
-        return nodeCount;
-    }
-    */
-
     /**
      * Is the tree empty?
      * @return <tt>boolean</tt> answer to the question.  Tests whether the