Reconfigured ElementMapping from an interface to an abstract base class

Removed FOTreeBuilder references from all ElementMapping subclasses
Simplified FOTreeBuilder ElementMapping instantiation somewhat


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

1 files changed, 2 insertions, 12 deletions

diff --git a/src/java/org/apache/fop/fo/FOTreeBuilder.java b/src/java/org/apache/fop/fo/FOTreeBuilder.java
index 78a5a9973..546efe0ad 100644
--- a/src/java/org/apache/fop/fo/FOTreeBuilder.java
+++ b/src/java/org/apache/fop/fo/FOTreeBuilder.java
@@ -172,24 +172,14 @@ public class FOTreeBuilder extends DefaultHandler {
     }
 
     /**
-     * Adds a mapping from a namespace to a table of makers.
-     *
-     * @param namespaceURI namespace URI of formatting object elements
-     * @param table table of makers
-     */
-    public void addMapping(String namespaceURI, HashMap table) {
-        this.fobjTable.put(namespaceURI, table);
-        this.namespaces.add(namespaceURI.intern());
-    }
-
-    /**
      * Add the given element mapping.
      * An element mapping maps element names to Java classes.
      *
      * @param mapping the element mappingto add
      */
     public void addElementMapping(ElementMapping mapping) {
-        mapping.addToBuilder(this);
+        this.fobjTable.put(mapping.getNamespaceURI(), mapping.getTable());
+        this.namespaces.add(mapping.getNamespaceURI().intern());
     }
 
     /**