1. To facilitate comprehension of the Renderer classes, added the remaining three...

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.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196776 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/render/AbstractRenderer.java b/src/java/org/apache/fop/render/AbstractRenderer.java
index ff6e516eddfdcc6a52e0e1d083cab7933c932af9..3e27bd5d6c63090c879dc3cc9a8d00df7f132465 100644 (file)
--- a/src/java/org/apache/fop/render/AbstractRenderer.java
+++ b/src/java/org/apache/fop/render/AbstractRenderer.java
@@ -53,13 +53,13 @@ package org.apache.fop.render;
 // 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.Space;
 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;
@@ -107,6 +109,16 @@ public abstract class AbstractRenderer extends AbstractLogEnabled
      */
     protected FOUserAgent userAgent;
 
+    /**
+     * producer (usually "FOP")
+     */
+    protected String producer = "FOP";
+
+    /**
+     * creator of document
+     */
+    protected String creator = null;
+
     /**
      * renderer configuration
      */
@@ -146,13 +158,18 @@ public abstract class AbstractRenderer extends AbstractLogEnabled
     }
 
     /** @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;
@@ -163,6 +180,14 @@ public abstract class AbstractRenderer extends AbstractLogEnabled
         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
      * supports out of order rendering then it means that the pages that are

diff --git a/src/java/org/apache/fop/render/PrintRenderer.java b/src/java/org/apache/fop/render/PrintRenderer.java
index ad21c38be512b5f631c157841a45759825256fd6..bd4cfedc5b8641adbd03aad0be84311c7a1bb4da 100644 (file)
--- a/src/java/org/apache/fop/render/PrintRenderer.java
+++ b/src/java/org/apache/fop/render/PrintRenderer.java
@@ -56,8 +56,6 @@ import org.apache.fop.layout.FontInfo;
 
 // 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 {
@@ -78,12 +76,4 @@ public abstract class PrintRenderer extends AbstractRenderer {
         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 { }
-
 }

diff --git a/src/java/org/apache/fop/render/pcl/PCLRenderer.java b/src/java/org/apache/fop/render/pcl/PCLRenderer.java
index fe738e6d825ed58b08c54ed3268df059fa25d86b..a717469cdca6a8091b5fe8c13d1d34089c1f8d4e 100644 (file)
--- a/src/java/org/apache/fop/render/pcl/PCLRenderer.java
+++ b/src/java/org/apache/fop/render/pcl/PCLRenderer.java
@@ -91,14 +91,6 @@ public class PCLRenderer extends PrintRenderer {
     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') {

diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
index 9fa035d52dd2ab1195495670aa3247d490babfb4..3fd9a224c6ec4c629a5ee93281512d22224f8e11 100644 (file)
--- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java
+++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java
@@ -161,10 +161,6 @@ public class PDFRenderer extends PrintRenderer {
     /** 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
      */
@@ -255,24 +251,6 @@ public class PDFRenderer extends PrintRenderer {
         }
     }
 
-    /**
-     * 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;
-    }
-
     /**
      * @see org.apache.fop.render.Renderer#setUserAgent(FOUserAgent)
      */

diff --git a/src/java/org/apache/fop/render/ps/PSRenderer.java b/src/java/org/apache/fop/render/ps/PSRenderer.java
index 968c51445ffb834c605aa5f99b6ea9fb54ed8ef0..191f46ee35838670b4866168bdfcebe8a27d44cb 100644 (file)
--- a/src/java/org/apache/fop/render/ps/PSRenderer.java
+++ b/src/java/org/apache/fop/render/ps/PSRenderer.java
@@ -107,7 +107,6 @@ public class PSRenderer extends AbstractRenderer {
     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 @@ public class PSRenderer extends AbstractRenderer {
         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)
      */

diff --git a/src/java/org/apache/fop/render/svg/SVGRenderer.java b/src/java/org/apache/fop/render/svg/SVGRenderer.java
index 598a6b0eecbeff9a6c67aefe4beb02b5f6116322..9936087c5bd742f1fe98653f14fb62b62b157e81 100644 (file)
--- a/src/java/org/apache/fop/render/svg/SVGRenderer.java
+++ b/src/java/org/apache/fop/render/svg/SVGRenderer.java
@@ -174,12 +174,6 @@ public class SVGRenderer extends AbstractRenderer implements XMLHandler {
                 fontImage.createGraphics());
     }
 
-    /**
-     * @see org.apache.fop.render.Renderer#setProducer(String)
-     */
-    public void setProducer(String producer) {
-    }
-
     /**
      * @see org.apache.fop.render.Renderer#startRenderer(OutputStream)
      */

diff --git a/src/java/org/apache/fop/render/txt/TXTRenderer.java b/src/java/org/apache/fop/render/txt/TXTRenderer.java
index df610d99470558cee9b9ffa3a0cd0665aac517f1..2da63fb1ab419391d7f539fa4523aaa63ab51652 100644 (file)
--- a/src/java/org/apache/fop/render/txt/TXTRenderer.java
+++ b/src/java/org/apache/fop/render/txt/TXTRenderer.java
@@ -104,15 +104,6 @@ public class TXTRenderer extends PrintRenderer {
     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

diff --git a/src/java/org/apache/fop/render/xml/XMLRenderer.java b/src/java/org/apache/fop/render/xml/XMLRenderer.java
index a2ca49b3c77dec8cc527738b8e43e4f01333a9c8..238dda6c11d5649e8e22adfea98797fb8e628411 100644 (file)
--- a/src/java/org/apache/fop/render/xml/XMLRenderer.java
+++ b/src/java/org/apache/fop/render/xml/XMLRenderer.java
@@ -108,12 +108,6 @@ public class XMLRenderer extends AbstractRenderer {
     private boolean startedSequence = false;
     private RendererContext context;
 
-    /**
-     * @see org.apache.fop.render.Renderer#setProducer(String)
-     */
-    public void setProducer(String producer) {
-    }
-
     /**
      * indentation to use for pretty-printing the XML
      */