changed the parent to FONode

changed a few more vector and hashtable
change master-name to master-reference for page-sequence, single-page-master-reference, repeatable-page-masterreference,conditional-page-master-reference
added pdf text element bridge for simple text
some other changes that will hopefully make things simpler to handle in the future


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

1 files changed, 2 insertions, 19 deletions

diff --git a/src/org/apache/fop/extensions/ExtensionObj.java b/src/org/apache/fop/extensions/ExtensionObj.java
index 170e198be..3ae492d18 100644
--- a/src/org/apache/fop/extensions/ExtensionObj.java
+++ b/src/org/apache/fop/extensions/ExtensionObj.java
@@ -10,9 +10,6 @@ package org.apache.fop.extensions;
 import org.apache.fop.fo.*;
 import org.apache.fop.layout.*;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.properties.ExtensionPropertyMapping;
-
-import org.xml.sax.Attributes;
 
 /**
  * base class for extension objects
@@ -24,7 +21,7 @@ public abstract class ExtensionObj extends FObj {
      * @param parent the parent formatting object
      * @param propertyList the explicit properties of this object
      */
-    public ExtensionObj(FObj parent) {
+    public ExtensionObj(FONode parent) {
         super(parent);
     }
 
@@ -32,7 +29,6 @@ public abstract class ExtensionObj extends FObj {
      * Called for extensions within a page sequence or flow. These extensions
      * are allowed to generate visible areas within the layout.
      *
-     *
      * @param area
      */
     public Status layout(Area area) throws FOPException {
@@ -52,18 +48,5 @@ public abstract class ExtensionObj extends FObj {
         ExtensionArea extArea = new ExtensionArea(this);
         areaTree.addExtension(this);
     }
-
-    protected PropertyListBuilder getListBuilder() {
-            PropertyListBuilder plb = new PropertyListBuilder();
-            plb.addList(ExtensionPropertyMapping.getGenericMappings());
-        return plb;
-    }
-
-    public void handleAttrs(Attributes attlist) throws FOPException {
-        String uri = ExtensionElementMapping.URI;
-        properties =
-                    getListBuilder().makeList(uri, name, attlist,
-                                                (parent == null) ? null
-                                                : parent.properties, parent);
-    }
 }
+