# HG changeset patch # User Ingo Weinzierl # Date 1259593466 0 # Node ID a88e15972c72900e72b607f0a71ff96bb0f09935 # Parent 57a2bf6308549352cf7a04918cf867480c1dbddf Updated Batik library to 1.7 gnv-artifacts/trunk@386 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 57a2bf630854 -r a88e15972c72 gnv-artifacts/ChangeLog --- a/gnv-artifacts/ChangeLog Mon Nov 30 14:19:23 2009 +0000 +++ b/gnv-artifacts/ChangeLog Mon Nov 30 15:04:26 2009 +0000 @@ -1,3 +1,11 @@ +2009-11-30 Ingo Weinzierl + + * pom.xml: Updated batik dependencies to 1.7 + + * src/main/java/de/intevation/gnv/exports/ChartExportHelper.java: Use + java native DOMImplementation instead of Batik's SVGDOMImplementation, + which is not present in batik 1.7 libs. + 2009-11-30 Ingo Weinzierl * doc/conf/products/horizontalcrosssection/conf_mesh.xml, diff -r 57a2bf630854 -r a88e15972c72 gnv-artifacts/pom.xml --- a/gnv-artifacts/pom.xml Mon Nov 30 14:19:23 2009 +0000 +++ b/gnv-artifacts/pom.xml Mon Nov 30 15:04:26 2009 +0000 @@ -79,14 +79,14 @@ 1.0.15 - batik + org.apache.xmlgraphics batik-dom - 1.6-1 + 1.7 - batik + org.apache.xmlgraphics batik-svggen - 1.6-1 + 1.7 com.lowagie diff -r 57a2bf630854 -r a88e15972c72 gnv-artifacts/src/main/java/de/intevation/gnv/exports/ChartExportHelper.java --- a/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ChartExportHelper.java Mon Nov 30 14:19:23 2009 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/exports/ChartExportHelper.java Mon Nov 30 15:04:26 2009 +0000 @@ -18,13 +18,14 @@ import java.io.UnsupportedEncodingException; import javax.imageio.ImageIO; -import org.apache.batik.dom.svg.SVGDOMImplementation; import org.apache.batik.svggen.SVGGraphics2D; import org.apache.batik.svggen.SVGGraphics2DIOException; import org.apache.log4j.Logger; import org.jfree.chart.JFreeChart; +import de.intevation.artifactdatabase.XMLUtils; + /** * @author Ingo Weinzierl @@ -69,8 +70,7 @@ if (encoding == null) encoding = DEFAULT_ENCODING; - SVGDOMImplementation svgDom = new SVGDOMImplementation(); - org.w3c.dom.Document document = svgDom.createDocument(null,"svg",null); + org.w3c.dom.Document document = XMLUtils.newDocument(); SVGGraphics2D graphics = new SVGGraphics2D(document); chart.draw(graphics, new Rectangle2D.Double(0.0D, 0.0D,width,height));