jeremias 2003/11/07 13:22:26 Modified: examples/mathml/src/org/apache/fop/mathml MathMLObj.java MathMLElement.java MathMLElementMapping.java Log: Cleanup and make it compile again Revision Changes Path 1.3 +3 -3 xml-fop/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java Index: MathMLObj.java =================================================================== RCS file: /home/cvs/xml-fop/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MathMLObj.java 7 Mar 2003 10:47:42 -0000 1.2 +++ MathMLObj.java 7 Nov 2003 21:22:26 -0000 1.3 @@ -55,7 +55,7 @@ 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 @@ * @see org.apache.fop.fo.XMLObj#getNameSpace() */ public String getNameSpace() { - return MathMLElementMapping.URI; + return MathMLElementMapping.NAMESPACE; } } 1.3 +3 -3 xml-fop/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java Index: MathMLElement.java =================================================================== RCS file: /home/cvs/xml-fop/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- MathMLElement.java 7 Mar 2003 10:47:42 -0000 1.2 +++ MathMLElement.java 7 Nov 2003 21:22:26 -0000 1.3 @@ -123,7 +123,7 @@ 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 String getDocumentNamespace() { if (svgDoc == null) { - return MathMLElementMapping.URI; + return MathMLElementMapping.NAMESPACE; } return "http://www.w3.org/2000/svg"; } 1.4 +6 -3 xml-fop/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java Index: MathMLElementMapping.java =================================================================== RCS file: /home/cvs/xml-fop/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- MathMLElementMapping.java 12 Jul 2003 21:22:03 -0000 1.3 +++ MathMLElementMapping.java 7 Nov 2003 21:22:26 -0000 1.4 @@ -66,8 +66,11 @@ */ 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 @@ foObjs.put("math", new ME()); foObjs.put(DEFAULT, new MathMLMaker()); - XMLReader.setConverter(URI, new MathMLConverter()); + XMLReader.setConverter(this.namespaceURI, new MathMLConverter()); } }
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]