keiron 01/09/26 05:00:43
Modified: src/org/apache/fop/render/awt AWTRenderer.java
src/org/apache/fop/render/pdf PDFRenderer.java
src/org/apache/fop/render/ps PSRenderer.java
src/org/apache/fop/svg SVGElement.java
Log:
catches exception when building svg
Revision Changes Path
1.38 +8 -2 xml-fop/src/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- AWTRenderer.java 2001/09/25 13:22:55 1.37
+++ AWTRenderer.java 2001/09/26 12:00:42 1.38
@@ -1,5 +1,5 @@
/*
- * $Id: AWTRenderer.java,v 1.37 2001/09/25 13:22:55 keiron Exp $
+ * $Id: AWTRenderer.java,v 1.38 2001/09/26 12:00:42 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -699,7 +699,13 @@
GVTBuilder builder = new GVTBuilder();
BridgeContext ctx = new BridgeContext(userAgent);
GraphicsNode root;
- root = builder.build(ctx, doc);
+ try {
+ root = builder.build(ctx, doc);
+ } catch (Exception e) {
+ log.error("svg graphic could not be built: "
+ + e.getMessage(), e);
+ return;
+ }
float w = (float)ctx.getDocumentSize().getWidth() * 1000f;
float h = (float)ctx.getDocumentSize().getHeight() * 1000f;
1.91 +8 -2 xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java
Index: PDFRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/pdf/PDFRenderer.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- PDFRenderer.java 2001/09/24 09:17:12 1.90
+++ PDFRenderer.java 2001/09/26 12:00:42 1.91
@@ -1,5 +1,5 @@
/*
- * $Id: PDFRenderer.java,v 1.90 2001/09/24 09:17:12 keiron Exp $
+ * $Id: PDFRenderer.java,v 1.91 2001/09/26 12:00:42 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -409,7 +409,13 @@
GraphicsNode root;
- root = builder.build(ctx, doc);
+ try {
+ root = builder.build(ctx, doc);
+ } catch (Exception e) {
+ log.error("svg graphic could not be built: "
+ + e.getMessage(), e);
+ return;
+ }
// get the 'width' and 'height' attributes of the SVG document
float w = (float)ctx.getDocumentSize().getWidth() * 1000f;
float h = (float)ctx.getDocumentSize().getHeight() * 1000f;
1.15 +11 -3 xml-fop/src/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PSRenderer.java 2001/09/24 07:31:52 1.14
+++ PSRenderer.java 2001/09/26 12:00:43 1.15
@@ -1,5 +1,5 @@
/*
- * $Id: PSRenderer.java,v 1.14 2001/09/24 07:31:52 keiron Exp $
+ * $Id: PSRenderer.java,v 1.15 2001/09/26 12:00:43 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -295,13 +295,21 @@
int y = this.currentYPosition;
Document doc = area.getSVGDocument();
- UserAgent userAgent = new org.apache.fop.svg.SVGUserAgent(new
AffineTransform());
+ org.apache.fop.svg.SVGUserAgent userAgent
+ = new org.apache.fop.svg.SVGUserAgent(new AffineTransform());
+ userAgent.setLogger(log);
GVTBuilder builder = new GVTBuilder();
BridgeContext ctx = new BridgeContext(userAgent);
GraphicsNode root;
- root = builder.build(ctx, doc);
+ try {
+ root = builder.build(ctx, doc);
+ } catch (Exception e) {
+ log.error("svg graphic could not be built: "
+ + e.getMessage(), e);
+ return;
+ }
// get the 'width' and 'height' attributes of the SVG document
float w = (float)ctx.getDocumentSize().getWidth() * 1000f;
float h = (float)ctx.getDocumentSize().getHeight() * 1000f;
1.14 +8 -8 xml-fop/src/org/apache/fop/svg/SVGElement.java
Index: SVGElement.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/SVGElement.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SVGElement.java 2001/09/25 12:32:36 1.13
+++ SVGElement.java 2001/09/26 12:00:43 1.14
@@ -1,5 +1,5 @@
/*
- * $Id: SVGElement.java,v 1.13 2001/09/25 12:32:36 keiron Exp $
+ * $Id: SVGElement.java,v 1.14 2001/09/26 12:00:43 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -138,6 +138,13 @@
};
((SVGOMDocument)doc).setSVGContext(dc);
+ try {
+ String baseDir = Configuration.getStringValue("baseDir");
+ ((SVGOMDocument)doc).setURLObject(new URL(baseDir));
+ } catch (Exception e) {
+ log.error("Could not set base URL for svg", e);
+ }
+
Element e = ((SVGDocument)doc).getRootElement();
String s;
SVGUserAgent userAgent = new SVGUserAgent(new AffineTransform());
@@ -185,13 +192,6 @@
element = doc.getDocumentElement();
- try {
- String baseDir = Configuration.getStringValue("baseDir");
- ((SVGOMDocument)doc).setURLObject(new URL(baseDir));
- } catch (Exception e) {
- // cannot use log yet
- //log.error("Could not set base URL for svg", e);
- }
buildTopLevel(doc, element);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
