From 180e00d9932248dd29cf572fb3b8e81df847c422 Mon Sep 17 00:00:00 2001 From: William Victor Mote Date: Wed, 10 Sep 2003 06:25:36 +0000 Subject: [PATCH] remove unneeded reference to Renderer from within the area package git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196899 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/apps/Driver.java | 3 ++- src/java/org/apache/fop/area/AreaTree.java | 31 +++++++--------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java index 266120447..6261b4ec7 100644 --- a/src/java/org/apache/fop/apps/Driver.java +++ b/src/java/org/apache/fop/apps/Driver.java @@ -52,6 +52,7 @@ package org.apache.fop.apps; // 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 @@ public class Driver implements LogEnabled { 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 { diff --git a/src/java/org/apache/fop/area/AreaTree.java b/src/java/org/apache/fop/area/AreaTree.java index 8c499c733..a5585494a 100644 --- a/src/java/org/apache/fop/area/AreaTree.java +++ b/src/java/org/apache/fop/area/AreaTree.java @@ -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 * 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 @@ -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 . For more information on the Apache * Software Foundation, please see . - */ + */ package org.apache.fop.area; -import org.apache.fop.render.Renderer; - import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -88,15 +86,6 @@ public class AreaTree { 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. * @return StorePagesModel the new model -- 2.39.5