changed the way that elements and properties are handled

the element makers are associated with the element mapping
attributes are passed to the element object the object can then
use the attributes to make the properties
added default value for element handling, makes it easier to
ensure all elements of an external xml markup are loaded (eg. svg)


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

1 files changed, 8 insertions, 16 deletions

diff --git a/src/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/org/apache/fop/fo/pagination/SimplePageMaster.java
index 92586593c..d50194889 100644
--- a/src/org/apache/fop/fo/pagination/SimplePageMaster.java
+++ b/src/org/apache/fop/fo/pagination/SimplePageMaster.java
@@ -18,26 +18,15 @@ import org.apache.fop.apps.FOPException;
 
 import java.util.*;
 
-public class SimplePageMaster extends FObj {
-
-    public static class Maker extends FObj.Maker {
-        public FObj make(FObj parent,
-                         PropertyList propertyList) throws FOPException {
-            return new SimplePageMaster(parent, propertyList);
-        }
-
-    }
+import org.xml.sax.Attributes;
 
-    public static FObj.Maker maker() {
-        return new SimplePageMaster.Maker();
-    }
+public class SimplePageMaster extends FObj {
 
     /**
      * Page regions (regionClass, Region)
      */
     private Hashtable _regions;
 
-
     LayoutMasterSet layoutMasterSet;
     PageMaster pageMaster;
     String masterName;
@@ -48,10 +37,13 @@ public class SimplePageMaster extends FObj {
     boolean afterPrecedence;
     int afterHeight;
 
-    protected SimplePageMaster(FObj parent, PropertyList propertyList)
-            throws FOPException {
-        super(parent, propertyList);
+    public SimplePageMaster(FObj parent) {
+        super(parent);
         this.name = "fo:simple-page-master";
+    }
+
+    public void handleAttrs(Attributes attlist) throws FOPException {
+        super.handleAttrs(attlist);
 
         if (parent.getName().equals("fo:layout-master-set")) {
             this.layoutMasterSet = (LayoutMasterSet)parent;