pbwest      2004/01/26 17:17:21

  Modified:    src/java/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
                        FONode.java
  Log:
  Added direct foTree reference, instead of relying on
  Tree reference in superclass.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.2.12  +25 -53    xml-fop/src/java/org/apache/fop/fo/FONode.java
  
  Index: FONode.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/FONode.java,v
  retrieving revision 1.2.2.11
  retrieving revision 1.2.2.12
  diff -u -r1.2.2.11 -r1.2.2.12
  --- FONode.java       25 Jan 2004 04:40:34 -0000      1.2.2.11
  +++ FONode.java       27 Jan 2004 01:17:21 -0000      1.2.2.12
  @@ -1,57 +1,20 @@
   /*
  - * ============================================================================
  - *                   The Apache Software License, Version 1.1
  - * ============================================================================
  - * 
  - * Copyright (C) 1999-2004 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/>.
  - *  
  - * FONode.java
  +   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.
  +
    * Created: Sat Nov 10 01:39:37 2001
    * $Id$
  - * 
  - * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
  - * @version $Revision$ $Name$
    */
   package org.apache.fop.fo;
   
  @@ -82,6 +45,9 @@
   
   /**
    * Class for nodes in the FO tree.
  + * 
  + * @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
  + * @version $Revision$ $Name$
    */
   
   public class FONode extends Node{
  @@ -143,6 +109,11 @@
           ROOT | DECLARATIONS | LAYOUT | SEQ_MASTER |
           PAGESEQ | FLOW | STATIC | TITLE | MC_MARKER;
   
  +    /**
  +     * The FO Tree
  +     */
  +    protected final FOTree foTree;
  +    
       /** The buffer from which parser events are drawn. */
       protected final XmlEventReader xmlevents;
   
  @@ -238,7 +209,8 @@
                int stateFlags, int[] sparsePropsMap, int[] sparseIndices)
           throws TreeException, FOPException, PropertyException
       {
  -        super(foTree, parent);
  +        super(parent);
  +        this.foTree = foTree;
           this.type = type;
           this.stateFlags = stateFlags;
           this.sparsePropsMap = sparsePropsMap;
  @@ -359,7 +331,7 @@
        * @return the <tt>FOTree</tt>.
        */
       public FOTree getFOTree() {
  -        return (FOTree)tree;
  +        return foTree;
       }
   
       /**
  
  
  

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

Reply via email to