properly setup the element mappings

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

1 files changed, 8 insertions, 4 deletions

diff --git a/src/org/apache/fop/extensions/ExtensionElementMapping.java b/src/org/apache/fop/extensions/ExtensionElementMapping.java
index c14d0d353..479c4b3ca 100644
--- a/src/org/apache/fop/extensions/ExtensionElementMapping.java
+++ b/src/org/apache/fop/extensions/ExtensionElementMapping.java
@@ -19,22 +19,26 @@ public class ExtensionElementMapping implements ElementMapping {
 
     private static HashMap foObjs = null;
 
-    public synchronized void addToBuilder(FOTreeBuilder builder) {
+    private static synchronized void setupExt() {
         if(foObjs == null) {
-            foObjs = new HashMap();    
+            foObjs = new HashMap();
             foObjs.put("outline", new O());
             foObjs.put("label", new L());
         }
+    }
+
+    public void addToBuilder(FOTreeBuilder builder) {
+        setupExt();
         builder.addMapping(URI, foObjs);
     }
 
-    class O extends ElementMapping.Maker {
+    static class O extends ElementMapping.Maker {
         public FONode make(FONode parent) {
             return new Outline(parent);
         }
     }
 
-    class L extends ElementMapping.Maker {
+    static class L extends ElementMapping.Maker {
         public FONode make(FONode parent) {
             return new Label(parent);
         }