Explorar el Código

remove remaining references to layout/PageMaster (all unused), and remove the class itself


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196859 13f79535-47bb-0310-9956-ffa450edef68
pull/30/head
William Victor Mote hace 21 años
padre
commit
e4773f1891

+ 0
- 14
src/java/org/apache/fop/fo/pagination/SimplePageMaster.java Ver fichero

@@ -62,7 +62,6 @@ import org.xml.sax.Attributes;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.FObj;
import org.apache.fop.fo.FOTreeVisitor;
import org.apache.fop.layout.PageMaster;
import org.apache.fop.apps.FOPException;

/**
@@ -76,7 +75,6 @@ public class SimplePageMaster extends FObj {
*/
private Map regions;

private PageMaster pageMaster;
private String masterName;

/**
@@ -117,18 +115,6 @@ public class SimplePageMaster extends FObj {
return true;
}

/**
* Returns the page master.
* @return the page master
*/
public PageMaster getPageMaster() {
return this.pageMaster;
}

public void setPageMaster(PageMaster pageMaster) {
this.pageMaster = pageMaster;
}

/**
* Returns the name of the simple-page-master.
* @return the page master name

+ 0
- 68
src/java/org/apache/fop/layout/PageMaster.java Ver fichero

@@ -1,68 +0,0 @@
/*
* $Id: PageMaster.java,v 1.15 2003/03/06 22:19:16 jeremias Exp $
* ============================================================================
* 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
* 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 <jtauber@jtauber.com>. For more information on the Apache
* Software Foundation, please see <http://www.apache.org/>.
*/
package org.apache.fop.layout;

import org.apache.fop.area.PageViewport;

public class PageMaster {

private PageViewport pageVP;

public PageMaster(PageViewport pageVP) {
this.pageVP = pageVP;
}

// make a clone of the master
public PageViewport makePage() {
return (PageViewport)pageVP.clone();
}

}

+ 0
- 2
src/java/org/apache/fop/layoutmgr/PageLayoutManager.java Ver fichero

@@ -82,8 +82,6 @@ import org.apache.fop.fo.pagination.StaticContent;
import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.fo.properties.Constants;

import org.apache.fop.layout.PageMaster;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;

Cargando…
Cancelar
Guardar