Cleanup and make it compile again

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

diff --git a/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java b/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java
index 0df6088cb6e076ac6a45fd0b597b9665cb713314..9fc913e0de083e2b7ce2b42bba830a56053ca4bc 100644 (file)
--- a/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java
+++ b/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java
@@ -123,7 +123,7 @@ public class MathMLElement extends MathMLObj {
                 doc = svgDoc;
             }
         } catch (Throwable t) {
-            userAgent.getLogger().error("Could not convert MathML to SVG", t);
+            getLogger().error("Could not convert MathML to SVG", t);
             width = 0;
             height = 0;
         }
@@ -181,7 +181,7 @@ public class MathMLElement extends MathMLObj {
      */
     public String getDocumentNamespace() {
         if (svgDoc == null) {
-            return MathMLElementMapping.URI;
+            return MathMLElementMapping.NAMESPACE;
         }
         return "http://www.w3.org/2000/svg";
     }

diff --git a/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java b/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java
index 9c48520ebfb36b2bb431a2d4e2e37078eebd84a0..6dbf2b5d2b906104bc837d8bd71bac427e936e7a 100644 (file)
--- a/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java
+++ b/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java
@@ -66,8 +66,11 @@ import net.sourceforge.jeuclid.DOMMathBuilder;
  */
 public class MathMLElementMapping extends ElementMapping {
 
+    /** MathML Namespace */
+    public static final String NAMESPACE = "http://www.w3.org/1998/Math/MathML"; 
+
     public MathMLElementMapping() {
-        URI = "http://www.w3.org/1998/Math/MathML";
+        this.namespaceURI = NAMESPACE;
     }
 
     protected void initialize() {
@@ -76,7 +79,7 @@ public class MathMLElementMapping extends ElementMapping {
             foObjs.put("math", new ME());
             foObjs.put(DEFAULT, new MathMLMaker());
 
-            XMLReader.setConverter(URI, new MathMLConverter());
+            XMLReader.setConverter(this.namespaceURI, new MathMLConverter());
         }
     }
 

diff --git a/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java b/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java
index 747fc62caa7d17635d25baa995ad8f99b7cf2887..f8aa1bc395c5ef500372a7c49010c3d293d7a3c8 100644 (file)
--- a/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java
+++ b/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java
@@ -55,7 +55,7 @@ import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.XMLObj;
 
 /**
- * Catch all MathML object as default element.
+ * Catch all MathML objects as default element.
  */
 public class MathMLObj extends XMLObj {
 
@@ -70,7 +70,7 @@ public class MathMLObj extends XMLObj {
      * @see org.apache.fop.fo.XMLObj#getNameSpace()
      */
     public String getNameSpace() {
-        return MathMLElementMapping.URI;
+        return MathMLElementMapping.NAMESPACE;
     }
 }