gmazza 2003/08/07 16:38:17 Modified: src/java/org/apache/fop/render AbstractRenderer.java PrintRenderer.java src/java/org/apache/fop/render/pcl PCLRenderer.java src/java/org/apache/fop/render/pdf PDFRenderer.java src/java/org/apache/fop/render/ps PSRenderer.java src/java/org/apache/fop/render/svg SVGRenderer.java src/java/org/apache/fop/render/txt TXTRenderer.java src/java/org/apache/fop/render/xml XMLRenderer.java Log: 1. To facilitate comprehension of the Renderer classes, added the remaining three methods in the Renderer interface to AbstractRenderer: startRenderer(), stopRenderer(), and setupFontInfo(). SetupFontInfo() remains abstract, the other two have blank definitions. 2. Removed the blank definitions of startRenderer() and stopRenderer() from PrintRenderer, these are now defined in AbstractRenderer. 3. Member string variables "producer" and "creator" were added to AbstractRenderer and are now populated by its setProducer() and setCreator() methods; removed these functions from the several subclasses that were handling these strings equivalently. Revision Changes Path 1.4 +28 -3 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java Index: AbstractRenderer.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- AbstractRenderer.java 25 Apr 2003 07:06:41 -0000 1.3 +++ AbstractRenderer.java 7 Aug 2003 23:38:17 -0000 1.4 @@ -53,13 +53,13 @@ // Java import java.awt.geom.Rectangle2D; import java.io.IOException; +import java.io.OutputStream; import java.util.Map; import java.util.List; import java.util.Iterator; // FOP import org.apache.fop.apps.FOPException; -import org.apache.fop.fo.FOUserAgent; import org.apache.fop.area.Area; import org.apache.fop.area.BeforeFloat; import org.apache.fop.area.Block; @@ -87,6 +87,8 @@ import org.apache.fop.area.inline.Viewport; import org.apache.fop.area.inline.Word; import org.apache.fop.area.inline.Character; +import org.apache.fop.fo.FOUserAgent; +import org.apache.fop.layout.FontInfo; // Avalon import org.apache.avalon.framework.logger.AbstractLogEnabled; @@ -108,6 +110,16 @@ protected FOUserAgent userAgent; /** + * producer (usually "FOP") + */ + protected String producer = "FOP"; + + /** + * creator of document + */ + protected String creator = null; + + /** * renderer configuration */ protected Map options; @@ -146,14 +158,19 @@ } /** @see org.apache.fop.render.Renderer */ - public void setProducer(String producer) { + public void setProducer(String inProducer) { + producer = inProducer; } /** @see org.apache.fop.render.Renderer */ - public void setCreator(String creator) { + public void setCreator(String inCreator) { + creator = inCreator; } /** @see org.apache.fop.render.Renderer */ + public abstract void setupFontInfo(FontInfo fontInfo); + + /** @see org.apache.fop.render.Renderer */ public void setUserAgent(FOUserAgent agent) { userAgent = agent; } @@ -162,6 +179,14 @@ public void setOptions(Map opt) { options = opt; } + + /** @see org.apache.fop.render.Renderer */ + public void startRenderer(OutputStream outputStream) + throws IOException { } + + /** @see org.apache.fop.render.Renderer */ + public void stopRenderer() + throws IOException { } /** * Check if this renderer supports out of order rendering. If this renderer 1.2 +0 -10 xml-fop/src/java/org/apache/fop/render/PrintRenderer.java Index: PrintRenderer.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/PrintRenderer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PrintRenderer.java 11 Mar 2003 13:05:39 -0000 1.1 +++ PrintRenderer.java 7 Aug 2003 23:38:17 -0000 1.2 @@ -56,8 +56,6 @@ // Java import java.util.List; -import java.io.IOException; -import java.io.OutputStream; /** Abstract base class of "Print" type renderers. */ public abstract class PrintRenderer extends AbstractRenderer { @@ -77,13 +75,5 @@ this.fontInfo = fontInfo; FontSetup.setup(fontInfo, fontList); } - - /** @see org.apache.fop.render.Renderer */ - public void startRenderer(OutputStream outputStream) - throws IOException { } - - /** @see org.apache.fop.render.Renderer */ - public void stopRenderer() - throws IOException { } } 1.2 +0 -8 xml-fop/src/java/org/apache/fop/render/pcl/PCLRenderer.java Index: PCLRenderer.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pcl/PCLRenderer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PCLRenderer.java 11 Mar 2003 13:05:43 -0000 1.1 +++ PCLRenderer.java 7 Aug 2003 23:38:17 -0000 1.2 @@ -91,14 +91,6 @@ public PCLRenderer() { } - /** - * set the PCL document's producer - * - * @param producer string indicating application producing PCL - */ - public void setProducer(String producer) { - } - public void setFont(String name, float size) { int fontcode = 0; if (name.length() > 1 && name.charAt(0) == 'F') { 1.5 +0 -22 xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java Index: PDFRenderer.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PDFRenderer.java 27 Mar 2003 11:20:24 -0000 1.4 +++ PDFRenderer.java 7 Aug 2003 23:38:17 -0000 1.5 @@ -161,10 +161,6 @@ /** Page viewport references */ protected Map pvReferences = new java.util.HashMap(); - private String producer = "FOP"; - - private String creator = null; - /** * The output stream to write the document to */ @@ -253,24 +249,6 @@ } else { this.fontList.addAll(cfgFonts); } - } - - /** - * Set the document creator. - * - * @param creator string indicating application that is creating the document - */ - public void setCreator(String creator) { - this.creator = creator; - } - - /** - * Set the PDF document's producer. - * - * @param producer string indicating application producing PDF - */ - public void setProducer(String producer) { - this.producer = producer; } /** 1.6 +0 -10 xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java Index: PSRenderer.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- PSRenderer.java 4 Jul 2003 20:58:54 -0000 1.5 +++ PSRenderer.java 7 Aug 2003 23:38:17 -0000 1.6 @@ -107,7 +107,6 @@ public static final String MIME_TYPE = "application/postscript"; /** The application producing the PostScript */ - protected String producer; private int currentPageNumber = 0; private boolean enableComments = true; @@ -133,15 +132,6 @@ this.autoRotateLandscape = cfg.getChild("auto-rotate-landscape").getValueAsBoolean(false); } - /** - * Set the document's producer - * - * @param producer string indicating application producing the PostScript - */ - public void setProducer(String producer) { - this.producer = producer; - } - /** * @see org.apache.fop.render.Renderer#setUserAgent(FOUserAgent) */ 1.2 +0 -6 xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java Index: SVGRenderer.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- SVGRenderer.java 11 Mar 2003 13:05:42 -0000 1.1 +++ SVGRenderer.java 7 Aug 2003 23:38:17 -0000 1.2 @@ -175,12 +175,6 @@ } /** - * @see org.apache.fop.render.Renderer#setProducer(String) - */ - public void setProducer(String producer) { - } - - /** * @see org.apache.fop.render.Renderer#startRenderer(OutputStream) */ public void startRenderer(OutputStream outputStream) 1.2 +0 -9 xml-fop/src/java/org/apache/fop/render/txt/TXTRenderer.java Index: TXTRenderer.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/txt/TXTRenderer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- TXTRenderer.java 11 Mar 2003 13:05:43 -0000 1.1 +++ TXTRenderer.java 7 Aug 2003 23:38:17 -0000 1.2 @@ -104,15 +104,6 @@ private boolean suppressGraphics = false; private boolean firstPage = false; - /** - * Set the TXT document's producer - * - * @param producer string indicating application producing PDF - */ - public void setProducer(String producer) { - } - - private void addStr(int row, int col, String str, boolean ischar) { if (debug) { getLogger().debug("TXTRenderer.addStr(" + row + ", " + col 1.2 +0 -6 xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java Index: XMLRenderer.java =================================================================== RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- XMLRenderer.java 11 Mar 2003 13:05:31 -0000 1.1 +++ XMLRenderer.java 7 Aug 2003 23:38:17 -0000 1.2 @@ -109,12 +109,6 @@ private RendererContext context; /** - * @see org.apache.fop.render.Renderer#setProducer(String) - */ - public void setProducer(String producer) { - } - - /** * indentation to use for pretty-printing the XML */ protected int indent = 0;
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]