pietsch 2003/09/27 13:57:48
Modified: test/java/org/apache/fop BasicDriverTestCase.java
src/java/org/apache/fop/rtf/renderer RTFHandler.java
src/java/org/apache/fop/area/extensions BookmarkData.java
src/java/org/apache/fop/fo/extensions/svg SVGElement.java
src/java/org/apache/fop/render/ps PSXMLHandler.java
src/java/org/apache/fop/fo EnumProperty.java
Log:
Fixed Testcase.
Some style changes.
Replace FIXME with TODO
Revision Changes Path
1.2 +2 -23 xml-fop/test/java/org/apache/fop/BasicDriverTestCase.java
Index: BasicDriverTestCase.java
===================================================================
RCS file: /home/cvs/xml-fop/test/java/org/apache/fop/BasicDriverTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicDriverTestCase.java 4 Jul 2003 20:50:29 -0000 1.1
+++ BasicDriverTestCase.java 27 Sep 2003 20:57:48 -0000 1.2
@@ -71,7 +71,6 @@
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 @@
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);
- }
-
}
1.25 +8 -8 xml-fop/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
Index: RTFHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/renderer/RTFHandler.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- RTFHandler.java 21 Sep 2003 22:21:11 -0000 1.24
+++ RTFHandler.java 27 Sep 2003 20:57:48 -0000 1.25
@@ -151,13 +151,13 @@
* @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 @@
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 @@
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 @@
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) {
1.2 +2 -3
xml-fop/src/java/org/apache/fop/area/extensions/BookmarkData.java
Index: BookmarkData.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/area/extensions/BookmarkData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BookmarkData.java 21 Aug 2003 18:17:49 -0000 1.1
+++ BookmarkData.java 27 Sep 2003 20:57:48 -0000 1.2
@@ -251,8 +251,7 @@
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();
1.5 +2 -2
xml-fop/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java
Index: SVGElement.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SVGElement.java 16 Sep 2003 05:21:05 -0000 1.4
+++ SVGElement.java 27 Sep 2003 20:57:48 -0000 1.5
@@ -106,7 +106,7 @@
*/
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. */
1.7 +0 -1 xml-fop/src/java/org/apache/fop/render/ps/PSXMLHandler.java
Index: PSXMLHandler.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSXMLHandler.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PSXMLHandler.java 8 Sep 2003 17:00:56 -0000 1.6
+++ PSXMLHandler.java 27 Sep 2003 20:57:48 -0000 1.7
@@ -68,7 +68,6 @@
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;
1.3 +1 -1 xml-fop/src/java/org/apache/fop/fo/EnumProperty.java
Index: EnumProperty.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/EnumProperty.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EnumProperty.java 17 Jul 2003 17:31:28 -0000 1.2
+++ EnumProperty.java 27 Sep 2003 20:57:48 -0000 1.3
@@ -115,7 +115,7 @@
* @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);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
