jeremias 2003/02/25 06:59:13 Modified: src/org/apache/fop/render Tag: fop-0_20_2-maintain AbstractRenderer.java PrintRenderer.java Renderer.java Log: Switched to long licence Cleanup of tab characters where necessary Cleanup of unused imports where necessary Revision Changes Path No revision No revision 1.4.2.9 +53 -12 xml-fop/src/org/apache/fop/render/AbstractRenderer.java Index: AbstractRenderer.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/AbstractRenderer.java,v retrieving revision 1.4.2.8 retrieving revision 1.4.2.9 diff -u -r1.4.2.8 -r1.4.2.9 --- AbstractRenderer.java 11 Feb 2003 14:04:35 -0000 1.4.2.8 +++ AbstractRenderer.java 25 Feb 2003 14:59:12 -0000 1.4.2.9 @@ -1,17 +1,59 @@ /* * $Id$ - * Copyright (C) 2001-2002 The Apache Software Foundation. All rights reserved. - * For details on use and redistribution please refer to the - * LICENSE file included with these sources. - */ - + * ============================================================================ + * 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/>. + */ package org.apache.fop.render; // FOP import org.apache.fop.image.ImageArea; import org.apache.fop.image.FopImage; import org.apache.fop.image.FopImageException; -import org.apache.fop.apps.FOPException; import org.apache.fop.fo.properties.*; import org.apache.fop.layout.*; import org.apache.fop.layout.inline.*; @@ -21,9 +63,8 @@ import org.apache.avalon.framework.logger.Logger; // Java -import java.io.IOException; -import java.io.OutputStream; import java.util.List; + /** * Abstract base class for all renderers. * @@ -452,9 +493,9 @@ */ public void renderLineArea(LineArea area) { if (area.pendingWidth > 0) { - final String pageNumber = (area.getPage() != null - ? area.getPage().getFormattedNumber() - : "<unknown>"); + final String pageNumber = (area.getPage() != null + ? area.getPage().getFormattedNumber() + : "<unknown>"); log.error("Areas pending, text probably lost. Check Page " + pageNumber + " and following page."); 1.14.2.6 +53 -11 xml-fop/src/org/apache/fop/render/PrintRenderer.java Index: PrintRenderer.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/PrintRenderer.java,v retrieving revision 1.14.2.5 retrieving revision 1.14.2.6 diff -u -r1.14.2.5 -r1.14.2.6 --- PrintRenderer.java 19 Nov 2002 01:04:11 -0000 1.14.2.5 +++ PrintRenderer.java 25 Feb 2003 14:59:12 -0000 1.14.2.6 @@ -1,20 +1,59 @@ /* * $Id$ - * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. - * For details on use and redistribution please refer to the - * LICENSE file included with these sources." - */ - -// PrintRenderer is an abstract base class for renderers that produce printed type output. -// Subclasses would be PDFRenderer, PCLRenderer and similar renderers. - + * ============================================================================ + * 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/>. + */ package org.apache.fop.render; // FOP import org.apache.fop.pdf.PDFPathPaint; import org.apache.fop.pdf.PDFColor; import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.properties.*; import org.apache.fop.layout.*; import org.apache.fop.layout.inline.*; import org.apache.fop.datatypes.*; @@ -27,6 +66,9 @@ import java.io.IOException; import java.io.OutputStream; +// PrintRenderer is an abstract base class for renderers that produce printed type output. +// Subclasses would be PDFRenderer, PCLRenderer and similar renderers. + /** * Abstract base class of "Print" type renderers. * @@ -196,7 +238,7 @@ w = w + area.getPaddingLeft() + area.getPaddingRight(); h = h + area.getPaddingTop() + area.getPaddingBottom(); - doBackground(area, rx, ry, w, h); + doBackground(area, rx, ry, w, h); // rx = rx - area.getBorderLeftWidth(); // ry = ry + area.getBorderTopWidth(); 1.19.2.6 +71 -27 xml-fop/src/org/apache/fop/render/Renderer.java Index: Renderer.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/Renderer.java,v retrieving revision 1.19.2.5 retrieving revision 1.19.2.6 diff -u -r1.19.2.5 -r1.19.2.6 --- Renderer.java 8 Nov 2002 10:25:27 -0000 1.19.2.5 +++ Renderer.java 25 Feb 2003 14:59:12 -0000 1.19.2.6 @@ -1,9 +1,53 @@ /* * $Id$ - * Copyright (C) 2001-2002 The Apache Software Foundation. All rights reserved. - * For details on use and redistribution please refer to the - * LICENSE file included with these sources. - */ + * ============================================================================ + * 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/>. + */ package org.apache.fop.render; // FOP @@ -31,104 +75,104 @@ /** * Set the logger */ - public void setLogger(Logger logger); + void setLogger(Logger logger); /** * set up the given FontInfo */ - public void setupFontInfo(FontInfo fontInfo) throws FOPException; + void setupFontInfo(FontInfo fontInfo) throws FOPException; /** * set up renderer options */ - public void setOptions(java.util.Map options); + void setOptions(java.util.Map options); /** * set the producer of the rendering */ - public void setProducer(String producer); + void setProducer(String producer); /** * render the given area tree to the given stream */ - //public void render(AreaTree areaTree, OutputStream stream) throws IOException, FOPException; - public void render(Page page, OutputStream stream) + //void render(AreaTree areaTree, OutputStream stream) throws IOException, FOPException; + void render(Page page, OutputStream stream) throws IOException, FOPException; /** * render the given area container */ - public void renderAreaContainer(AreaContainer area); + void renderAreaContainer(AreaContainer area); /** * render the given area container */ - public void renderBodyAreaContainer(BodyAreaContainer area); + void renderBodyAreaContainer(BodyAreaContainer area); /** * render the given region area container */ - public void renderRegionAreaContainer(AreaContainer area); + void renderRegionAreaContainer(AreaContainer area); /** * render the given span area */ - public void renderSpanArea(SpanArea area); + void renderSpanArea(SpanArea area); /** * render the given block area */ - public void renderBlockArea(BlockArea area); + void renderBlockArea(BlockArea area); /** * render the given display space */ - public void renderDisplaySpace(DisplaySpace space); + void renderDisplaySpace(DisplaySpace space); /** * render the given SVG area */ - public void renderSVGArea(SVGArea area); + void renderSVGArea(SVGArea area); /** * render a foreign object area */ - public void renderForeignObjectArea(ForeignObjectArea area); + void renderForeignObjectArea(ForeignObjectArea area); /** * render the given image area */ - public void renderImageArea(ImageArea area); + void renderImageArea(ImageArea area); /** * render the given inline area */ - public void renderWordArea(WordArea area); + void renderWordArea(WordArea area); /** * render the given inline space */ - public void renderInlineSpace(InlineSpace space); + void renderInlineSpace(InlineSpace space); /** * render the given line area */ - public void renderLineArea(LineArea area); + void renderLineArea(LineArea area); /** * render the given page */ - public void renderPage(Page page); + void renderPage(Page page); /** * render the given leader area */ - public void renderLeaderArea(LeaderArea area); + void renderLeaderArea(LeaderArea area); - public void startRenderer(OutputStream outputStream) + void startRenderer(OutputStream outputStream) throws IOException; - public void stopRenderer(OutputStream outputStream) + void stopRenderer(OutputStream outputStream) throws IOException; }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]