cvs commit: xml-fop/src/java/org/apache/fop/datastructs TNode.java

2004-01-27 Thread pbwest
pbwest  2004/01/27 22:26:40

  Modified:src/java/org/apache/fop/datastructs Tag:
FOP_0-20-0_Alt-Design TNode.java
  Log:
  Fixed copyright dates.
  Synchronized with changes to Node.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.3   +6 -6  xml-fop/src/java/org/apache/fop/datastructs/Attic/TNode.java
  
  Index: TNode.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datastructs/Attic/TNode.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- TNode.java26 Jan 2004 23:19:06 -  1.1.2.2
  +++ TNode.java28 Jan 2004 06:26:40 -  1.1.2.3
  @@ -1,5 +1,5 @@
   /*
  -   Copyright 2004 The Apache Software Foundation.
  +   Copyright 2002-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.
  @@ -34,11 +34,11 @@
   }
   
   public TNode(Tree tree, TNode parent, int index) {
  -super(parent, index);
  +super(parent, index, Node.SYNCHRONIZE);
   }
   
   public TNode(TNode parent) {
  -super(parent);
  +super(parent, Node.SYNCHRONIZE);
   }
   
   /**
  @@ -49,7 +49,7 @@
*/
   
   public TNode(TNode parent, Object content) {
  -super(parent);
  +super(parent, Node.SYNCHRONIZE);
   this.content = content;
   }
   
  @@ -63,7 +63,7 @@
   
   public TNode(TNode parent, int index, Object content)
   throws IndexOutOfBoundsException {
  -super(parent, index);
  +super(parent, index, Node.SYNCHRONIZE);
   this.content = content;
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: xml-fop/src/java/org/apache/fop/datastructs TNode.java

2004-01-26 Thread pbwest
pbwest  2004/01/26 15:19:06

  Modified:src/java/org/apache/fop/datastructs Tag:
FOP_0-20-0_Alt-Design TNode.java
  Log:
  Changes to accommodate new Tree and Node.
  Updates license to 2.0.
  
  Revision  ChangesPath
  No   revision
  No   revision
  1.1.2.2   +28 -72xml-fop/src/java/org/apache/fop/datastructs/Attic/TNode.java
  
  Index: TNode.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/datastructs/Attic/TNode.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- TNode.java5 Jul 2003 19:06:35 -   1.1.2.1
  +++ TNode.java26 Jan 2004 23:19:06 -  1.1.2.2
  @@ -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
  - *[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;
  @@ -62,42 +21,39 @@
   
   /**
* A testbed for ttNode/tt.
  + *
  + * @author a href=mailto:[EMAIL PROTECTED]Peter B. West/a
  + * @version $Revision$ $Name$
*/
   public class TNode extends Node {
   
   private Object content = null;
   
  -public TNode (Tree tree) throws TreeException {
  -super(tree);
  +public TNode () {
  +super();
   }
   
  -public