From: Joerg Pietschmann Date: Sat, 27 Sep 2003 20:57:48 +0000 (+0000) Subject: Fixed Testcase. X-Git-Tag: Root_Temp_KnuthStylePageBreaking~1073 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=164d432566fe2a821959c078c8230f9834e16c09;p=xmlgraphics-fop.git Fixed Testcase. Some style changes. Replace FIXME with TODO git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196939 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/java/org/apache/fop/area/extensions/BookmarkData.java b/src/java/org/apache/fop/area/extensions/BookmarkData.java index f8afe5515..cbad4d3d6 100644 --- a/src/java/org/apache/fop/area/extensions/BookmarkData.java +++ b/src/java/org/apache/fop/area/extensions/BookmarkData.java @@ -251,8 +251,7 @@ public class BookmarkData implements Resolveable, TreeExt { if (pages != null) { pageRef = (PageViewport)pages.get(0); } - // TODO - // get rect area of id on page + // TODO get rect area of id on page idRefs.remove(idRef); checkFinish(); diff --git a/src/java/org/apache/fop/fo/EnumProperty.java b/src/java/org/apache/fop/fo/EnumProperty.java index ed3bbfde8..b23c8ec5a 100644 --- a/src/java/org/apache/fop/fo/EnumProperty.java +++ b/src/java/org/apache/fop/fo/EnumProperty.java @@ -115,7 +115,7 @@ public class EnumProperty extends Property { * @return this.value cast as an Object */ public Object getObject() { - // FIXME: return String value: property must reference maker + // TODO return String value: property must reference maker // return maker.getEnumValue(this.value); return new Integer(this.value); } diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java index 41d0b7a1f..17903aae2 100644 --- a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java +++ b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java @@ -106,7 +106,7 @@ public class SVGElement extends SVGObj { */ public Point2D getDimension(final Point2D view) { - // TODO - change so doesn't hold onto fo,area tree + // TODO change so doesn't hold onto fo, area tree Element svgRoot = element; /* create an SVG area */ /* if width and height are zero, get the bounds of the content. */ diff --git a/src/java/org/apache/fop/render/ps/PSXMLHandler.java b/src/java/org/apache/fop/render/ps/PSXMLHandler.java index 66b74d5c1..c500fe9c4 100644 --- a/src/java/org/apache/fop/render/ps/PSXMLHandler.java +++ b/src/java/org/apache/fop/render/ps/PSXMLHandler.java @@ -68,7 +68,6 @@ import org.apache.batik.gvt.GraphicsNode; import org.apache.batik.gvt.TextPainter; // FOP -import org.apache.fop.apps.Document; import org.apache.fop.render.XMLHandler; import org.apache.fop.render.RendererContext; import org.apache.fop.fo.extensions.svg.SVGUserAgent; diff --git a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java b/src/java/org/apache/fop/rtf/renderer/RTFHandler.java index 67435d4f1..6319390b2 100644 --- a/src/java/org/apache/fop/rtf/renderer/RTFHandler.java +++ b/src/java/org/apache/fop/rtf/renderer/RTFHandler.java @@ -151,13 +151,13 @@ public class RTFHandler extends FOInputHandler { * @see org.apache.fop.fo.FOInputHandler#startDocument() */ public void startDocument() throws SAXException { - // FIXME sections should be created + // TODO sections should be created try { rtfFile = new RtfFile(new OutputStreamWriter(os)); docArea = rtfFile.startDocumentArea(); } catch (IOException ioe) { - // FIXME could we throw Exception in all FOInputHandler events? - throw new SAXException("IOException: " + ioe); + // TODO could we throw Exception in all FOInputHandler events? + throw new SAXException(ioe); } } @@ -168,8 +168,8 @@ public class RTFHandler extends FOInputHandler { try { rtfFile.flush(); } catch (IOException ioe) { - // FIXME could we throw Exception in all FOInputHandler events? - throw new SAXException("IOException: " + ioe); + // TODO could we throw Exception in all FOInputHandler events? + throw new SAXException(ioe); } } @@ -184,9 +184,9 @@ public class RTFHandler extends FOInputHandler { bHeaderSpecified = false; bFooterSpecified = false; } catch (IOException ioe) { - // FIXME could we throw Exception in all FOInputHandler events? + // TODO could we throw Exception in all FOInputHandler events? log.error("startPageSequence: " + ioe.getMessage()); - throw new Error("IOException: " + ioe); + //TODO throw new FOPException(ioe); } } @@ -311,7 +311,7 @@ public class RTFHandler extends FOInputHandler { builderContext.pushContainer(para); } catch (IOException ioe) { - // FIXME could we throw Exception in all FOInputHandler events? + // TODO could we throw Exception in all FOInputHandler events? log.error("startBlock: " + ioe.getMessage()); throw new Error("IOException: " + ioe); } catch (Exception e) { diff --git a/test/java/org/apache/fop/BasicDriverTestCase.java b/test/java/org/apache/fop/BasicDriverTestCase.java index 6e3f122b2..0838ef1ad 100644 --- a/test/java/org/apache/fop/BasicDriverTestCase.java +++ b/test/java/org/apache/fop/BasicDriverTestCase.java @@ -71,7 +71,6 @@ import org.apache.avalon.framework.logger.NullLogger; import org.apache.commons.io.output.ByteArrayOutputStream; import org.apache.fop.apps.Driver; import org.apache.fop.apps.InputHandler; -import org.apache.fop.apps.TraxInputHandler; import org.apache.fop.apps.XSLTInputHandler; import org.w3c.dom.Document; @@ -207,29 +206,9 @@ public class BasicDriverTestCase extends AbstractFOPTestCase { driver.setRenderer(Driver.RENDER_PDF); InputHandler handler = new XSLTInputHandler(xmlFile, xsltFile); - handler.run(driver); + driver.render(handler); assertTrue("Generated PDF has zero length", baout.size() > 0); } - /** - * Tests Driver with TraxInputHandler and OutputStream. - * @throws Exception if anything fails - */ - public void testFO2PDFWithTraxInputHandler() throws Exception { - File xmlFile = new File(getBaseDir(), "test/xml/1.xml"); - File xsltFile = new File(getBaseDir(), "test/xsl/doc.xsl"); - ByteArrayOutputStream baout = new ByteArrayOutputStream(); - Driver driver = new Driver(); - ContainerUtil.enableLogging(driver, this.logger); - driver.setOutputStream(baout); - driver.setRenderer(Driver.RENDER_PDF); - - InputHandler handler = new TraxInputHandler(xmlFile, xsltFile); - handler.run(driver); - - assertTrue("Generated PDF has zero length", baout.size() > 0); - } - - }