Author: mehdi
Date: Mon Jan 23 16:15:23 2012
New Revision: 1234877
URL: http://svn.apache.org/viewvc?rev=1234877&view=rev
Log:
Moved the FOUserAgent into the constructor of the Renderers
This breaks the public API but for good reasons:
1) the user-agent is essential for configuring the renderers
2) instantiation of the constructor is always followed by call to
"setUserAgent()" (in the examples)
3) simplifies the API and reduces mutability of the Renderers
Modified:
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2JPSPrint.java
xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/Renderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRendererMaker.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRendererMaker.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java
Modified:
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2JPSPrint.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2JPSPrint.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2JPSPrint.java
(original)
+++
xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2JPSPrint.java
Mon Jan 23 16:15:23 2012
@@ -85,8 +85,7 @@ public class ExampleFO2JPSPrint {
//Set up a custom user agent so we can supply our own renderer instance
FOUserAgent userAgent = fopFactory.newFOUserAgent();
- PageableRenderer renderer = new PageableRenderer();
- renderer.setUserAgent(userAgent);
+ PageableRenderer renderer = new PageableRenderer(userAgent);
userAgent.setRendererOverride(renderer);
// Construct FOP with desired output format
Modified:
xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java
(original)
+++
xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java
Mon Jan 23 16:15:23 2012
@@ -93,8 +93,7 @@ public class ExampleConcat {
userAgent, MimeConstants.MIME_PDF);
//Create the XMLRenderer to create the area tree XML
- XMLRenderer xmlRenderer = new XMLRenderer();
- xmlRenderer.setUserAgent(userAgent);
+ XMLRenderer xmlRenderer = new XMLRenderer(userAgent);
//Tell the XMLRenderer to mimic the target renderer
xmlRenderer.mimicRenderer(targetRenderer);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/cli/CommandLineOptions.java
Mon Jan 23 16:15:23 2012
@@ -203,17 +203,14 @@ public class CommandLineOptions {
System.err.println("Couldn't set system look & feel!");
}
- AWTRenderer renderer = new AWTRenderer(true);
- renderer.setRenderable(inputHandler); //set before user agent!
- renderer.setUserAgent(foUserAgent);
+ AWTRenderer renderer = new AWTRenderer(foUserAgent, inputHandler,
true, true);
foUserAgent.setRendererOverride(renderer);
} else if (MimeConstants.MIME_FOP_AREA_TREE.equals(outputmode)
&& mimicRenderer != null) {
// render from FO to Intermediate Format
Renderer targetRenderer =
foUserAgent.getRendererFactory().createRenderer(
foUserAgent, mimicRenderer);
- XMLRenderer xmlRenderer = new XMLRenderer();
- xmlRenderer.setUserAgent(foUserAgent);
+ XMLRenderer xmlRenderer = new XMLRenderer(foUserAgent);
//Tell the XMLRenderer to mimic the target renderer
xmlRenderer.mimicRenderer(targetRenderer);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
Mon Jan 23 16:15:23 2012
@@ -34,6 +34,7 @@ import org.apache.xmlgraphics.image.load
import org.apache.xmlgraphics.util.QName;
import org.apache.xmlgraphics.util.UnitConv;
+import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
import org.apache.fop.area.BlockViewport;
@@ -56,6 +57,10 @@ import org.apache.fop.traits.BorderProps
*/
public abstract class AbstractPathOrientedRenderer extends PrintRenderer {
+ public AbstractPathOrientedRenderer(FOUserAgent userAgent) {
+ super(userAgent);
+ }
+
/**
* Handle block traits.
* The block could be any sort of block with any positioning
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRenderer.java
Mon Jan 23 16:15:23 2012
@@ -61,11 +61,11 @@ import org.apache.fop.area.inline.Image;
import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.area.inline.InlineBlockParent;
import org.apache.fop.area.inline.InlineParent;
+import org.apache.fop.area.inline.InlineViewport;
import org.apache.fop.area.inline.Leader;
import org.apache.fop.area.inline.Space;
import org.apache.fop.area.inline.SpaceArea;
import org.apache.fop.area.inline.TextArea;
-import org.apache.fop.area.inline.InlineViewport;
import org.apache.fop.area.inline.WordArea;
import org.apache.fop.fo.Constants;
import org.apache.fop.fonts.FontInfo;
@@ -116,16 +116,16 @@ public abstract class AbstractRenderer
/** {@inheritDoc} */
public abstract void setupFontInfo(FontInfo fontInfo) throws FOPException;
- /** {@inheritDoc} */
- public void setUserAgent(FOUserAgent agent) {
- userAgent = agent;
+ /**
+ *
+ * @param userAgent the user agent that contains configuration details.
This cannot be null.
+ */
+ public AbstractRenderer(FOUserAgent userAgent) {
+ this.userAgent = userAgent;
}
/** {@inheritDoc} */
public FOUserAgent getUserAgent() {
- if (userAgent == null) {
- throw new IllegalStateException("FOUserAgent has not been set on
Renderer");
- }
return userAgent;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRenderer.java Mon
Jan 23 16:15:23 2012
@@ -27,6 +27,7 @@ import java.util.Map;
import org.w3c.dom.Document;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.area.Area;
import org.apache.fop.area.Trait;
import org.apache.fop.fonts.CustomFontCollection;
@@ -42,6 +43,10 @@ import org.apache.fop.fonts.base14.Base1
/** Abstract base class of "Print" type renderers. */
public abstract class PrintRenderer extends AbstractRenderer {
+ public PrintRenderer(FOUserAgent userAgent) {
+ super(userAgent);
+ }
+
/** Font configuration */
protected FontInfo fontInfo;
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/Renderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/Renderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/Renderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/Renderer.java Mon Jan
23 16:15:23 2012
@@ -82,13 +82,6 @@ public interface Renderer {
throws IOException;
/**
- * Set the User Agent.
- *
- * @param agent The User Agent
- */
- void setUserAgent(FOUserAgent agent);
-
- /**
* Returns the associated user agent.
* @return the user agent
*/
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererFactory.java
Mon Jan 23 16:15:23 2012
@@ -299,7 +299,6 @@ public class RendererFactory {
AbstractRendererMaker maker = getRendererMaker(outputFormat);
if (maker != null) {
Renderer rend = maker.makeRenderer(userAgent);
- rend.setUserAgent(userAgent);
RendererConfigurator configurator =
maker.getConfigurator(userAgent);
if (configurator != null) {
configurator.configure(rend);
@@ -311,8 +310,7 @@ public class RendererFactory {
}
private Renderer createRendererForDocumentHandler(IFDocumentHandler
documentHandler) {
- IFRenderer rend = new IFRenderer();
- rend.setUserAgent(documentHandler.getContext().getUserAgent());
+ IFRenderer rend = new
IFRenderer(documentHandler.getContext().getUserAgent());
rend.setDocumentHandler(documentHandler);
return rend;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRenderer.java
Mon Jan 23 16:15:23 2012
@@ -64,18 +64,6 @@ public class AWTRenderer extends Java2DR
/** flag for debugging */
public boolean debug; // CSOK:
VisibilityModifier
- /** If true, preview dialog is shown. */
- public boolean dialogDisplay = true; // CSOK:
VisibilityModifier
-
- /** true if the preview dialog should be the main window of the
application */
- private boolean previewAsMainWindow;
-
- /**
- * Renderable instance that can be used to reload and re-render a document
after
- * modifications.
- */
- protected Renderable renderable;
-
/**
* Will be notified when rendering progresses
*/
@@ -84,48 +72,36 @@ public class AWTRenderer extends Java2DR
/**
* Creates a new AWTRenderer instance.
+ *
+ * @param userAgent the user agent that contains configuration data
*/
- public AWTRenderer() {
- this(false);
+ public AWTRenderer(FOUserAgent userAgent) {
+ this(userAgent, null, false, false);
}
/**
* Creates a new AWTRenderer instance.
+ *
+ * @param userAgent the user agent that contains configuration data
+ * @param renderable a Renderable instance can be set so the Preview
Dialog can enable the
+ * "Reload" button which causes the current document to be reprocessed and
redisplayed.
* @param previewAsMainWindow true if the preview dialog created by the
renderer should be
- * the main window of the application.
- */
- public AWTRenderer(boolean previewAsMainWindow) {
- this.previewAsMainWindow = previewAsMainWindow;
- }
-
- /** {@inheritDoc} */
- public void setUserAgent(FOUserAgent foUserAgent) {
- super.setUserAgent(foUserAgent);
- if (dialogDisplay) {
- setStatusListener(PreviewDialog.createPreviewDialog(userAgent,
this.renderable,
- this.previewAsMainWindow));
+ * the main window of the application.
+ * @param show sets whether the preview dialog should be created and
displayed when the
+ * rendering has finished.
+ */
+ public AWTRenderer(FOUserAgent userAgent, Renderable renderable, boolean
previewAsMainWindow,
+ boolean show) {
+ super(userAgent);
+ if (show) {
+ // MH: Not sure about this??? If show is false, there's no way for
this class
+ // to create a preview dialog... Previously a "setUserAgent" could
be called.
+ setStatusListener(PreviewDialog.createPreviewDialog(userAgent,
renderable,
+ previewAsMainWindow));
}
}
/**
- * A Renderable instance can be set so the Preview Dialog can enable the
"Reload" button
- * which causes the current document to be reprocessed and redisplayed.
- * @param renderable the Renderable instance.
- */
- public void setRenderable(Renderable renderable) {
- this.renderable = renderable;
- }
-
- /**
- * Sets whether the preview dialog should be created and displayed when
- * the rendering is finished.
- * @param show If false, preview dialog is not shown. True by default
- */
- public void setPreviewDialogDisplayed(boolean show) {
- dialogDisplay = show;
- }
-
- /**
* {@inheritDoc}
*/
public void renderPage(PageViewport pageViewport) throws IOException {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRendererMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRendererMaker.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRendererMaker.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/AWTRendererMaker.java
Mon Jan 23 16:15:23 2012
@@ -34,7 +34,7 @@ public class AWTRendererMaker extends Ab
/** {@inheritDoc} */
public Renderer makeRenderer(FOUserAgent ua) {
- return new AWTRenderer();
+ return new AWTRenderer(ua);
}
/** {@inheritDoc} */
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java
Mon Jan 23 16:15:23 2012
@@ -67,12 +67,9 @@ import org.apache.fop.render.awt.AWTRend
* </p>
* <pre>
* FopFactory fopFactory = FopFactory.newInstance();
- * AWTRenderer renderer = new AWTRenderer();
* FOUserAgent agent = fopFactory.newFOUserAgent();
+ * AWTRenderer renderer = new AWTRenderer(agent);
* agent.setRendererOverride(renderer);
- * renderer.setPreviewDialogDisplayed(false);
- * renderer.setUserAgent(agent);
- * renderer.setUserAgent(agent);
* previewPanel = new PreviewPanel(agent, null, renderer);
* previewPanel = new PreviewPanel(ua);
* myGui.add(previewPanel);
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRenderer.java
Mon Jan 23 16:15:23 2012
@@ -29,6 +29,7 @@ import org.apache.xmlgraphics.image.writ
import org.apache.xmlgraphics.image.writer.ImageWriterParams;
import org.apache.xmlgraphics.image.writer.ImageWriterRegistry;
+import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.area.PageViewport;
import org.apache.fop.render.java2d.Java2DRenderer;
@@ -40,6 +41,10 @@ import org.apache.fop.render.java2d.Java
*/
public class PNGRenderer extends Java2DRenderer {
+ public PNGRenderer(FOUserAgent userAgent) {
+ super(userAgent);
+ }
+
/** The MIME type for png-Rendering */
public static final String MIME_TYPE = MimeConstants.MIME_PNG;
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java
Mon Jan 23 16:15:23 2012
@@ -36,7 +36,7 @@ public class PNGRendererMaker extends Ab
/** {@inheritDoc} */
public Renderer makeRenderer(FOUserAgent ua) {
- return new PNGRenderer();
+ return new PNGRenderer(ua);
}
/** {@inheritDoc} */
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
Mon Jan 23 16:15:23 2012
@@ -83,19 +83,11 @@ public class TIFFRenderer extends Java2D
}
/** Creates TIFF renderer. */
- public TIFFRenderer() {
+ public TIFFRenderer(FOUserAgent userAgent) {
+ super(userAgent);
writerParams = new ImageWriterParams();
writerParams.setCompressionMethod(COMPRESSION_PACKBITS);
- }
-
- /**
- * {@inheritDoc}
- * org.apache.fop.apps.FOUserAgent)
- */
- public void setUserAgent(FOUserAgent foUserAgent) {
- super.setUserAgent(foUserAgent);
- //Set target resolution
int dpi = Math.round(userAgent.getTargetResolution());
writerParams.setResolution(dpi);
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java
Mon Jan 23 16:15:23 2012
@@ -34,7 +34,7 @@ public class TIFFRendererMaker extends A
/** {@inheritDoc} */
public Renderer makeRenderer(FOUserAgent userAgent) {
- return new TIFFRenderer();
+ return new TIFFRenderer(userAgent);
}
/** {@inheritDoc} */
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/intermediate/IFRenderer.java
Mon Jan 23 16:15:23 2012
@@ -51,6 +51,7 @@ import org.apache.xmlgraphics.xmp.schema
import org.apache.fop.Version;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.area.Area;
import org.apache.fop.area.AreaTreeObject;
@@ -70,10 +71,10 @@ import org.apache.fop.area.inline.Foreig
import org.apache.fop.area.inline.Image;
import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.area.inline.InlineParent;
+import org.apache.fop.area.inline.InlineViewport;
import org.apache.fop.area.inline.Leader;
import org.apache.fop.area.inline.SpaceArea;
import org.apache.fop.area.inline.TextArea;
-import org.apache.fop.area.inline.InlineViewport;
import org.apache.fop.area.inline.WordArea;
import org.apache.fop.datatypes.URISpecification;
import org.apache.fop.fo.extensions.ExtensionAttachment;
@@ -158,7 +159,8 @@ public class IFRenderer extends Abstract
/**
* Main constructor
*/
- public IFRenderer() {
+ public IFRenderer(FOUserAgent userAgent) {
+ super(userAgent);
}
/** {@inheritDoc} */
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
Mon Jan 23 16:15:23 2012
@@ -147,15 +147,13 @@ public abstract class Java2DRenderer ext
private GeneralPath currentPath = null;
/** Default constructor */
- public Java2DRenderer() {
- }
+ public Java2DRenderer(FOUserAgent userAgent) {
+ super(userAgent);
- /** {@inheritDoc} */
- public void setUserAgent(FOUserAgent foUserAgent) {
- super.setUserAgent(foUserAgent);
+ // MH: necessary? the caller has access to FOUserAgent
userAgent.setRendererOverride(this); // for document regeneration
- String s =
(String)userAgent.getRendererOptions().get(JAVA2D_TRANSPARENT_PAGE_BACKGROUND);
+ String s = (String)
userAgent.getRendererOptions().get(JAVA2D_TRANSPARENT_PAGE_BACKGROUND);
if (s != null) {
this.transparentPageBackground = "true".equalsIgnoreCase(s);
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PageableRenderer.java
Mon Jan 23 16:15:23 2012
@@ -73,7 +73,11 @@ public class PageableRenderer extends Ja
/**
* Creates a new PageableRenderer.
*/
- public PageableRenderer() {
+ public PageableRenderer(FOUserAgent userAgent) {
+ super(userAgent);
+ Map rendererOptions = getUserAgent().getRendererOptions();
+ processOptions(rendererOptions);
+ this.pageFilter = new DefaultPageFilter();
}
/** {@inheritDoc} */
@@ -81,15 +85,6 @@ public class PageableRenderer extends Ja
return MimeConstants.MIME_FOP_PRINT;
}
- /** {@inheritDoc} */
- public void setUserAgent(FOUserAgent agent) {
- super.setUserAgent(agent);
-
- Map rendererOptions = agent.getRendererOptions();
- processOptions(rendererOptions);
- this.pageFilter = new DefaultPageFilter();
- }
-
private void processOptions(Map rendererOptions) {
Object o = rendererOptions.get(PageableRenderer.PAGES_MODE);
if (o != null) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRenderer.java
Mon Jan 23 16:15:23 2012
@@ -55,19 +55,9 @@ public class PrintRenderer extends Pagea
* Creates a new PrintRenderer with the options set through the renderer
options if a custom
* PrinterJob is not given in FOUserAgent's renderer options.
*/
- public PrintRenderer() {
- }
-
- /**
- * Creates a new PrintRenderer and allows you to pass in a specific
PrinterJob instance
- * that this renderer should work with.
- * @param printerJob the PrinterJob instance
- * @deprecated Please use the rendering options on the user agent to pass
in the PrinterJob!
- */
- public PrintRenderer(PrinterJob printerJob) {
- this();
- this.printerJob = printerJob;
- printerJob.setPageable(this);
+ public PrintRenderer(FOUserAgent userAgent) {
+ super(userAgent);
+ setRendererOptions();
}
private void initializePrinterJob() {
@@ -85,11 +75,8 @@ public class PrintRenderer extends Pagea
}
}
- /** {@inheritDoc} */
- public void setUserAgent(FOUserAgent agent) {
- super.setUserAgent(agent);
-
- Map rendererOptions = agent.getRendererOptions();
+ private void setRendererOptions() {
+ Map rendererOptions = getUserAgent().getRendererOptions();
Object printerJobO = rendererOptions.get(PrintRenderer.PRINTER_JOB);
if (printerJobO != null) {
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRendererMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRendererMaker.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRendererMaker.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/print/PrintRendererMaker.java
Mon Jan 23 16:15:23 2012
@@ -35,7 +35,7 @@ public class PrintRendererMaker extends
/**{@inheritDoc} */
public Renderer makeRenderer(FOUserAgent userAgent) {
- return new PrintRenderer();
+ return new PrintRenderer(userAgent);
}
/** {@inheritDoc} */
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRenderer.java
Mon Jan 23 16:15:23 2012
@@ -32,6 +32,7 @@ import java.util.Map;
import org.apache.xmlgraphics.util.UnitConv;
import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.area.Area;
import org.apache.fop.area.CTM;
import org.apache.fop.area.PageViewport;
@@ -110,7 +111,8 @@ public class TXTRenderer extends Abstrac
/**
* Constructs a newly allocated <code>TXTRenderer</code> object.
*/
- public TXTRenderer() {
+ public TXTRenderer(FOUserAgent userAgent) {
+ super(userAgent);
}
/** {@inheritDoc} */
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRendererMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRendererMaker.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRendererMaker.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRendererMaker.java
Mon Jan 23 16:15:23 2012
@@ -34,7 +34,7 @@ public class TXTRendererMaker extends Ab
/**{@inheritDoc} */
public Renderer makeRenderer(FOUserAgent userAgent) {
- return new TXTRenderer();
+ return new TXTRenderer(userAgent);
}
/**{@inheritDoc} */
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/AbstractXMLRenderer.java
Mon Jan 23 16:15:23 2012
@@ -29,6 +29,15 @@ import javax.xml.transform.sax.SAXTransf
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.stream.StreamResult;
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.ext.LexicalHandler;
+import org.xml.sax.helpers.AttributesImpl;
+
+import org.apache.xmlgraphics.util.QName;
+
+import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.area.BookmarkData;
import org.apache.fop.area.OffDocumentExtensionAttachment;
import org.apache.fop.area.OffDocumentItem;
@@ -36,16 +45,14 @@ import org.apache.fop.area.PageViewport;
import org.apache.fop.fo.extensions.ExtensionAttachment;
import org.apache.fop.render.PrintRenderer;
import org.apache.fop.render.RendererContext;
-import org.apache.xmlgraphics.util.QName;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.AttributesImpl;
/** Abstract xml renderer base class. */
public abstract class AbstractXMLRenderer extends PrintRenderer {
+ public AbstractXMLRenderer(FOUserAgent userAgent) {
+ super(userAgent);
+ }
+
/** Main namespace in use. */
public static final String NS = "";
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRenderer.java
Mon Jan 23 16:15:23 2012
@@ -37,7 +37,6 @@ import javax.xml.transform.stream.Stream
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-
import org.xml.sax.SAXException;
import org.apache.xmlgraphics.util.QName;
@@ -75,11 +74,11 @@ import org.apache.fop.area.inline.Image;
import org.apache.fop.area.inline.InlineArea;
import org.apache.fop.area.inline.InlineBlockParent;
import org.apache.fop.area.inline.InlineParent;
+import org.apache.fop.area.inline.InlineViewport;
import org.apache.fop.area.inline.Leader;
import org.apache.fop.area.inline.Space;
import org.apache.fop.area.inline.SpaceArea;
import org.apache.fop.area.inline.TextArea;
-import org.apache.fop.area.inline.InlineViewport;
import org.apache.fop.area.inline.WordArea;
import org.apache.fop.fo.Constants;
import org.apache.fop.fo.extensions.ExtensionAttachment;
@@ -113,20 +112,9 @@ public class XMLRenderer extends Abstrac
private int pageSequenceIndex;
- /**
- * Creates a new XML renderer.
- */
- public XMLRenderer() {
+ public XMLRenderer(FOUserAgent userAgent) {
+ super(userAgent);
context = new RendererContext(this, XML_MIME_TYPE);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setUserAgent(FOUserAgent agent) {
- super.setUserAgent(agent);
-
XMLHandler xmlHandler = new XMLXMLHandler();
userAgent.getXMLHandlerRegistry().addXMLHandler(xmlHandler);
Boolean b =
(Boolean)userAgent.getRendererOptions().get("compact-format");
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRendererMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRendererMaker.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRendererMaker.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/xml/XMLRendererMaker.java
Mon Jan 23 16:15:23 2012
@@ -35,7 +35,7 @@ public class XMLRendererMaker extends Ab
/**{@inheritDoc} */
public Renderer makeRenderer(FOUserAgent userAgent) {
- return new XMLRenderer();
+ return new XMLRenderer(userAgent);
}
/**{@inheritDoc} */
Modified:
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java
(original)
+++
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java
Mon Jan 23 16:15:23 2012
@@ -26,19 +26,22 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.Writer;
+import org.w3c.dom.DOMImplementation;
+import org.w3c.dom.Document;
+
import org.apache.batik.dom.GenericDOMImplementation;
import org.apache.batik.svggen.SVGGeneratorContext;
import org.apache.batik.svggen.SVGGraphics2D;
import org.apache.commons.io.IOUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.area.PageViewport;
import org.apache.fop.render.bitmap.MultiFileRenderingUtil;
import org.apache.fop.render.java2d.Java2DGraphicsState;
import org.apache.fop.render.java2d.Java2DRenderer;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
/**
* <p>
@@ -67,8 +70,8 @@ public class SVGRenderer extends Java2DR
/** Helper class for generating multiple files */
private MultiFileRenderingUtil multiFileUtil;
- /** Default constructor. */
- public SVGRenderer() {
+ public SVGRenderer(FOUserAgent userAgent) {
+ super(userAgent);
}
/** {@inheritDoc} */
Modified:
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java
(original)
+++
xmlgraphics/fop/trunk/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java
Mon Jan 23 16:15:23 2012
@@ -34,7 +34,7 @@ public class SVGRendererMaker extends Ab
/** {@inheritDoc} */
public Renderer makeRenderer(FOUserAgent ua) {
- return new SVGRenderer();
+ return new SVGRenderer(ua);
}
/** {@inheritDoc} */
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
(original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java
Mon Jan 23 16:15:23 2012
@@ -39,19 +39,21 @@ import javax.xml.transform.sax.Transform
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.w3c.dom.Document;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.apache.xpath.XPathAPI;
+import org.apache.xpath.objects.XObject;
+
import org.apache.fop.apps.FOPException;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
import org.apache.fop.apps.FopFactory;
import org.apache.fop.apps.MimeConstants;
import org.apache.fop.render.xml.XMLRenderer;
-import org.apache.xpath.XPathAPI;
-import org.apache.xpath.objects.XObject;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.w3c.dom.Document;
/**
* Tests URI resolution facilities.
@@ -160,8 +162,7 @@ public class URIResolutionTestCase exten
TransformerHandler athandler = tfactory.newTransformerHandler();
athandler.setResult(domres);
- XMLRenderer atrenderer = new XMLRenderer();
- atrenderer.setUserAgent(ua);
+ XMLRenderer atrenderer = new XMLRenderer(ua);
atrenderer.setContentHandler(athandler);
ua.setRendererOverride(atrenderer);
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
Mon Jan 23 16:15:23 2012
@@ -97,10 +97,9 @@ public class AreaTreeParserTestCase exte
Renderer targetRenderer =
userAgent.getRendererFactory().createRenderer(
userAgent, getTargetMIME());
- XMLRenderer renderer = new XMLRenderer();
+ XMLRenderer renderer = new XMLRenderer(userAgent);
renderer.mimicRenderer(targetRenderer);
renderer.setContentHandler(handler);
- renderer.setUserAgent(userAgent);
userAgent.setRendererOverride(renderer);
@@ -131,12 +130,10 @@ public class AreaTreeParserTestCase exte
TransformerHandler handler =
testAssistant.getTransformerFactory().newTransformerHandler();
DOMResult domResult = new DOMResult();
handler.setResult(domResult);
- XMLRenderer renderer = new XMLRenderer();
- renderer.setContentHandler(handler);
-
FOUserAgent userAgent = createUserAgent();
+ XMLRenderer renderer = new XMLRenderer(userAgent);
userAgent.setRendererOverride(renderer);
- renderer.setUserAgent(userAgent);
+ renderer.setContentHandler(handler);
FontInfo fontInfo = new FontInfo();
AreaTreeModel treeModel = new RenderPagesModel(userAgent,
Modified:
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java?rev=1234877&r1=1234876&r2=1234877&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java
(original)
+++
xmlgraphics/fop/trunk/test/java/org/apache/fop/layoutengine/LayoutEngineTestCase.java
Mon Jan 23 16:15:23 2012
@@ -150,8 +150,7 @@ public class LayoutEngineTestCase {
ua.getEventBroadcaster().addEventListener(
new ConsoleEventListenerForTests(testFile.getName(),
EventSeverity.WARN));
- XMLRenderer atrenderer = new XMLRenderer();
- atrenderer.setUserAgent(ua);
+ XMLRenderer atrenderer = new XMLRenderer(ua);
atrenderer.setContentHandler(athandler);
ua.setRendererOverride(atrenderer);
fop = effFactory.newFop(ua);
@@ -208,8 +207,7 @@ public class LayoutEngineTestCase {
ua.getEventBroadcaster().addEventListener(
new ConsoleEventListenerForTests(testFile.getName(),
EventSeverity.WARN));
- IFRenderer ifRenderer = new IFRenderer();
- ifRenderer.setUserAgent(ua);
+ IFRenderer ifRenderer = new IFRenderer(ua);
IFSerializer serializer = new IFSerializer();
serializer.setContext(new IFContext(ua));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
