Made the FO tree a little more consistent by renaming getName() to getLocalName() and adding additional methods like: getNamespaceURI() and getNormalNamespacePrefix(). getName() now returns the fully qualified name combined from getLocalName() and getNormalNamespacePrefix(). For special cases you can call getName(String) to return a different namespace prefix.

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

examples/mathml/src/org/apache/fop/mathml/MathMLObj.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,11 +34,14 @@ public class MathMLObj extends XMLObj {
         super(parent);
     }
 
-    /**
-     * @see org.apache.fop.fo.XMLObj#getNameSpace()
-     */
-    public String getNameSpace() {
+    /** @see org.apache.fop.fo.FONode#getNamespaceURI() */
+    public String getNamespaceURI() {
         return MathMLElementMapping.NAMESPACE;
     }
+
+    /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */
+    public String getNormalNamespacePrefix() {
+        return "mathml";
+    }
 }
 

examples/plan/src/org/apache/fop/plan/PlanElement.java

@@ -86,10 +86,8 @@ public class PlanElement extends PlanObj {
         return doc;
     }
 
-    /**
-     * @see org.apache.fop.fo.XMLObj#getDocumentNamespace()
-     */
-    public String getDocumentNamespace() {
+    /** @see org.apache.fop.fo.FONode#getNamespaceURI() */
+    public String getNamespaceURI() {
         if (svgDoc == null) {
             return PlanElementMapping.NAMESPACE;
         }

examples/plan/src/org/apache/fop/plan/PlanObj.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,11 +37,14 @@ public class PlanObj extends XMLObj {
         super(parent);
     }
 
-    /**
-     * @see org.apache.fop.fo.XMLObj#getNameSpace()
-     */
-    public String getNameSpace() {
-        return "http://xml.apache.org/fop/plan";
+    /** @see org.apache.fop.fo.FONode#getNamespaceURI() */
+    public String getNamespaceURI() {
+        return PlanElementMapping.NAMESPACE;
+    }
+
+    /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */
+    public String getNormalNamespacePrefix() {
+        return "plan";
     }
 }
 

src/java/org/apache/fop/fo/FONode.java

@@ -454,13 +454,42 @@ public abstract class FONode implements Cloneable {
     }
 
     /**
-     * Returns the name of the node
-     * @return the name of this node
+     * Returns the fully qualified name of the node
+     * @return the fully qualified name of this node
      */
     public String getName() {
-        return null;
+        return getName(getNormalNamespacePrefix());
+    }
+
+    /**
+     * Returns the fully qualified name of the node
+     * @param prefix the namespace prefix to build the name with (may be null)
+     * @return the fully qualified name of this node
+     */
+    public String getName(String prefix) {
+        if (prefix != null) {
+            StringBuffer sb = new StringBuffer();
+            sb.append(prefix).append(':').append(getLocalName());
+            return sb.toString();
+        } else {
+            return getLocalName();
+        }
     }
 
+    /**
+     * Returns the local name (i.e. without namespace prefix) of the node
+     * @return the local name of this node
+     */
+    public abstract String getLocalName();
+
+    /** @return the normally ussed namespace prefix for this kind of node (ex. "fo" for XSL-FO) */
+    public abstract String getNormalNamespacePrefix();
+    
+    /** @return the namespace URI for this node */
+    public String getNamespaceURI() {
+        return null;
+    }
+    
     /**
      * Returns the Constants class integer value of this node
      * @return the integer enumeration of this FO (e.g., FO_ROOT)

src/java/org/apache/fop/fo/FOText.java

@@ -596,6 +596,11 @@ public class FOText extends FONode {
         return textDecoration; 
     }
 
+    /** @return the baseline-shift property */
+    public Length getBaseLineShift() {
+        return baselineShift;
+    }
+
     /** @see java.lang.Object#toString() */
     public String toString() {
         StringBuffer sb = new StringBuffer(super.toString());
@@ -603,8 +608,14 @@ public class FOText extends FONode {
         return sb.toString();
     }
  
-    public Length getBaseLineShift() {
-        return baselineShift;
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return null;
+    }
+
+    /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */
+    public String getNormalNamespacePrefix() {
+        return null;
     }
     
 }

src/java/org/apache/fop/fo/FObj.java

@@ -412,6 +412,17 @@ public abstract class FObj extends FONode implements Constants {
         return -1;
     }
     
+    
+    /** @see org.apache.fop.fo.FONode#getNamespaceURI() */
+    public String getNamespaceURI() {
+        return FOElementMapping.URI;
+    }
+
+    /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */
+    public String getNormalNamespacePrefix() {
+        return "fo";
+    }
+
     /**
      * Add a new extension attachment to this FObj. See org.apache.fop.fo.FONode for details.
      * @param attachment the attachment to add.

src/java/org/apache/fop/fo/UnknownXMLObj.java

@@ -61,13 +61,16 @@ public class UnknownXMLObj extends XMLObj {
         this.namespace = space;
     }
 
-    /**
-     * @see XMLObj#getNameSpace
-     */
-    public String getNameSpace() {
+    /** @see org.apache.fop.fo.FONode#getNamespaceURI() */
+    public String getNamespaceURI() {
         return this.namespace;
     }
 
+    /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */
+    public String getNormalNamespacePrefix() {
+        return null; //We don't know that in this case.
+    }
+
     /**
      * @see org.apache.fop.fo.FONode#addChildNode(FONode)
      */
@@ -88,5 +91,6 @@ public class UnknownXMLObj extends XMLObj {
         }
         super.addCharacters(data, start, length, pList, locator);
     }
+
 }
 

src/java/org/apache/fop/fo/XMLObj.java

@@ -91,27 +91,11 @@ public abstract class XMLObj extends FONode {
          return null;
     }
 
-    /**
-     * Returns the name of the object
-     * @return the name of this object
-     */
-    public String getName() {
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
         return name;
     }
 
-    /**
-     * @return string containing the namespace for this node
-     */
-    public abstract String getNameSpace();
-
-    /**
-     * @return string containing the namespace for this document (which is the
-     * same namespace as for this node ??)
-     */
-    public String getDocumentNamespace() {
-        return getNameSpace();
-    }
-
     private static HashMap ns = new HashMap();
     static {
         ns.put("xlink", "http://www.w3.org/1999/xlink");
@@ -124,7 +108,7 @@ public abstract class XMLObj extends FONode {
      */
     public void addElement(Document doc, Element parent) {
         this.doc = doc;
-        element = doc.createElementNS(getNameSpace(), name);
+        element = doc.createElementNS(getNamespaceURI(), name);
 
         for (int count = 0; count < attr.getLength(); count++) {
             String rf = attr.getValue(count);
@@ -222,5 +206,6 @@ public abstract class XMLObj extends FONode {
         org.w3c.dom.Text text = doc.createTextNode(str);
         element.appendChild(text);
     }
+
 }
 

src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java

@@ -44,6 +44,7 @@ public class BatikExtensionElementMapping extends ElementMapping {
      */
     private final String getAParserClassName() {
         try {
+            //TODO Remove when Batik uses JAXP instead of SAX directly.
             SAXParserFactory factory = SAXParserFactory.newInstance();
             return factory.newSAXParser().getXMLReader().getClass().getName();
         } catch (Exception e) {

src/java/org/apache/fop/fo/extensions/svg/SVGObj.java

@@ -26,8 +26,9 @@ import org.apache.fop.fo.XMLObj;
  * This aids in the construction of the SVG Document.
  */
 public class SVGObj extends XMLObj {
+    
     /**
-     * constructs an svg object (called by Maker).
+     * Constructs an SVG object (called by Maker).
      *
      * @param parent the parent formatting object
      */
@@ -35,12 +36,15 @@ public class SVGObj extends XMLObj {
         super(parent);
     }
 
-    /**
-     * Get the namespace for svg.
-     * @return the svg namespace
-     */
-    public String getNameSpace() {
-        return "http://www.w3.org/2000/svg";
+    /** @see org.apache.fop.fo.FONode#getNamespaceURI() */
+    public String getNamespaceURI() {
+        return SVGElementMapping.URI;
+    }
+
+    /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */
+    public String getNormalNamespacePrefix() {
+        return "svg";
     }
+    
 }
 

src/java/org/apache/fop/fo/flow/BasicLink.java

@@ -127,16 +127,12 @@ public class BasicLink extends Inline {
         return externalDestination;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:basic-link";
+    /** @see org.apache.fop.fo.FObj#getLocalName() */
+    public String getLocalName() {
+        return "basic-link";
     }
     
-    /**
-     * @see org.apache.fop.fo.FObj#getNameId()
-     */
+    /** @see org.apache.fop.fo.FObj#getNameId() */
     public int getNameId() {
         return FO_BASIC_LINK;
     }

src/java/org/apache/fop/fo/flow/BidiOverride.java

@@ -21,7 +21,6 @@ package org.apache.fop.fo.flow;
 import org.xml.sax.Locator;
 
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.datatypes.Length;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObjMixed;
 import org.apache.fop.fo.PropertyList;
@@ -131,11 +130,9 @@ public class BidiOverride extends FObjMixed {
         return lineHeight;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:bidi-override";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "bidi-override";
     }
 
     /**

src/java/org/apache/fop/fo/flow/Block.java

@@ -18,7 +18,6 @@
 
 package org.apache.fop.fo.flow;
 
-import java.util.Iterator;
 import org.xml.sax.Locator;
 
 import org.apache.fop.apps.FOPException;
@@ -516,11 +515,9 @@ public class Block extends FObjMixed {
         return NullCharIterator.getInstance();
     }
 
-    /**
-     * @see org.apache.fop.fo.FONode#getName()
-     */
-    public String getName() {
-        return "fo:block";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "block";
     }
 
     /**

src/java/org/apache/fop/fo/flow/BlockContainer.java

@@ -259,11 +259,9 @@ public class BlockContainer extends FObj {
         return height;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:block-container";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "block-container";
     }
     
     /**

src/java/org/apache/fop/fo/flow/Character.java

@@ -257,11 +257,9 @@ public class Character extends FObj {
         return wordSpacing; 
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:character";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "character";
     }
     
     /**

src/java/org/apache/fop/fo/flow/ExternalGraphic.java

@@ -104,11 +104,9 @@ public class ExternalGraphic extends AbstractGraphics {
         return url;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:external-graphic";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "external-graphic";
     }
 
     /**

src/java/org/apache/fop/fo/flow/Float.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,11 +80,9 @@ public class Float extends FObj {
         }
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:float";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "float";
     }
     
     /**

src/java/org/apache/fop/fo/flow/Footnote.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -125,11 +125,9 @@ public class Footnote extends FObj {
         return footnoteBody;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:footnote";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "footnote";
     }
     
     /**

src/java/org/apache/fop/fo/flow/FootnoteBody.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -80,11 +80,9 @@ public class FootnoteBody extends FObj {
             }
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:footnote-body";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "footnote-body";
     }
     
     /**

src/java/org/apache/fop/fo/flow/InitialPropertySet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* $Id:$ */
+/* $Id$ */
 
 package org.apache.fop.fo.flow;
 
@@ -106,11 +106,9 @@ public class InitialPropertySet extends FObj {
         return lineHeight;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:initial-property-set";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "initial-property-set";
     }
     
     /**

src/java/org/apache/fop/fo/flow/Inline.java

@@ -189,11 +189,9 @@ public class Inline extends InlineLevel {
         return new InlineCharIterator(this, commonBorderPaddingBackground);
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:inline";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "inline";
     }
     
     /**

src/java/org/apache/fop/fo/flow/InlineContainer.java

@@ -175,11 +175,9 @@ public class InlineContainer extends FObj {
         return id;
     }
 
-    /**
-     * @see org.apache.fop.fo.FONode#getName()
-     */
-    public String getName() {
-        return "fo:inline-container";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "inline-container";
     }
     
     /**

src/java/org/apache/fop/fo/flow/InstreamForeignObject.java

@@ -79,11 +79,9 @@ public class InstreamForeignObject extends AbstractGraphics {
         }
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:instream-foreign-object";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "instream-foreign-object";
     }
     
     /**

src/java/org/apache/fop/fo/flow/Leader.java

@@ -192,11 +192,9 @@ public class Leader extends InlineLevel {
         return dominantBaseline;
     }
     
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:leader";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "leader";
     }
 
     /**

src/java/org/apache/fop/fo/flow/ListBlock.java

@@ -173,11 +173,9 @@ public class ListBlock extends FObj {
         return id;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:list-block";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "list-block";
     }
     
     /**

src/java/org/apache/fop/fo/flow/ListItem.java

@@ -207,11 +207,9 @@ public class ListItem extends FObj {
         return body;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:list-item";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "list-item";
     }
     
     /**

src/java/org/apache/fop/fo/flow/ListItemBody.java

@@ -49,11 +49,9 @@ public class ListItemBody extends AbstractListItemPart {
         getFOEventHandler().endListBody();
     }
     
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:list-item-body";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "list-item-body";
     }
     
     /**

src/java/org/apache/fop/fo/flow/ListItemLabel.java

@@ -49,11 +49,9 @@ public class ListItemLabel extends AbstractListItemPart {
         getFOEventHandler().endListLabel();
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:list-item-label";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "list-item-label";
     }
     
     /**

src/java/org/apache/fop/fo/flow/Marker.java

@@ -139,11 +139,9 @@ public class Marker extends FObjMixed {
         return markerClassName;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:marker";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "marker";
     }
     
     /**

src/java/org/apache/fop/fo/flow/MultiCase.java

@@ -76,11 +76,9 @@ public class MultiCase extends FObj {
         return startingState;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:multi-case";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "multi-case";
     }
 
     /**

src/java/org/apache/fop/fo/flow/MultiProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,11 +111,9 @@ public class MultiProperties extends FObj {
         return id;
     }
     
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:multi-properties";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "multi-properties";
     }
 
     /**

src/java/org/apache/fop/fo/flow/MultiPropertySet.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -74,18 +74,14 @@ public class MultiPropertySet extends FObj {
             invalidChildError(loc, nsURI, localName);
     }
 
-    /**
-     * Return the "id" property.
-     */
+    /** @return the "id" property. */
     public String getId() {
         return id;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:multi-property-set";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "multi-property-set";
     }
     
     /**

src/java/org/apache/fop/fo/flow/MultiSwitch.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -90,18 +90,14 @@ public class MultiSwitch extends FObj {
         }
     }
 
-    /**
-     * Return the "id" property.
-     */
+    /** @return the "id" property. */
     public String getId() {
         return id;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:multi-switch";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "multi-switch";
     }
 
     /**

src/java/org/apache/fop/fo/flow/MultiToggle.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,11 +72,9 @@ public class MultiToggle extends FObj {
         }
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:multi-toggle";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "multi-toggle";
     }
     
     /**

src/java/org/apache/fop/fo/flow/PageNumber.java

@@ -197,9 +197,9 @@ public class PageNumber extends FObj {
         return lineHeight;
     }
     
-   /** @see org.apache.fop.fo.FONode#getName() */
-    public String getName() {
-        return "fo:page-number";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "page-number";
     }
 
     /** @see org.apache.fop.fo.FObj#getNameId() */

src/java/org/apache/fop/fo/flow/PageNumberCitation.java

@@ -202,9 +202,9 @@ public class PageNumberCitation extends FObj {
         return refId;
     }
      
-    /** @see org.apache.fop.fo.FObj#getName() */
-    public String getName() {
-        return "fo:page-number-citation";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "page-number-citation";
     }
 
     /** @see org.apache.fop.fo.FObj#getNameId() */

src/java/org/apache/fop/fo/flow/RetrieveMarker.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -225,11 +225,9 @@ public class RetrieveMarker extends FObjMixed {
         }
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:retrieve-marker";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "retrieve-marker";
     }
 
     /**

src/java/org/apache/fop/fo/flow/Table.java

@@ -401,11 +401,9 @@ public class Table extends TableFObj {
         return id;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:table";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "table";
     }
 
     /**

src/java/org/apache/fop/fo/flow/TableAndCaption.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -143,18 +143,14 @@ public class TableAndCaption extends FObj {
         }
     }
 
-    /**
-     * Return the "id" property.
-     */
+    /** @return the "id" property. */
     public String getId() {
         return id;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:table-and-caption";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "table-and-caption";
     }
 
     /**

src/java/org/apache/fop/fo/flow/TableBody.java

@@ -265,11 +265,9 @@ public class TableBody extends TableFObj {
         return commonBorderPaddingBackground;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:table-body";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "table-body";
     }
 
     /**

src/java/org/apache/fop/fo/flow/TableCaption.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -123,18 +123,14 @@ public class TableCaption extends FObj {
         }
     }
 
-    /**
-     * Return the "id" property.
-     */
+    /** @return the "id" property. */
     public String getId() {
         return id;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:table-caption";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "table-caption";
     }
 
     /**

src/java/org/apache/fop/fo/flow/TableCell.java

@@ -383,11 +383,9 @@ public class TableCell extends TableFObj {
         return (endsRow == EN_TRUE);
     }
     
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:table-cell";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "table-cell";
     }
 
     /**

src/java/org/apache/fop/fo/flow/TableColumn.java

@@ -150,9 +150,9 @@ public class TableColumn extends TableFObj {
         return numberColumnsSpanned.getValue();
     }
     
-    /** @see org.apache.fop.fo.FONode#getName() */
-    public String getName() {
-        return "fo:table-column";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "table-column";
     }
 
     /** @see org.apache.fop.fo.FObj#getNameId() */

src/java/org/apache/fop/fo/flow/TableFooter.java

@@ -54,16 +54,12 @@ public class TableFooter extends TableBody {
 //      convertCellsToRows();
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:table-footer";
+    /** @see org.apache.fop.fo.FObj#getLocalName() */
+    public String getLocalName() {
+        return "table-footer";
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getNameId()
-     */
+    /** @see org.apache.fop.fo.FObj#getNameId() */
     public int getNameId() {
         return FO_TABLE_FOOTER;
     }

src/java/org/apache/fop/fo/flow/TableHeader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,16 +54,12 @@ public class TableHeader extends TableBody {
 //      convertCellsToRows();
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:table-header";
+    /** @see org.apache.fop.fo.FObj#getLocalName() */
+    public String getLocalName() {
+        return "table-header";
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getNameId()
-     */
+    /** @see org.apache.fop.fo.FObj#getNameId() */
     public int getNameId() {
         return FO_TABLE_HEADER;
     }

src/java/org/apache/fop/fo/flow/TableRow.java

@@ -279,9 +279,9 @@ public class TableRow extends TableFObj {
         return commonBorderPaddingBackground;
     }
     
-    /** @see org.apache.fop.fo.FObj#getName() */
-    public String getName() {
-        return "fo:table-row";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "table-row";
     }
 
     /** @see org.apache.fop.fo.FObj#getNameId() */

src/java/org/apache/fop/fo/flow/Wrapper.java

@@ -81,18 +81,14 @@ public class Wrapper extends FObjMixed {
         }
     }
 
-    /**
-     * Return the "id" property.
-     */
+    /** @return the "id" property. */
     public String getId() {
         return id;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:wrapper";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "wrapper";
     }
 
     /**

src/java/org/apache/fop/fo/pagination/ColorProfile.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -111,11 +111,9 @@ public class ColorProfile extends FObj {
         }
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:color-profile";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "color-profile";
     }
     
     /**

src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java

@@ -146,11 +146,9 @@ public class ConditionalPageMasterReference extends FObj {
         return masterReference;
     }
     
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:conditional-page-master-reference";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "conditional-page-master-reference";
     }
     
     /**

src/java/org/apache/fop/fo/pagination/Declarations.java

@@ -106,8 +106,8 @@ public class Declarations extends FObj {
     /**
      * @see org.apache.fop.fo.FObj#getName()
      */
-    public String getName() {
-        return "fo:declarations";
+    public String getLocalName() {
+        return "declarations";
     }
     
     /**

src/java/org/apache/fop/fo/pagination/Flow.java

@@ -120,11 +120,9 @@ public class Flow extends FObj {
         return flowName;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:flow";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "flow";
     }
     
     /**

src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java

@@ -214,11 +214,9 @@ public class LayoutMasterSet extends FObj {
         return false;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:layout-master-set";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "layout-master-set";
     }
     
     /**

src/java/org/apache/fop/fo/pagination/PageSequence.java

@@ -500,11 +500,9 @@ public class PageSequence extends FObj {
         return masterReference;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:page-sequence";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "page-sequence";
     }
 
     /**

src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java

@@ -210,11 +210,9 @@ public class PageSequenceMaster extends FObj {
         return pageMaster;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:page-sequence-master";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "page-sequence-master";
     }
     
     /**

src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java

@@ -73,32 +73,24 @@ public class PageSequenceWrapper extends FObj {
         }
     }
 
-    /**
-     * Return the "id" property.
-     */
+    /** @return the "id" property. */
     public String getId() {
         return id;
     }
 
-    /**
-     * Return the "id" property.
-     */
+    /** @return the "index-class" property. */
     public String getIndexClass() {
         return indexClass;
     }
 
-    /**
-     * Return the "id" property.
-     */
+    /** @return the "index-key" property. */
     public String getIndexKey() {
         return indexKey;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:page-sequence-wrapper";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "page-sequence-wrapper";
     }
 
     /**

src/java/org/apache/fop/fo/pagination/RegionAfter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -88,11 +88,9 @@ public class RegionAfter extends RegionBA {
         return "xsl-region-after";
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:region-after";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "region-after";
     }
 
     /**

src/java/org/apache/fop/fo/pagination/RegionBefore.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -85,11 +85,9 @@ public class RegionBefore extends RegionBA {
         return vpRect;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:region-before";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "region-before";
     }
 
     /**

src/java/org/apache/fop/fo/pagination/RegionBody.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -149,11 +149,9 @@ public class RegionBody extends Region {
         return "xsl-region-body";
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:region-body";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "region-body";
     }
     
     /**

src/java/org/apache/fop/fo/pagination/RegionEnd.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -86,11 +86,9 @@ public class RegionEnd extends RegionSE {
         return "xsl-region-end";
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:region-end";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "region-end";
     }
     
     /**

src/java/org/apache/fop/fo/pagination/RegionStart.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -83,11 +83,9 @@ public class RegionStart extends RegionSE {
         return "xsl-region-start";
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:region-start";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "region-start";
     }
 
     /**

src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java

@@ -164,9 +164,9 @@ public class RepeatablePageMasterAlternatives extends FObj
         }
     }
     
-    /** @see org.apache.fop.fo.FONode#getName() */
-    public String getName() {
-        return "fo:repeatable-page-master-alternatives";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "repeatable-page-master-alternatives";
     }
 
     /** @see org.apache.fop.fo.FObj#getNameId() */

src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java

@@ -133,9 +133,9 @@ public class RepeatablePageMasterReference extends FObj
         }
     }
     
-    /** @see org.apache.fop.fo.FObj#getName() */
-    public String getName() {
-        return "fo:repeatable-page-master-reference";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "repeatable-page-master-reference";
     }
 
     /** @see org.apache.fop.fo.FObj#getNameId() */

src/java/org/apache/fop/fo/pagination/Root.java

@@ -265,11 +265,9 @@ public class Root extends FObj {
         return this;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:root";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "root";
     }
 
     /**

src/java/org/apache/fop/fo/pagination/SimplePageMaster.java

@@ -263,11 +263,9 @@ public class SimplePageMaster extends FObj {
         return referenceOrientation.getValue();
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:simple-page-master";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "simple-page-master";
     }
 
     /**

src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java

@@ -109,9 +109,9 @@ public class SinglePageMasterReference extends FObj
         }
     }
     
-    /** @see org.apache.fop.fo.FONode#getName() */
-    public String getName() {
-        return "fo:single-page-master-reference";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "single-page-master-reference";
     }
 
     /** @see org.apache.fop.fo.FObj#getNameId() */

src/java/org/apache/fop/fo/pagination/StaticContent.java

@@ -71,16 +71,12 @@ public class StaticContent extends Flow {
         }
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:static-content";
+    /** @see org.apache.fop.fo.FObj#getLocalName() */
+    public String getLocalName() {
+        return "static-content";
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getNameId()
-     */
+    /** @see org.apache.fop.fo.FObj#getNameId() */
     public int getNameId() {
         return FO_STATIC_CONTENT;
     }

src/java/org/apache/fop/fo/pagination/Title.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,8 +54,8 @@ public class Title extends InlineLevel {
     /**
      * @see org.apache.fop.fo.FObj#getName()
      */
-    public String getName() {
-        return "fo:title";
+    public String getLocalName() {
+        return "title";
     }
 
     /**

src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java

@@ -143,11 +143,9 @@ public class Bookmark extends FObj {
         return childBookmarks;
     }
 
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:bookmark";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "bookmark";
     }
 
     /**

src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java

@@ -76,11 +76,9 @@ public class BookmarkTitle extends FObj {
         return title;
     }
     
-    /**
-     * @see org.apache.fop.fo.FObj#getName()
-     */
-    public String getName() {
-        return "fo:bookmark-title";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "bookmark-title";
     }
 
     /**

src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java

@@ -79,8 +79,9 @@ public class BookmarkTree extends FObj {
         return bookmarks;
     }
 
-    public String getName() {
-        return "fo:bookmark-tree";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "bookmark-tree";
     }
 
     /**

src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java

@@ -48,7 +48,7 @@ public class InstreamForeignObjectLM extends AbstractGraphicsLayoutManager {
         XMLObj child = (XMLObj) fobj.getChildXMLObj();
 
         org.w3c.dom.Document doc = child.getDOMDocument();
-        String ns = child.getDocumentNamespace();
+        String ns = child.getNamespaceURI();
 
         return new ForeignObject(doc, ns);
     }

src/java/org/apache/fop/render/ps/extensions/AbstractPSExtensionObject.java

@@ -64,11 +64,16 @@ public abstract class AbstractPSExtensionObject extends FONode {
         }
     }
 
-    /** @see org.apache.fop.fo.XMLObj#getNameSpace() */
-    public String getNameSpace() {
+    /** @see org.apache.fop.fo.FONode#getNamespaceURI() */
+    public String getNamespaceURI() {
         return PSExtensionElementMapping.NAMESPACE;
     }
     
+    /**@see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */
+    public String getNormalNamespacePrefix() {
+        return "fox";
+    }
+
     /** @see org.apache.fop.fo.FONode#processNode */
     public void processNode(String elementName, Locator locator, 
                             Attributes attlist, PropertyList propertyList)
@@ -92,5 +97,6 @@ public abstract class AbstractPSExtensionObject extends FONode {
     public ExtensionAttachment getExtensionAttachment() {
         return this.setupCode;
     }
+
 }
 

src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java

@@ -44,9 +44,9 @@ public class PSPageSetupCodeElement extends AbstractPSExtensionObject {
         }
     }
     
-    /** @see org.apache.fop.fo.FONode#getName() */
-    public String getName() {
-        return "fox:ps-page-setup-code";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "ps-page-setup-code";
     }
 
 }

src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java

@@ -44,9 +44,9 @@ public class PSSetupCodeElement extends AbstractPSExtensionObject {
         }
     }
     
-    /** @see org.apache.fop.fo.FONode#getName() */
-    public String getName() {
-        return "fox:ps-setup-code";
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "ps-setup-code";
     }
     
 }

test/java/org/apache/fop/fotreetest/ext/AssertElement.java

@@ -87,5 +87,10 @@ public class AssertElement extends TestObj {
         
     }
 
+    /** @see org.apache.fop.fo.FONode#getLocalName() */
+    public String getLocalName() {
+        return "assert";
+    }
+    
 }
 

test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java

@@ -41,13 +41,6 @@ public class TestElementMapping extends ElementMapping {
         if (foObjs == null) {
             foObjs = new java.util.HashMap();
             foObjs.put("assert", new AssertMaker());
-            foObjs.put(DEFAULT, new TestMaker());
-        }
-    }
-
-    static class TestMaker extends ElementMapping.Maker {
-        public FONode make(FONode parent) {
-            return new TestObj(parent);
         }
     }
 

test/java/org/apache/fop/fotreetest/ext/TestObj.java

@@ -23,9 +23,9 @@ import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FObj;
 
 /**
- * Catch all FOP Test objects as default element.
+ * Base class for all FOP Test objects.
  */
-public class TestObj extends FObj {
+public abstract class TestObj extends FObj {
 
     /**
      * @see org.apache.fop.fo.FONode#FONode(FONode)
@@ -34,11 +34,10 @@ public class TestObj extends FObj {
         super(parent);
     }
 
-    /**
-     * @see org.apache.fop.fo.XMLObj#getNameSpace()
-     */
-    public String getNameSpace() {
+    /** @see org.apache.fop.fo.FONode#getNamespaceURI() */
+    public String getNamespaceURI() {
         return TestElementMapping.NAMESPACE;
     }
+
 }