pbwest 2002/10/27 16:08:12
Modified:src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
FoSimplePageMaster.java
Log:
Use foType in get/expect calls.
Revision ChangesPath
No revision
No revision
1.1.2.11 +11 -13
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java
Index: FoLayoutMasterSet.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoLayoutMasterSet.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoLayoutMasterSet.java24 Oct 2002 14:58:14 - 1.1.2.10
+++ FoLayoutMasterSet.java28 Oct 2002 00:08:11 - 1.1.2.11
@@ -42,15 +42,13 @@
private static final String revision = $Revision$;
/**
- * An array with ttUriLocalName/tt objects identifying
+ * An array with ttint/tts identifying
* ttsimple-page-master/tt and ttpage-sequence-master/tt
* XML events.
*/
-private static final UriLocalName[] simpleOrSequenceMaster = {
-new UriLocalName
- (XMLNamespaces.XSLNSpaceIndex, simple-page-master),
-new UriLocalName
- (XMLNamespaces.XSLNSpaceIndex, page-sequence-master)
+private static final int[] simpleOrSequenceMaster = {
+FObjectNames.SIMPLE_PAGE_MASTER,
+FObjectNames.PAGE_SEQUENCE_MASTER
};
/**
@@ -99,7 +97,7 @@
{
FoSimplePageMaster simple;
String masterName;
- String localName;
+int foType;
FoPageSequenceMaster foPageSeq;
try {
do {
@@ -107,8 +105,8 @@
xmlevents.expectStartElement
(simpleOrSequenceMaster, XMLEvent.DISCARD_W_SPACE);
if (ev == null) break; // No instance of these elements found
-localName = ev.getLocalName();
-if (localName.equals(simple-page-master)) {
+foType = ev.getFoType();
+if (foType == FObjectNames.SIMPLE_PAGE_MASTER) {
//System.out.println(Found simple-page-master);
simple = new FoSimplePageMaster(foTree, this, ev);
masterName = simple.getMasterName();
@@ -123,7 +121,7 @@
(simple-page-master master-name clash in
+ simplePageMasters: + masterName);
simplePageMasters.put(masterName, simple);
-} else if (localName.equals(page-sequence-master)) {
+} else if (foType == FObjectNames.PAGE_SEQUENCE_MASTER) {
//System.out.println(Found page-sequence-master);
try {
foPageSeq =
1.1.2.11 +17 -31
xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java
Index: FoPageSequenceMaster.java
===
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/fo/pagination/Attic/FoPageSequenceMaster.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- FoPageSequenceMaster.java 24 Oct 2002 14:58:14 - 1.1.2.10
+++ FoPageSequenceMaster.java 28 Oct 2002 00:08:11 - 1.1.2.11
@@ -43,28 +43,17 @@
private static final String revision = $Revision$;
/**
- * An array with ttUriLocalName/tt objects identifying
+ * An array with ttint/tts identifying
* ttsingle-page-master-reference/tt,
* ttrepeatable-page-master-reference/tt and
* ttrepeatable-page-master-alternatives/tt XML events.
*/
-private static final UriLocalName[] singleOrRepeatableMasterRefs = {
-new UriLocalName
- (XMLNamespaces.XSLNSpaceIndex, single-page-master-reference),
-new UriLocalName
- (XMLNamespaces.XSLNSpaceIndex, repeatable-page-master-reference),
-new UriLocalName
- (XMLNamespaces.XSLNSpaceIndex, repeatable-page-master-alternatives)
+private static final int[] singleOrRepeatableMasterRefs = {
+FObjectNames.SINGLE_PAGE_MASTER_REFERENCE,
+FObjectNames.REPEATABLE_PAGE_MASTER_REFERENCE,
+FObjectNames.REPEATABLE_PAGE_MASTER_ALTERNATIVES
};
-/**
- * A ttUriLocalName/tt object identifying a
- * ttconditional-page-master-reference/tt,
- */
-private static final UriLocalName conditionalPageMasterRef =
- new UriLocalName(XMLNamespaces.XSLNSpaceIndex,
- conditional-page-master-reference);
-
private String
