You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by me...@apache.org on 2012/01/24 10:53:34 UTC
svn commit: r1235189 - in /xmlgraphics/fop/trunk:
examples/embedding/java/embedding/ examples/embedding/java/embedding/atxml/
src/java/org/apache/fop/cli/ src/java/org/apache/fop/render/
src/java/org/apache/fop/render/awt/ src/java/org/apache/fop/rende...
Author: mehdi
Date: Tue Jan 24 09:53:32 2012
New Revision: 1235189
URL: http://svn.apache.org/viewvc?rev=1235189&view=rev
Log:
Reverted changes made in r1234877, see bugzilla#52513
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=1235189&r1=1235188&r2=1235189&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2JPSPrint.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2JPSPrint.java Tue Jan 24 09:53:32 2012
@@ -85,7 +85,8 @@ 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(userAgent);
+ PageableRenderer renderer = new PageableRenderer();
+ renderer.setUserAgent(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=1235189&r1=1235188&r2=1235189&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java (original)
+++ xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java Tue Jan 24 09:53:32 2012
@@ -93,7 +93,8 @@ public class ExampleConcat {
userAgent, MimeConstants.MIME_PDF);
//Create the XMLRenderer to create the area tree XML
- XMLRenderer xmlRenderer = new XMLRenderer(userAgent);
+ XMLRenderer xmlRenderer = new XMLRenderer();
+ xmlRenderer.setUserAgent(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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -203,14 +203,17 @@ public class CommandLineOptions {
System.err.println("Couldn't set system look & feel!");
}
- AWTRenderer renderer = new AWTRenderer(foUserAgent, inputHandler, true, true);
+ AWTRenderer renderer = new AWTRenderer(true);
+ renderer.setRenderable(inputHandler); //set before user agent!
+ renderer.setUserAgent(foUserAgent);
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(foUserAgent);
+ XMLRenderer xmlRenderer = new XMLRenderer();
+ xmlRenderer.setUserAgent(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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -34,7 +34,6 @@ 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;
@@ -57,10 +56,6 @@ 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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 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;
- /**
- *
- * @param userAgent the user agent that contains configuration details. This cannot be null.
- */
- public AbstractRenderer(FOUserAgent userAgent) {
- this.userAgent = userAgent;
+ /** {@inheritDoc} */
+ public void setUserAgent(FOUserAgent agent) {
+ userAgent = agent;
}
/** {@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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -27,7 +27,6 @@ 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;
@@ -43,10 +42,6 @@ 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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -82,6 +82,13 @@ 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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -299,6 +299,7 @@ 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);
@@ -310,7 +311,8 @@ public class RendererFactory {
}
private Renderer createRendererForDocumentHandler(IFDocumentHandler documentHandler) {
- IFRenderer rend = new IFRenderer(documentHandler.getContext().getUserAgent());
+ IFRenderer rend = new IFRenderer();
+ rend.setUserAgent(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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -64,6 +64,18 @@ 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
*/
@@ -72,36 +84,48 @@ public class AWTRenderer extends Java2DR
/**
* Creates a new AWTRenderer instance.
- *
- * @param userAgent the user agent that contains configuration data
*/
- public AWTRenderer(FOUserAgent userAgent) {
- this(userAgent, null, false, false);
+ public AWTRenderer() {
+ this(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.
- * @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));
+ * 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));
}
}
/**
+ * 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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -34,7 +34,7 @@ public class AWTRendererMaker extends Ab
/** {@inheritDoc} */
public Renderer makeRenderer(FOUserAgent ua) {
- return new AWTRenderer(ua);
+ return new AWTRenderer();
}
/** {@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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -67,9 +67,12 @@ 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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -29,7 +29,6 @@ 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;
@@ -41,10 +40,6 @@ 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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -36,7 +36,7 @@ public class PNGRendererMaker extends Ab
/** {@inheritDoc} */
public Renderer makeRenderer(FOUserAgent ua) {
- return new PNGRenderer(ua);
+ return new PNGRenderer();
}
/** {@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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -83,11 +83,19 @@ public class TIFFRenderer extends Java2D
}
/** Creates TIFF renderer. */
- public TIFFRenderer(FOUserAgent userAgent) {
- super(userAgent);
+ public TIFFRenderer() {
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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -34,7 +34,7 @@ public class TIFFRendererMaker extends A
/** {@inheritDoc} */
public Renderer makeRenderer(FOUserAgent userAgent) {
- return new TIFFRenderer(userAgent);
+ return new TIFFRenderer();
}
/** {@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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -51,7 +51,6 @@ 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;
@@ -71,10 +70,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;
@@ -159,8 +158,7 @@ public class IFRenderer extends Abstract
/**
* Main constructor
*/
- public IFRenderer(FOUserAgent userAgent) {
- super(userAgent);
+ public IFRenderer() {
}
/** {@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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -147,13 +147,15 @@ public abstract class Java2DRenderer ext
private GeneralPath currentPath = null;
/** Default constructor */
- public Java2DRenderer(FOUserAgent userAgent) {
- super(userAgent);
+ public Java2DRenderer() {
+ }
- // MH: necessary? the caller has access to FOUserAgent
+ /** {@inheritDoc} */
+ public void setUserAgent(FOUserAgent foUserAgent) {
+ super.setUserAgent(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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -73,11 +73,7 @@ public class PageableRenderer extends Ja
/**
* Creates a new PageableRenderer.
*/
- public PageableRenderer(FOUserAgent userAgent) {
- super(userAgent);
- Map rendererOptions = getUserAgent().getRendererOptions();
- processOptions(rendererOptions);
- this.pageFilter = new DefaultPageFilter();
+ public PageableRenderer() {
}
/** {@inheritDoc} */
@@ -85,6 +81,15 @@ 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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -55,9 +55,19 @@ 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(FOUserAgent userAgent) {
- super(userAgent);
- setRendererOptions();
+ 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);
}
private void initializePrinterJob() {
@@ -75,8 +85,11 @@ public class PrintRenderer extends Pagea
}
}
- private void setRendererOptions() {
- Map rendererOptions = getUserAgent().getRendererOptions();
+ /** {@inheritDoc} */
+ public void setUserAgent(FOUserAgent agent) {
+ super.setUserAgent(agent);
+
+ Map rendererOptions = agent.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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -35,7 +35,7 @@ public class PrintRendererMaker extends
/**{@inheritDoc} */
public Renderer makeRenderer(FOUserAgent userAgent) {
- return new PrintRenderer(userAgent);
+ return new PrintRenderer();
}
/** {@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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -32,7 +32,6 @@ 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;
@@ -111,8 +110,7 @@ public class TXTRenderer extends Abstrac
/**
* Constructs a newly allocated <code>TXTRenderer</code> object.
*/
- public TXTRenderer(FOUserAgent userAgent) {
- super(userAgent);
+ public TXTRenderer() {
}
/** {@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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -34,7 +34,7 @@ public class TXTRendererMaker extends Ab
/**{@inheritDoc} */
public Renderer makeRenderer(FOUserAgent userAgent) {
- return new TXTRenderer(userAgent);
+ return new TXTRenderer();
}
/**{@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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -29,15 +29,6 @@ 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;
@@ -45,14 +36,16 @@ 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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -37,6 +37,7 @@ 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;
@@ -74,11 +75,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;
@@ -112,9 +113,20 @@ public class XMLRenderer extends Abstrac
private int pageSequenceIndex;
- public XMLRenderer(FOUserAgent userAgent) {
- super(userAgent);
+ /**
+ * Creates a new XML renderer.
+ */
+ public XMLRenderer() {
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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -35,7 +35,7 @@ public class XMLRendererMaker extends Ab
/**{@inheritDoc} */
public Renderer makeRenderer(FOUserAgent userAgent) {
- return new XMLRenderer(userAgent);
+ return new XMLRenderer();
}
/**{@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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -26,22 +26,19 @@ 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>
@@ -70,8 +67,8 @@ public class SVGRenderer extends Java2DR
/** Helper class for generating multiple files */
private MultiFileRenderingUtil multiFileUtil;
- public SVGRenderer(FOUserAgent userAgent) {
- super(userAgent);
+ /** Default constructor. */
+ public SVGRenderer() {
}
/** {@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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -34,7 +34,7 @@ public class SVGRendererMaker extends Ab
/** {@inheritDoc} */
public Renderer makeRenderer(FOUserAgent ua) {
- return new SVGRenderer(ua);
+ return new SVGRenderer();
}
/** {@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=1235189&r1=1235188&r2=1235189&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java (original)
+++ xmlgraphics/fop/trunk/test/java/org/apache/fop/URIResolutionTestCase.java Tue Jan 24 09:53:32 2012
@@ -39,21 +39,19 @@ 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.
@@ -162,7 +160,8 @@ public class URIResolutionTestCase exten
TransformerHandler athandler = tfactory.newTransformerHandler();
athandler.setResult(domres);
- XMLRenderer atrenderer = new XMLRenderer(ua);
+ XMLRenderer atrenderer = new XMLRenderer();
+ atrenderer.setUserAgent(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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -97,9 +97,10 @@ public class AreaTreeParserTestCase exte
Renderer targetRenderer = userAgent.getRendererFactory().createRenderer(
userAgent, getTargetMIME());
- XMLRenderer renderer = new XMLRenderer(userAgent);
+ XMLRenderer renderer = new XMLRenderer();
renderer.mimicRenderer(targetRenderer);
renderer.setContentHandler(handler);
+ renderer.setUserAgent(userAgent);
userAgent.setRendererOverride(renderer);
@@ -130,10 +131,12 @@ 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.setContentHandler(handler);
+ renderer.setUserAgent(userAgent);
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=1235189&r1=1235188&r2=1235189&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 Tue Jan 24 09:53:32 2012
@@ -150,7 +150,8 @@ public class LayoutEngineTestCase {
ua.getEventBroadcaster().addEventListener(
new ConsoleEventListenerForTests(testFile.getName(), EventSeverity.WARN));
- XMLRenderer atrenderer = new XMLRenderer(ua);
+ XMLRenderer atrenderer = new XMLRenderer();
+ atrenderer.setUserAgent(ua);
atrenderer.setContentHandler(athandler);
ua.setRendererOverride(atrenderer);
fop = effFactory.newFop(ua);
@@ -207,7 +208,8 @@ public class LayoutEngineTestCase {
ua.getEventBroadcaster().addEventListener(
new ConsoleEventListenerForTests(testFile.getName(), EventSeverity.WARN));
- IFRenderer ifRenderer = new IFRenderer(ua);
+ IFRenderer ifRenderer = new IFRenderer();
+ ifRenderer.setUserAgent(ua);
IFSerializer serializer = new IFSerializer();
serializer.setContext(new IFContext(ua));
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org