[FOray-commit] SF.net SVN: foray: [6958] trunk/foray/foray-app/src/java/org/foray/app
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
[FOray-commit] SF.net SVN: foray: [6958] trunk/foray/foray-app/src/java/org/foray/app
|
From: <vic...@us...> - 2006-03-15 00:42:28
|
Revision: 6958 Author: victormote Date: 2006-03-14 16:42:14 -0800 (Tue, 14 Mar 2006) ViewCVS: http://svn.sourceforge.net/foray/?rev=6958&view=rev Log Message: ----------- Make the method makeOutputTarget from FOrayTarget to FOrayDocument, and make it non-static. This gives us more flexibility in bootstrapping the Renderers. Modified Paths: -------------- trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java trunk/foray/foray-app/src/java/org/foray/app/ant/FOray.java trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java Modified: trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java 2006-03-15 00:27:00 UTC (rev 6957) +++ trunk/foray/foray-app/src/java/org/foray/app/CommandLineStarter.java 2006-03-15 00:42:14 UTC (rev 6958) @@ -112,7 +112,7 @@ */ int outputType = commandLineOptions.getOutputType(); OutputConfig outputOptions = this.outputConfig; - OutputTarget outputTarget = FOrayTarget.makeOutputTarget(outputType, + OutputTarget outputTarget = document.makeOutputTarget(outputType, outputOptions); /* Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java 2006-03-15 00:27:00 UTC (rev 6957) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayDocument.java 2006-03-15 00:42:14 UTC (rev 6958) @@ -26,6 +26,16 @@ import org.foray.common.FOrayException; import org.foray.common.XMLParser; +import org.foray.output.MIFConverter; +import org.foray.output.OutputConfig; +import org.foray.output.OutputTarget; +import org.foray.render.awt.AWTRenderer; +import org.foray.render.pcl.PCLRenderer; +import org.foray.render.pdf.PDFRenderer; +import org.foray.render.ps.PSRenderer; +import org.foray.render.svg.SVGRenderer; +import org.foray.render.txt.TXTRenderer; +import org.foray.render.xml.XMLRenderer; import org.axsl.font.FontConsumer; import org.axsl.font.FontServer; @@ -403,4 +413,69 @@ return this.unsupportedProperties; } + /** + * Factory method that makes a new Renderer instance for the standard + * renderers. + * @param rendererType The integral id for the Renderer that should be + * used. Must be one of: + * <ul> + * <li>RENDER_PDF + * <li>RENDER_AWT + * <li>RENDER_MIF + * <li>RENDER_XML + * <li>RENDER_PCL + * <li>RENDER_PS + * <li>RENDER_TXT + * <li>RENDER_SVG + * </ul> + * @param outputOptions Map containing the options to be used with the + * Renderer. + */ + public OutputTarget makeOutputTarget(int rendererType, + OutputConfig outputOptions) throws FOrayException { + OutputTarget renderer = null; + switch (rendererType) { + case FOrayTarget.RENDER_AWT: { + renderer = new AWTRenderer(outputOptions); + break; + } + case FOrayTarget.RENDER_PRINT: { + throw new FOrayException("Print renderer cannot be instantiated " + + "from the standard method."); + } + case FOrayTarget.RENDER_PCL: { + renderer = new PCLRenderer(outputOptions); + break; + } + case FOrayTarget.RENDER_PS: { + renderer = new PSRenderer(outputOptions); + break; + } + case FOrayTarget.RENDER_TXT: { + renderer = new TXTRenderer(outputOptions); + break; + } + case FOrayTarget.RENDER_MIF: { + renderer = new MIFConverter(outputOptions); + break; + } + case FOrayTarget.RENDER_XML: { + renderer = new XMLRenderer(outputOptions); + break; + } + case FOrayTarget.RENDER_SVG: { + renderer = new SVGRenderer(outputOptions); + break; + } + default: { + renderer = new PDFRenderer(outputOptions); + break; + } + } + if (renderer == null) { + throw new FOrayException("Unable to create renderer."); + } + return renderer; + } + } Modified: trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-03-15 00:27:00 UTC (rev 6957) +++ trunk/foray/foray-app/src/java/org/foray/app/FOrayTarget.java 2006-03-15 00:42:14 UTC (rev 6958) @@ -33,19 +33,10 @@ import org.foray.common.FOrayException; import org.foray.font.FOrayFontConsumer; import org.foray.font.FOrayFontServer; -import org.foray.output.MIFConverter; -import org.foray.output.OutputConfig; import org.foray.output.OutputControl; import org.foray.output.OutputTarget; import org.foray.pioneer.PioneerLS; import org.foray.render.Renderer; -import org.foray.render.awt.AWTRenderer; -import org.foray.render.pcl.PCLRenderer; -import org.foray.render.pdf.PDFRenderer; -import org.foray.render.ps.PSRenderer; -import org.foray.render.svg.SVGRenderer; -import org.foray.render.txt.TXTRenderer; -import org.foray.render.xml.XMLRenderer; import org.axsl.areaOut.PageArea; import org.axsl.font.FontConsumer; @@ -494,71 +485,6 @@ return this.outputStream; } - /** - * Factory method that makes a new Renderer instance for the standard - * renderers. - * @param rendererType The integral id for the Renderer that should be - * used. Must be one of: - * <ul> - * <li>RENDER_PDF - * <li>RENDER_AWT - * <li>RENDER_MIF - * <li>RENDER_XML - * <li>RENDER_PCL - * <li>RENDER_PS - * <li>RENDER_TXT - * <li>RENDER_SVG - * </ul> - * @param outputOptions Map containing the options to be used with the - * Renderer. - */ - public static OutputTarget makeOutputTarget(int rendererType, - OutputConfig outputOptions) throws FOrayException { - OutputTarget renderer = null; - switch (rendererType) { - case RENDER_AWT: { - renderer = new AWTRenderer(outputOptions); - break; - } - case RENDER_PRINT: { - throw new FOrayException("Print renderer cannot be instantiated " - + "from the standard method."); - } - case RENDER_PCL: { - renderer = new PCLRenderer(outputOptions); - break; - } - case RENDER_PS: { - renderer = new PSRenderer(outputOptions); - break; - } - case RENDER_TXT: { - renderer = new TXTRenderer(outputOptions); - break; - } - case RENDER_MIF: { - renderer = new MIFConverter(outputOptions); - break; - } - case RENDER_XML: { - renderer = new XMLRenderer(outputOptions); - break; - } - case RENDER_SVG: { - renderer = new SVGRenderer(outputOptions); - break; - } - default: { - renderer = new PDFRenderer(outputOptions); - break; - } - } - if (renderer == null) { - throw new FOrayException("Unable to create renderer."); - } - return renderer; - } - public OutputTarget getOutputTarget() { return this.outputTarget; } Modified: trunk/foray/foray-app/src/java/org/foray/app/ant/FOray.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/ant/FOray.java 2006-03-15 00:27:00 UTC (rev 6957) +++ trunk/foray/foray-app/src/java/org/foray/app/ant/FOray.java 2006-03-15 00:42:14 UTC (rev 6958) @@ -489,7 +489,7 @@ rendererOptions.parseOption("fineDetail", "true", SessionConfig.PRECEDENCE_DEFAULT); } - OutputTarget renderer = FOrayTarget.makeOutputTarget(rendererType, + OutputTarget renderer = document.makeOutputTarget(rendererType, rendererOptions); new FOrayTarget(document, renderer, null, out); Modified: trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java 2006-03-15 00:27:00 UTC (rev 6957) +++ trunk/foray/foray-app/src/java/org/foray/app/test/TestConverter.java 2006-03-15 00:42:14 UTC (rev 6958) @@ -293,7 +293,7 @@ SessionConfig.PRECEDENCE_DEFAULT); renderOptions.parseOption("consistentOutput", "true", SessionConfig.PRECEDENCE_DEFAULT); - OutputTarget renderer = FOrayTarget.makeOutputTarget(rendererType, + OutputTarget renderer = document.makeOutputTarget(rendererType, renderOptions); new FOrayTarget(document, renderer, null, bos); Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java 2006-03-15 00:27:00 UTC (rev 6957) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoFO2PDF.java 2006-03-15 00:42:14 UTC (rev 6958) @@ -58,7 +58,7 @@ inputHandler.getInputSource(), inputHandler.getParser()); //Setup Renderer - OutputTarget renderer = FOrayTarget.makeOutputTarget(FOrayTarget.RENDER_PDF, + OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, null); //Setup FOrayTarget Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-03-15 00:27:00 UTC (rev 6957) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoObj2PDF.java 2006-03-15 00:42:14 UTC (rev 6958) @@ -73,7 +73,7 @@ FOrayDocument document = new FOrayDocument(driver, transformer, source); //Setup Renderer - OutputTarget renderer = FOrayTarget.makeOutputTarget(FOrayTarget.RENDER_PDF, + OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, null); //Setup FOrayTarget Modified: trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-03-15 00:27:00 UTC (rev 6957) +++ trunk/foray/foray-app/src/java/org/foray/demo/embed/DemoXML2PDF.java 2006-03-15 00:42:14 UTC (rev 6958) @@ -71,7 +71,7 @@ FOrayDocument document = new FOrayDocument(driver, transformer, source); //Setup Renderer - OutputTarget renderer = FOrayTarget.makeOutputTarget(FOrayTarget.RENDER_PDF, + OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, null); //Setup FOrayTarget Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-03-15 00:27:00 UTC (rev 6957) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/AbstractDemoServlet.java 2006-03-15 00:42:14 UTC (rev 6958) @@ -160,7 +160,7 @@ FOrayDocument document = setupSAXDocument(session, inputHandler); // Setup the Renderer - OutputTarget renderer = FOrayTarget.makeOutputTarget(FOrayTarget.RENDER_PDF, + OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, null); // Setup FOrayTarget @@ -203,7 +203,7 @@ source); // Setup the Renderer - OutputTarget renderer = FOrayTarget.makeOutputTarget(FOrayTarget.RENDER_PDF, + OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, null); // Setup FOrayTarget Modified: trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java =================================================================== --- trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java 2006-03-15 00:27:00 UTC (rev 6957) +++ trunk/foray/foray-app/src/java/org/foray/demo/servlet/DemoServlet.java 2006-03-15 00:42:14 UTC (rev 6958) @@ -118,7 +118,7 @@ private FOrayTarget setupTarget(FOrayDocument document) throws FOrayException { // Setup the Renderer - OutputTarget renderer = FOrayTarget.makeOutputTarget(FOrayTarget.RENDER_PDF, + OutputTarget renderer = document.makeOutputTarget(FOrayTarget.RENDER_PDF, null); // Setup FOrayTarget ByteArrayOutputStream output = new ByteArrayOutputStream(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
