keiron 01/08/20 23:18:56
Modified: src/org/apache/fop/apps CommandLineOptions.java
CommandLineStarter.java Driver.java
FOInputHandler.java Starter.java
TraxInputHandler.java XSLTInputHandler.java
src/org/apache/fop/render PrintRenderer.java Renderer.java
src/org/apache/fop/render/awt AWTRenderer.java
src/org/apache/fop/render/mif MIFRenderer.java
src/org/apache/fop/render/pcl PCLRenderer.java
src/org/apache/fop/render/pdf PDFRenderer.java
src/org/apache/fop/render/ps PSRenderer.java
src/org/apache/fop/render/txt TXTRenderer.java
src/org/apache/fop/render/xml XMLRenderer.java
src/org/apache/fop/tools TestConverter.java
src/org/apache/fop/tools/anttasks Fop.java
Added: src/org/apache/fop/render AbstractRenderer.java
Log:
changed to new logging for renderers
Revision Changes Path
1.12 +1 -2 xml-fop/src/org/apache/fop/apps/CommandLineOptions.java
Index: CommandLineOptions.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineOptions.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CommandLineOptions.java 2001/08/20 11:19:22 1.11
+++ CommandLineOptions.java 2001/08/21 06:18:54 1.12
@@ -1,5 +1,5 @@
/*
- * $Id: CommandLineOptions.java,v 1.11 2001/08/20 11:19:22 keiron Exp $
+ * $Id: CommandLineOptions.java,v 1.12 2001/08/21 06:18:54 keiron Exp $
* 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.
@@ -13,7 +13,6 @@
import java.io.FileNotFoundException;
// FOP
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.configuration.Configuration;
import org.apache.fop.apps.FOPException;
1.11 +1 -2 xml-fop/src/org/apache/fop/apps/CommandLineStarter.java
Index: CommandLineStarter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/CommandLineStarter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- CommandLineStarter.java 2001/08/20 11:19:22 1.10
+++ CommandLineStarter.java 2001/08/21 06:18:54 1.11
@@ -1,5 +1,5 @@
/*
- * $Id: CommandLineStarter.java,v 1.10 2001/08/20 11:19:22 keiron Exp $
+ * $Id: CommandLineStarter.java,v 1.11 2001/08/21 06:18:54 keiron Exp $
* 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.
@@ -21,7 +21,6 @@
// FOP
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.configuration.Configuration;
/**
1.33 +21 -16 xml-fop/src/org/apache/fop/apps/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Driver.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Driver.java 2001/08/20 11:19:22 1.32
+++ Driver.java 2001/08/21 06:18:54 1.33
@@ -1,5 +1,5 @@
/*
- * $Id: Driver.java,v 1.32 2001/08/20 11:19:22 keiron Exp $
+ * $Id: Driver.java,v 1.33 2001/08/21 06:18:54 keiron Exp $
* 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.
@@ -207,6 +207,23 @@
_treeBuilder.setLogger(log);
}
+ private Logger getLogger() {
+ if(log == null) {
+ Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
+ PatternFormatter formatter = new PatternFormatter(
+ "[%{priority}]: %{message}\n%{throwable}" );
+
+ LogTarget target = null;
+ target = new StreamTarget(System.out, formatter);
+
+ hierarchy.setDefaultLogTarget(target);
+ log = hierarchy.getLoggerFor("fop");
+ log.setPriority(Priority.INFO);
+ log.error("Logger not set");
+ }
+ return log;
+ }
+
/**
* Resets the Driver so it can be reused. Property and element
* mappings are reset to defaults.
@@ -327,6 +344,7 @@
* @param renderer the renderer instance to use
*/
public void setRenderer(Renderer renderer) {
+ renderer.setLogger(getLogger());
_renderer = renderer;
}
@@ -420,22 +438,8 @@
* events but isn't a SAX Parser itself.
*/
public ContentHandler getContentHandler() {
- if(log == null) {
- Hierarchy hierarchy = Hierarchy.getDefaultHierarchy();
- PatternFormatter formatter = new PatternFormatter(
- "[%{priority}]: %{message}\n%{throwable}" );
-
- LogTarget target = null;
- target = new StreamTarget(System.out, formatter);
-
- hierarchy.setDefaultLogTarget(target);
- log = hierarchy.getLoggerFor("fop");
- log.setPriority(Priority.INFO);
- log.error("Logger not set");
- }
-
StreamRenderer streamRenderer = new StreamRenderer(_stream, _renderer);
- streamRenderer.setLogger(log);
+ streamRenderer.setLogger(getLogger());
_treeBuilder.setStreamRenderer(streamRenderer);
return _treeBuilder;
@@ -487,6 +491,7 @@
*/
public void dumpError(Exception e) {
if (_errorDump) {
+ Logger log = getLogger();
if (e instanceof SAXException) {
log.error("", e);
if (((SAXException)e).getException() != null) {
1.6 +1 -4 xml-fop/src/org/apache/fop/apps/FOInputHandler.java
Index: FOInputHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/FOInputHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FOInputHandler.java 2001/08/14 08:50:47 1.5
+++ FOInputHandler.java 2001/08/21 06:18:54 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: FOInputHandler.java,v 1.5 2001/08/14 08:50:47 keiron Exp $
+ * $Id: FOInputHandler.java,v 1.6 2001/08/21 06:18:54 keiron Exp $
* 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.
@@ -10,9 +10,6 @@
// Imported SAX classes
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
-
-// fop
-import org.apache.fop.messaging.MessageHandler;
// java
import java.io.File;
1.6 +1 -4 xml-fop/src/org/apache/fop/apps/Starter.java
Index: Starter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/Starter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Starter.java 2001/08/20 11:19:22 1.5
+++ Starter.java 2001/08/21 06:18:54 1.6
@@ -1,5 +1,5 @@
/*
- * $Id: Starter.java,v 1.5 2001/08/20 11:19:22 keiron Exp $
+ * $Id: Starter.java,v 1.6 2001/08/21 06:18:54 keiron Exp $
* 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.
@@ -16,9 +16,6 @@
// Java
import java.io.*;
import java.net.URL;
-
-// FOP
-import org.apache.fop.messaging.MessageHandler;
/**
* abstract super class
1.5 +1 -4 xml-fop/src/org/apache/fop/apps/TraxInputHandler.java
Index: TraxInputHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/TraxInputHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TraxInputHandler.java 2001/07/30 20:29:18 1.4
+++ TraxInputHandler.java 2001/08/21 06:18:54 1.5
@@ -1,5 +1,5 @@
/*
- * $Id: TraxInputHandler.java,v 1.4 2001/07/30 20:29:18 tore Exp $
+ * $Id: TraxInputHandler.java,v 1.5 2001/08/21 06:18:54 keiron Exp $
* 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.
@@ -28,9 +28,6 @@
import java.io.InputStream;
import java.io.IOException;
import java.io.File;
-
-// FOP
-import org.apache.fop.messaging.MessageHandler;
/**
* XSLTInputHandler basically takes an xmlfile and transforms it with an xsltfile
1.7 +1 -2 xml-fop/src/org/apache/fop/apps/XSLTInputHandler.java
Index: XSLTInputHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/apps/XSLTInputHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSLTInputHandler.java 2001/07/30 20:29:18 1.6
+++ XSLTInputHandler.java 2001/08/21 06:18:54 1.7
@@ -1,5 +1,5 @@
/*
- * $Id: XSLTInputHandler.java,v 1.6 2001/07/30 20:29:18 tore Exp $
+ * $Id: XSLTInputHandler.java,v 1.7 2001/08/21 06:18:54 keiron Exp $
* 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.
@@ -19,7 +19,6 @@
import java.io.*;
// FOP
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.tools.xslt.XSLTransform;
/**
1.11 +2 -6 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PrintRenderer.java 2001/08/01 23:08:55 1.10
+++ PrintRenderer.java 2001/08/21 06:18:55 1.11
@@ -1,7 +1,5 @@
-/*--- formatted by Jindent 2.1, (www.c-lab.de/~jindent) ---*/
-
/*
- * $Id: PrintRenderer.java,v 1.10 2001/08/01 23:08:55 gears Exp $
+ * $Id: PrintRenderer.java,v 1.11 2001/08/21 06:18:55 keiron Exp $
* 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."
@@ -15,8 +13,6 @@
// FOP
import org.apache.fop.pdf.PDFPathPaint;
import org.apache.fop.pdf.PDFColor;
-// import org.apache.fop.render.Renderer;
-// import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.image.ImageArea;
// import org.apache.fop.image.FopImage;
import org.apache.fop.apps.FOPException;
@@ -46,7 +42,7 @@
* is not mentioned in this class but it is inherited from
* the Renderer interface.
*/
-public abstract class PrintRenderer implements Renderer {
+public abstract class PrintRenderer extends AbstractRenderer {
// vvv These are not currently referenced by the PrintRenderer, but are common
to PCL and PDF renderers - so declare here.
/**
1.19 +11 -50 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Renderer.java 2001/08/01 23:08:55 1.18
+++ Renderer.java 2001/08/21 06:18:55 1.19
@@ -1,54 +1,8 @@
-/*--- formatted by Jindent 2.1, (www.c-lab.de/~jindent) ---*/
-
/*
- * -- $Id: Renderer.java,v 1.18 2001/08/01 23:08:55 gears Exp $ --
- * ============================================================================
- * The Apache Software License, Version 1.1
- * ============================================================================
- *
- * Copyright (C) 1999 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/>.
- *
+ * $Id: Renderer.java,v 1.19 2001/08/21 06:18:55 keiron Exp $
+ * 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.
*/
package org.apache.fop.render;
@@ -59,6 +13,8 @@
import org.apache.fop.layout.*;
import org.apache.fop.layout.inline.*;
+import org.apache.log.Logger;
+
// Java
import java.io.OutputStream;
import java.io.IOException;
@@ -70,6 +26,11 @@
* some format.
*/
public interface Renderer {
+
+ /**
+ * Set the logger
+ */
+ public void setLogger(Logger logger);
/**
* set up the given FontInfo
1.1 xml-fop/src/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
/*
* $Id: AbstractRenderer.java,v 1.1 2001/08/21 06:18:55 keiron Exp $
* 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."
*/
package org.apache.fop.render;
// FOP
import org.apache.fop.pdf.PDFPathPaint;
import org.apache.fop.pdf.PDFColor;
import org.apache.fop.image.ImageArea;
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.*;
import org.apache.fop.render.pdf.FontSetup;
import org.apache.fop.svg.SVGArea;
import org.apache.log.Logger;
// Java
import java.io.IOException;
import java.io.OutputStream;
import java.util.Enumeration;
/**
* Abstract base class for all renderers.
*
*/
public abstract class AbstractRenderer implements Renderer {
protected Logger log;
public void setLogger(Logger logger) {
log = logger;
}
}
1.32 +6 -8 xml-fop/src/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- AWTRenderer.java 2001/08/09 14:04:21 1.31
+++ AWTRenderer.java 2001/08/21 06:18:55 1.32
@@ -1,5 +1,5 @@
/*
- * $Id: AWTRenderer.java,v 1.31 2001/08/09 14:04:21 keiron Exp $
+ * $Id: AWTRenderer.java,v 1.32 2001/08/21 06:18:55 keiron Exp $
* 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.
@@ -16,7 +16,6 @@
import org.apache.fop.layout.*;
import org.apache.fop.layout.inline.*;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.datatypes.*;
import org.apache.fop.image.*;
import org.apache.fop.svg.*;
@@ -51,7 +50,7 @@
import java.awt.image.BufferedImage;
import java.text.*;
-import org.apache.fop.render.Renderer;
+import org.apache.fop.render.AbstractRenderer;
/**
Modified by Mark Lillywhite [EMAIL PROTECTED] Did lots of
@@ -59,9 +58,8 @@
interface. This class could also do with a general audit,
and I suspect it's not swing-thread-safe either.
*/
+public class AWTRenderer extends AbstractRenderer implements Printable, Pageable {
-public class AWTRenderer implements Renderer, Printable, Pageable {
-
protected int pageWidth = 0;
protected int pageHeight = 0;
protected double scaleFactor = 100.0;
@@ -603,7 +601,7 @@
FopImage img = area.getImage();
if (img == null) {
- MessageHandler.logln("Error while loading image : area.getImage() is
null");
+ log.error("Error while loading image : area.getImage() is null");
// correct integer roundoff
// graphics.drawRect(x / 1000, pageHeight - y / 1000,
@@ -984,8 +982,8 @@
* (int) height, imageIcon.getImageObserver());
* graphics.drawImage(bi, bop, (int) x, (int) y);
* } catch (Exception ex) {
- * MessageHandler.errorln("AWTRenderer: renderImage(): " +
- * ex.getMessage());
+ * log.error("AWTRenderer: renderImage(): " +
+ * ex.getMessage(), ex);
* }
* }
*/
1.9 +6 -6 xml-fop/src/org/apache/fop/render/mif/MIFRenderer.java
Index: MIFRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/mif/MIFRenderer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MIFRenderer.java 2001/08/01 23:08:55 1.8
+++ MIFRenderer.java 2001/08/21 06:18:55 1.9
@@ -1,5 +1,5 @@
/*
- * $Id: MIFRenderer.java,v 1.8 2001/08/01 23:08:55 gears Exp $
+ * $Id: MIFRenderer.java,v 1.9 2001/08/21 06:18:55 keiron Exp $
* 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.
@@ -11,7 +11,7 @@
// FOP
import org.apache.fop.render.Renderer;
-import org.apache.fop.messaging.MessageHandler;
+import org.apache.fop.render.AbstractRenderer;
import org.apache.fop.image.ImageArea;
import org.apache.fop.image.FopImage;
import org.apache.fop.apps.FOPException;
@@ -47,7 +47,7 @@
* it should still work. I don't have an MIF view to test it with,
* you see.
*/
-public class MIFRenderer implements Renderer {
+public class MIFRenderer extends AbstractRenderer {
private String currentFontName;
private String currentFontSize;
@@ -378,7 +378,7 @@
* }
*/
- MessageHandler.logln("Warning: SVG images not supported in this
version");
+ log.warn("SVG images not supported in this version");
} else {
String url = img.getURL();
this.mifDoc.addImage(url, x, pageHeight - y, w, h);
@@ -487,7 +487,7 @@
*/
public void startRenderer(OutputStream outputStream)
throws IOException {
- MessageHandler.logln("rendering areas to MIF");
+ log.info("rendering areas to MIF");
}
/**
@@ -496,7 +496,7 @@
*/
public void stopRenderer(OutputStream outputStream)
throws IOException {
- MessageHandler.logln("writing out MIF");
+ log.info("writing out MIF");
this.mifDoc.output(outputStream);
outputStream.flush();
}
1.11 +8 -9 xml-fop/src/org/apache/fop/render/pcl/PCLRenderer.java
Index: PCLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pcl/PCLRenderer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PCLRenderer.java 2001/08/01 23:08:55 1.10
+++ PCLRenderer.java 2001/08/21 06:18:55 1.11
@@ -1,5 +1,5 @@
/*
- * $Id: PCLRenderer.java,v 1.10 2001/08/01 23:08:55 gears Exp $
+ * $Id: PCLRenderer.java,v 1.11 2001/08/21 06:18:55 keiron Exp $
* 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.
@@ -9,7 +9,6 @@
// FOP
import org.apache.fop.render.PrintRenderer;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.image.ImageArea;
import org.apache.fop.image.FopImage;
import org.apache.fop.apps.FOPException;
@@ -219,7 +218,7 @@
int xpos = xoffset + (x / 100);
if (xpos < 0) {
xpos = 0;
- MessageHandler.errorln("PCLRenderer.addRect() WARNING: Horizontal
position out of bounds.");
+ log.error("PCLRenderer.addRect() WARNING: Horizontal position out of
bounds.");
}
currentStream.add("\033*v1O\033&a" + xpos + "h"
@@ -230,7 +229,7 @@
xpos = xoffset + ((x + 240) / 100);
if (xpos < 0) {
xpos = 0;
- MessageHandler.errorln("PCLRenderer.addRect() WARNING: Horizontal
position out of bounds.");
+ log.error("PCLRenderer.addRect() WARNING: Horizontal position out
of bounds.");
}
currentStream.add("\033&a" + xpos + "h"
+ (pageHeight - ((y + 240)) / 100) + "V"
@@ -373,7 +372,7 @@
int xpos = xoffset + (x / 100);
if (xpos < 0) {
xpos = 0;
- MessageHandler.errorln("PCLRenderer.renderImageArea() WARNING:
Horizontal position out of bounds.");
+ log.error("PCLRenderer.renderImageArea() WARNING: Horizontal position
out of bounds.");
}
currentStream.add("\033&a" + xpos + "h" + (pageHeight - (y / 100))
@@ -383,7 +382,7 @@
printBMP(img, x, y, w, h);
} catch (FopImageException e) {
// e.printStackTrace(System.out);
- MessageHandler.errorln("PCLRenderer.renderImageArea() Error printing
BMP ("
+ log.error("PCLRenderer.renderImageArea() Error printing BMP ("
+ e.toString() + ")");
}
}
@@ -617,7 +616,7 @@
int xpos = xoffset + (rx / 100);
if (xpos < 0) {
xpos = 0;
- MessageHandler.errorln("PCLRenderer.renderWordArea() WARNING:
Horizontal position out of bounds.");
+ log.error("PCLRenderer.renderWordArea() WARNING: Horizontal position
out of bounds.");
}
currentStream.add("\033&a" + xpos + "h" + (pageHeight - (bl / 100))
+ "V" + s);
@@ -725,7 +724,7 @@
}
public void startRenderer(OutputStream outputStream)
throws IOException {
- MessageHandler.logln("rendering areas to PCL");
+ log.info("rendering areas to PCL");
currentStream = new PCLStream(outputStream);
// Set orientation.
@@ -744,7 +743,7 @@
public void stopRenderer(OutputStream outputStream)
throws IOException {
- MessageHandler.logln("writing out PCL");
+ log.info("writing out PCL");
outputStream.flush();
}
1.84 +6 -7 xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- PDFRenderer.java 2001/08/14 17:56:40 1.83
+++ PDFRenderer.java 2001/08/21 06:18:55 1.84
@@ -1,5 +1,5 @@
/*
- * $Id: PDFRenderer.java,v 1.83 2001/08/14 17:56:40 gears Exp $
+ * $Id: PDFRenderer.java,v 1.84 2001/08/21 06:18:55 keiron Exp $
* 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.
@@ -9,7 +9,6 @@
// FOP
import org.apache.fop.render.PrintRenderer;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.image.ImageArea;
import org.apache.fop.image.FopImage;
import org.apache.fop.apps.FOPException;
@@ -423,8 +422,8 @@
root.paint(graphics, rc);
currentStream.add(graphics.getString());
} catch (Exception e) {
- MessageHandler.errorln("Error: svg graphic could not be rendered: "
- + e.getMessage());
+ log.error("svg graphic could not be rendered: "
+ + e.getMessage(), e);
}
currentAnnotList = graphics.getAnnotList();
@@ -681,7 +680,7 @@
public void render(Page page, OutputStream outputStream)
throws FOPException, IOException {
- // MessageHandler.logln("rendering single page to PDF");
+ // log.debug("rendering single page to PDF");
this.idReferences = page.getIDReferences();
this.pdfResources = this.pdfDoc.getResources();
this.pdfDoc.setIDReferences(idReferences);
@@ -692,7 +691,7 @@
// TODO: this needs to be implemented
renderRootExtensions(page);
- // MessageHandler.logln("writing out PDF");
+ // log.debug("writing out PDF");
this.pdfDoc.output(outputStream);
}
@@ -825,7 +824,7 @@
PDFOutline pdfParentOutline =
(PDFOutline)parent.getRendererObject();
if (pdfParentOutline == null) {
- MessageHandler.errorln("Error: pdfParentOutline is null");
+ log.error("pdfParentOutline is null");
} else {
pdfOutline =
this.pdfDoc.makeOutline(pdfParentOutline,
1.9 +20 -19 xml-fop/src/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PSRenderer.java 2001/08/09 13:51:56 1.8
+++ PSRenderer.java 2001/08/21 06:18:55 1.9
@@ -1,5 +1,5 @@
/*
- * $Id: PSRenderer.java,v 1.8 2001/08/09 13:51:56 keiron Exp $
+ * $Id: PSRenderer.java,v 1.9 2001/08/21 06:18:55 keiron Exp $
* 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.
@@ -8,8 +8,8 @@
package org.apache.fop.render.ps;
// FOP
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.svg.SVGArea;
+import org.apache.fop.render.AbstractRenderer;
import org.apache.fop.render.Renderer;
import org.apache.fop.image.ImageArea;
import org.apache.fop.image.FopImage;
@@ -29,6 +29,8 @@
import org.apache.batik.gvt.filter.*;
import org.apache.batik.gvt.event.*;
+import org.apache.log.Logger;
+
// SVG
import org.w3c.dom.svg.SVGSVGElement;
import org.w3c.dom.svg.SVGDocument;
@@ -76,7 +78,7 @@
*
* @author Jeremias Märki
*/
-public class PSRenderer implements Renderer {
+public class PSRenderer extends AbstractRenderer {
/**
* the application producing the PostScript
@@ -430,7 +432,7 @@
write(sx + " " + sy + " " + " scale");
- UserAgent userAgent = new MUserAgent(new AffineTransform());
+ UserAgent userAgent = new MUserAgent(new AffineTransform(), log);
GVTBuilder builder = new GVTBuilder();
GraphicsNodeRenderContext rc = getRenderContext();
@@ -447,9 +449,8 @@
root = builder.build(ctx, doc);
root.paint(graphics, rc);
} catch (Exception e) {
- MessageHandler.errorln("Error: svg graphic could not be rendered: "
- + e.getMessage());
- // e.printStackTrace();
+ log.error("svg graphic could not be rendered: "
+ + e.getMessage(), e);
}
@@ -555,9 +556,8 @@
write("");
write("grestore");
} catch (FopImageException e) {
- e.printStackTrace();
- MessageHandler.errorln("PSRenderer.renderImageArea(): Error rendering
bitmap ("
- + e.toString() + ")");
+ log.error("PSRenderer.renderImageArea(): Error rendering bitmap ("
+ + e.getMessage() + ")", e);
}
}
@@ -824,11 +824,11 @@
break;
case LeaderPattern.DOTS:
comment("% --- Leader dots NYI");
- MessageHandler.errorln("Leader dots: Not yet implemented");
+ log.error("Leader dots: Not yet implemented");
break;
case LeaderPattern.USECONTENT:
comment("% --- Leader use-content NYI");
- MessageHandler.errorln("Leader use-content: Not yet implemented");
+ log.error("Leader use-content: Not yet implemented");
break;
}
this.currentXPosition += area.getContentWidth();
@@ -927,26 +927,27 @@
protected class MUserAgent implements UserAgent {
AffineTransform currentTransform = null;
-
+ Logger log;
/**
* Creates a new SVGUserAgent.
*/
- protected MUserAgent(AffineTransform at) {
+ protected MUserAgent(AffineTransform at, Logger logger) {
currentTransform = at;
+ log = logger;
}
/**
* Displays an error message.
*/
public void displayError(String message) {
- System.err.println(message);
+ log.error(message);
}
/**
* Displays an error resulting from the specified Exception.
*/
public void displayError(Exception ex) {
- ex.printStackTrace(System.err);
+ log.error("SVG Error" + ex.getMessage(), ex);
}
/**
@@ -954,7 +955,7 @@
* The given message is typically displayed in a status bar.
*/
public void displayMessage(String message) {
- System.out.println(message);
+ log.info(message);
}
/**
@@ -1037,7 +1038,7 @@
*/
public void startRenderer(OutputStream outputStream)
throws IOException {
- MessageHandler.logln("rendering areas to PostScript");
+ log.debug("rendering areas to PostScript");
this.out = new PSStream(outputStream);
write("%!PS-Adobe-3.0");
@@ -1064,7 +1065,7 @@
write("%%Trailer");
write("%%EOF");
this.out.flush();
- MessageHandler.logln("written out PostScript");
+ log.debug("written out PostScript");
}
public void render(Page page, OutputStream outputStream) {
1.12 +6 -7 xml-fop/src/org/apache/fop/render/txt/TXTRenderer.java
Index: TXTRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/txt/TXTRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TXTRenderer.java 2001/08/01 23:08:55 1.11
+++ TXTRenderer.java 2001/08/21 06:18:55 1.12
@@ -1,5 +1,5 @@
/*
- * $Id: TXTRenderer.java,v 1.11 2001/08/01 23:08:55 gears Exp $
+ * $Id: TXTRenderer.java,v 1.12 2001/08/21 06:18:55 keiron Exp $
* 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.
@@ -11,7 +11,6 @@
// FOP
import org.apache.fop.render.PrintRenderer;
import org.apache.fop.render.pcl.*;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.properties.*;
import org.apache.fop.layout.*;
@@ -784,8 +783,8 @@
printBMP(img, x, y, w, h);
} catch (FopImageException e) {
// e.printStackTrace(System.out);
- MessageHandler.errorln("TXTRenderer.renderImageArea() Error printing
BMP ("
- + e.toString() + ").");
+ log.error("TXTRenderer.renderImageArea() printing BMP ("
+ + e.toString() + ").", e);
}
}
@@ -805,7 +804,7 @@
}
}
} catch (Exception e) {
- MessageHandler.errorln("could not add image to SVG: " + href);
+ log.error("could not add image to SVG: " + href, e);
}
}
@@ -1677,7 +1676,7 @@
}
public void startRenderer(OutputStream outputStream)
throws IOException {
- MessageHandler.logln("rendering areas to TEXT");
+ log.info("rendering areas to TEXT");
currentStream = new PCLStream(outputStream);
firstPage=true;
}
@@ -1690,7 +1689,7 @@
public void stopRenderer(OutputStream outputStream)
throws IOException {
- MessageHandler.logln("writing out TEXT");
+ log.info("writing out TEXT");
outputStream.flush();
}
1.25 +5 -5 xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XMLRenderer.java 2001/08/15 11:31:27 1.24
+++ XMLRenderer.java 2001/08/21 06:18:55 1.25
@@ -1,5 +1,5 @@
/*
- * $Id: XMLRenderer.java,v 1.24 2001/08/15 11:31:27 keiron Exp $
+ * $Id: XMLRenderer.java,v 1.25 2001/08/21 06:18:55 keiron Exp $
* 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.
@@ -9,8 +9,8 @@
// FOP
import org.apache.fop.svg.*;
-import org.apache.fop.messaging.MessageHandler;
import org.apache.fop.render.Renderer;
+import org.apache.fop.render.AbstractRenderer;
import org.apache.fop.image.ImageArea;
import org.apache.fop.layout.*;
import org.apache.fop.layout.inline.*;
@@ -30,7 +30,7 @@
* Modified by Mark Lillywhite [EMAIL PROTECTED] to use the
* new renderer interface. Not 100% certain that this is correct.
*/
-public class XMLRenderer implements Renderer {
+public class XMLRenderer extends AbstractRenderer {
/**
* indentation to use for pretty-printing the XML
@@ -442,7 +442,7 @@
*/
public void startRenderer(OutputStream outputStream)
throws IOException {
- MessageHandler.logln("rendering areas to XML");
+ log.info("rendering areas to XML");
this.writer = new PrintWriter(outputStream);
this.writer.write( "<?xml version=\"1.0\"?>\n<!-- produced by " +
this.producer + " -->\n");
@@ -457,6 +457,6 @@
throws IOException {
writeEndTag("</AreaTree>");
this.writer.flush();
- MessageHandler.errorln("written out XML");
+ log.error("written out XML");
}
}
1.13 +2 -2 xml-fop/src/org/apache/fop/tools/TestConverter.java
Index: TestConverter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/TestConverter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TestConverter.java 2001/08/20 11:19:24 1.12
+++ TestConverter.java 2001/08/21 06:18:55 1.13
@@ -1,5 +1,5 @@
/*
- * $Id: TestConverter.java,v 1.12 2001/08/20 11:19:24 keiron Exp $
+ * $Id: TestConverter.java,v 1.13 2001/08/21 06:18:55 keiron Exp $
* 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.
@@ -85,7 +85,7 @@
}
private void setupLogging() {
- log = Hierarchy.getDefaultHierarchy().getLoggerFor("testing");
+ log = Hierarchy.getDefaultHierarchy().getLoggerFor("test");
}
public void setOutputPDF(boolean pdf) {
1.11 +3 -2 xml-fop/src/org/apache/fop/tools/anttasks/Fop.java
Index: Fop.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/tools/anttasks/Fop.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Fop.java 2001/08/20 11:19:24 1.10
+++ Fop.java 2001/08/21 06:18:55 1.11
@@ -1,5 +1,5 @@
/*
- * $Id: Fop.java,v 1.10 2001/08/20 11:19:24 keiron Exp $
+ * $Id: Fop.java,v 1.11 2001/08/21 06:18:55 keiron Exp $
* 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.
@@ -212,7 +212,7 @@
}
}
-
+/*
class MessageLogger implements MessageListener {
MessageHandler handler;
Task task;
@@ -294,3 +294,4 @@
}
}
+*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
