vmote       2003/09/09 23:25:36

  Modified:    src/java/org/apache/fop/apps Driver.java
               src/java/org/apache/fop/area AreaTree.java
  Log:
  remove unneeded reference to Renderer from within the area package
  
  Revision  Changes    Path
  1.39      +2 -1      xml-fop/src/java/org/apache/fop/apps/Driver.java
  
  Index: Driver.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Driver.java       2 Sep 2003 13:56:40 -0000       1.38
  +++ Driver.java       10 Sep 2003 06:25:36 -0000      1.39
  @@ -52,6 +52,7 @@
   
   // FOP
   import org.apache.fop.area.AreaTree;
  +import org.apache.fop.area.RenderPagesModel;
   
   import org.apache.fop.fo.ElementMapping;
   import org.apache.fop.fo.FOTreeBuilder;
  @@ -588,7 +589,7 @@
                   FOTreeHandler foTreeHandler = (FOTreeHandler)foInputHandler;
                   foTreeHandler.addFOTreeListener(currentDocument);
                   currentDocument.areaTree = new AreaTree();
  -                currentDocument.atModel = AreaTree.createRenderPagesModel(renderer);
  +                currentDocument.atModel = new RenderPagesModel(renderer);
                   //this.atModel = new CachedRenderPagesModel(renderer);
                   currentDocument.areaTree.setTreeModel(currentDocument.atModel);
                   try {
  
  
  
  1.2       +10 -21    xml-fop/src/java/org/apache/fop/area/AreaTree.java
  
  Index: AreaTree.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/AreaTree.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AreaTree.java     11 Mar 2003 13:05:27 -0000      1.1
  +++ AreaTree.java     10 Sep 2003 06:25:36 -0000      1.2
  @@ -3,34 +3,34 @@
    * ============================================================================
    *                    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
  @@ -42,16 +42,14 @@
    * (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/>.
  - */ 
  + */
   package org.apache.fop.area;
   
  -import org.apache.fop.render.Renderer;
  -
   import java.util.ArrayList;
   import java.util.List;
   import java.util.Map;
  @@ -87,15 +85,6 @@
       // list of id's yet to be resolved and arraylists of pages
       private Map resolve = new HashMap();
       private List treeExtensions = new ArrayList();
  -
  -    /**
  -     * Create a render pages area tree model.
  -     * @param rend the renderer that will be used
  -     * @return RenderPagesModel the new area tree model
  -     */
  -    public static RenderPagesModel createRenderPagesModel(Renderer rend) {
  -        return new RenderPagesModel(rend);
  -    }
   
       /**
        * Create a new store pages model.
  
  
  

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

Reply via email to