From: Luis Bernardo <lbernardo@apache.org>
Date: Thu, 25 Jun 2015 09:32:58 +0000 (+0000)
Subject: FOP-2490: Embedded SVG 1.2 not supported by FOP 2.0; fix submitted by Hussein Shafie.
X-Git-Tag: fop-2_1~54
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d074106e417453d110b187b3cf616026c90cad71;p=xmlgraphics-fop.git

FOP-2490: Embedded SVG 1.2 not supported by FOP 2.0; fix submitted by Hussein Shafie.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1687458 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java b/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
index eacb29659..58ecdc6f1 100644
--- a/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
+++ b/src/java/org/apache/fop/fo/extensions/svg/SVGDOMContentHandlerFactory.java
@@ -30,6 +30,7 @@ import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
+import org.apache.batik.anim.dom.SVG12DOMImplementation;
 import org.apache.batik.anim.dom.SVGDOMImplementation;
 
 import org.apache.fop.util.ContentHandlerFactory;
@@ -100,14 +101,7 @@ public class SVGDOMContentHandlerFactory implements ContentHandlerFactory {
                     || ver.equals("1.0") || ver.equals("1.1")) {
                 return SVGDOMImplementation.getDOMImplementation();
             } else if (ver.equals("1.2")) {
-                try {
-                    Class clazz = Class.forName(
-                            "org.apache.batik.dom.svg12.SVG12DOMImplementation");
-                    return (DOMImplementation)clazz.getMethod(
-                            "getDOMImplementation", (Class[])null).invoke(null, (Object[])null);
-                } catch (Exception e) {
-                    return SVGDOMImplementation.getDOMImplementation();
-                }
+                return SVG12DOMImplementation.getDOMImplementation();
             }
             throw new RuntimeException("Unsupport SVG version '" + ver + "'");
         }