cvs commit: xml-fop/examples/mathml/src/org/apache/fop/mathml MathMLObj.java MathMLElement.java MathMLElementMapping.java

2003-11-07 Thread jeremias 
jeremias2003/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  ChangesPath
  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.java7 Mar 2003 10:47:42 -   1.2
  +++ MathMLObj.java7 Nov 2003 21:22:26 -   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.java7 Mar 2003 10:47:42 -   1.2
  +++ MathMLElement.java7 Nov 2003 21:22:26 -   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 -  1.3
  +++ MathMLElementMapping.java 7 Nov 2003 21:22:26 -   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]

cvs commit: xml-fop/examples/mathml/src/org/apache/fop/mathml MathMLObj.java MathMLElement.java MathMLElementMapping.java

2003-03-07 Thread jeremias 
jeremias2003/03/07 02:47:42

  Modified:examples/mathml/src/org/apache/fop/mathml MathMLObj.java
MathMLElement.java MathMLElementMapping.java
  Log:
  Switched to long licence
  Some general checkstyle fixing
  
  Revision  ChangesPath
  1.2   +56 -6 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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MathMLObj.java29 Jan 2003 16:25:25 -  1.1
  +++ MathMLObj.java7 Mar 2003 10:47:42 -   1.2
  @@ -1,9 +1,53 @@
  -/* $Id$
  - * 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.
  - */
  -
  +/*
  + * $Id$
  + * 
  + *The Apache Software License, Version 1.1
  + * 
  + * 
  + * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
  + * 
  + * Redistribution and use in source and binary forms, with or without modifica-
  + * tion, are permitted provided that the following conditions are met:
  + * 
  + * 1. Redistributions of source code must retain the above copyright notice,
  + *this list of conditions and the following disclaimer.
  + * 
  + * 2. Redistributions in binary form must reproduce the above copyright notice,
  + *this list of conditions and the following disclaimer in the documentation
  + *and/or other materials provided with the distribution.
  + * 
  + * 3. The end-user documentation included with the redistribution, if any, must
  + *include the following acknowledgment: "This product includes software
  + *developed by the Apache Software Foundation (http://www.apache.org/)."
  + *Alternately, this acknowledgment may appear in the software itself, if
  + *and wherever such third-party acknowledgments normally appear.
  + * 
  + * 4. The names "FOP" and "Apache Software Foundation" must not be used to
  + *endorse or promote products derived from this software without prior
  + *written permission. For written permission, please contact
  + *[EMAIL PROTECTED]
  + * 
  + * 5. Products derived from this software may not be called "Apache", nor may
  + *"Apache" appear in their name, without prior written permission of the
  + *Apache Software Foundation.
  + * 
  + * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
  + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
  + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
  + * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
  + * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
  + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
  + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  + * 
  + * 
  + * This software consists of voluntary contributions made by many individuals
  + * on behalf of the Apache Software Foundation and was originally created by
  + * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
  + * Software Foundation, please see .
  + */ 
   package org.apache.fop.mathml;
   
   // FOP
  @@ -15,10 +59,16 @@
*/
   public class MathMLObj extends XMLObj {
   
  +/**
  + * @see org.apache.fop.fo.FONode#FONode(FONode)
  + */
   public MathMLObj(FONode parent) {
   super(parent);
   }
   
  +/**
  + * @see org.apache.fop.fo.XMLObj#getNameSpace()
  + */
   public String getNameSpace() {
   return MathMLElementMapping.URI;
   }
  
  
  
  1.2   +85 -12
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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MathMLElement.java29 Jan 2003 16:25:25 -  1.1
  +++ MathMLElement.java7 Mar 2003 10:47:42 -   1.2
  @@ -1,9 +1,53 @@
  -/* $Id$
  - * Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
  - * For