You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by ar...@locus.apache.org on 2000/07/11 04:28:12 UTC
cvs commit: xml-fop/src/org/apache/fop/fo PropertyListBuilder.java
arved 00/07/10 19:28:12
Modified: src/org/apache/fop/fo PropertyListBuilder.java
Log:
Expresses SAX2 support
Revision Changes Path
1.15 +9 -5 xml-fop/src/org/apache/fop/fo/PropertyListBuilder.java
Index: PropertyListBuilder.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/PropertyListBuilder.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PropertyListBuilder.java 2000/06/27 22:13:17 1.14
+++ PropertyListBuilder.java 2000/07/11 02:28:11 1.15
@@ -1,4 +1,4 @@
-/*-- $Id: PropertyListBuilder.java,v 1.14 2000/06/27 22:13:17 fotis Exp $ --
+/*-- $Id: PropertyListBuilder.java,v 1.15 2000/07/11 02:28:11 arved Exp $ --
============================================================================
The Apache Software License, Version 1.1
@@ -57,7 +57,7 @@
import org.apache.fop.apps.FOPException;
-import org.xml.sax.AttributeList;
+import org.xml.sax.Attributes;
import java.util.Hashtable;
@@ -69,7 +69,7 @@
this.propertyTable = new Hashtable();
propertyTable.put("end-indent",EndIndent.maker());
- propertyTable.put("page-master-name",PageMasterName.maker());
+ propertyTable.put("master-name",MasterName.maker());
propertyTable.put("page-master-first",PageMasterFirst.maker());
propertyTable.put("page-master-repeating",PageMasterRepeating.maker());
propertyTable.put("page-master-odd",PageMasterOdd.maker());
@@ -167,6 +167,10 @@
propertyTable.put("initial-page-number",InitialPageNumber.maker());
propertyTable.put("ref-id",RefId.maker()); // used by page-number-citation
propertyTable.put("id",Id.maker()); // attribute for objects, used by page-number-citation
+ propertyTable.put("maximum-repeats",MaximumRepeats.maker());
+ propertyTable.put("page-position",PagePosition.maker());
+ propertyTable.put("odd-or-even",OddOrEven.maker());
+ propertyTable.put("blank-or-not-blank",BlankOrNotBlank.maker());
}
@@ -196,13 +200,13 @@
return b;
}
- public PropertyList makeList(AttributeList attributes, PropertyList parentPropertyList) throws FOPException {
+ public PropertyList makeList(Attributes attributes, PropertyList parentPropertyList) throws FOPException {
PropertyList p = new PropertyList(parentPropertyList);
p.setBuilder(this);
for (int i = 0; i < attributes.getLength(); i++) {
- String attributeName = attributes.getName(i);
+ String attributeName = attributes.getRawName(i);
Property.Maker propertyMaker = (Property.Maker)propertyTable.get(attributeName);
if (propertyMaker != null) {
p.put(attributeName,propertyMaker.make(p,attributes.getValue(i)));