pbwest 2004/01/26 18:01:17 Modified: src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design FOTree.java Log: Updated license to 2.0. Changed PreOrder arguments to match changes to Node. Revision Changes Path No revision No revision 1.1.2.5 +20 -55 xml-fop/src/java/org/apache/fop/fo/Attic/FOTree.java Index: FOTree.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/Attic/FOTree.java,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -r1.1.2.4 -r1.1.2.5 --- FOTree.java 20 Jan 2004 05:45:55 -0000 1.1.2.4 +++ FOTree.java 27 Jan 2004 02:01:17 -0000 1.1.2.5 @@ -1,58 +1,20 @@ /* + 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 - * [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/>. - * - * * Created: Thu Aug 2 20:29:57 2001 - * - * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a> - * @version $Id$ */ package org.apache.fop.fo; @@ -69,6 +31,9 @@ /** * <tt>FOTree</tt> is the class that generates and maintains the FO Tree. * It runs as a thread, so it implements the <tt>run()</tt> method. + * + * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a> + * @version $Id$ */ public class FOTree extends Tree implements Runnable { @@ -177,7 +142,7 @@ (System.currentTimeMillis() - org.apache.fop.apps.Fop.startTime)); // DEBUG - FONode.PreOrder preorder = foRoot.new PreOrder(getModCount()); + FONode.PreOrder preorder = foRoot.new PreOrder(); int nodecount = 0; while (preorder.hasNext()) { nodecount++;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]