pbwest 2002/10/21 09:12:54
Modified: src/org/apache/fop/fo/pagination Tag: FOP_0-20-0_Alt-Design
FoLayoutMasterSet.java FoPageSequenceMaster.java
Log:
UriLocalName separated from XMLEvent.
Revision Changes Path
No revision
No revision
1.1.2.9 +10 -10
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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoLayoutMasterSet.java 12 Oct 2002 03:50:43 -0000 1.1.2.8
+++ FoLayoutMasterSet.java 21 Oct 2002 16:12:53 -0000 1.1.2.9
@@ -7,13 +7,13 @@
import java.util.NoSuchElementException;
import org.apache.fop.apps.FOPException;
-import org.apache.fop.xml.XMLEvent;
import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
import org.apache.fop.fo.FOTree;
import org.apache.fop.fo.FONode;
import org.apache.fop.fo.expr.PropertyException;
import org.apache.fop.xml.XMLEvent;
+import org.apache.fop.xml.UriLocalName;
import org.apache.fop.xml.XMLNamespaces;
import org.apache.fop.xml.SyncedXmlEventsBuffer;
import org.apache.fop.datastructs.Tree;
@@ -41,14 +41,14 @@
private static final String revision = "$Revision$";
/**
- * An array with <tt>XMLEvent.UriLocalName</tt> objects identifying
+ * An array with <tt>UriLocalName</tt> objects identifying
* <tt>simple-page-master</tt> and <tt>page-sequence-master</tt>
* XML events.
*/
- private static final XMLEvent.UriLocalName[] simpleOrSequenceMaster = {
- new XMLEvent.UriLocalName
+ private static final UriLocalName[] simpleOrSequenceMaster = {
+ new UriLocalName
(XMLNamespaces.XSLNSpaceIndex, "simple-page-master"),
- new XMLEvent.UriLocalName
+ new UriLocalName
(XMLNamespaces.XSLNSpaceIndex, "page-sequence-master")
};
@@ -107,7 +107,7 @@
(simpleOrSequenceMaster, XMLEvent.DISCARD_W_SPACE);
localName = ev.getLocalName();
if (localName.equals("simple-page-master")) {
- System.out.println("Found simple-page-master");
+ //System.out.println("Found simple-page-master");
simple = new FoSimplePageMaster(foTree, this, ev);
masterName = simple.getMasterName();
if (pageMasters.get(masterName) != null)
@@ -122,7 +122,7 @@
+ "simplePageMasters: " + masterName);
simplePageMasters.put(masterName, simple);
} else if (localName.equals("page-sequence-master")) {
- System.out.println("Found page-sequence-master");
+ //System.out.println("Found page-sequence-master");
try {
foPageSeq =
new FoPageSequenceMaster(foTree, this, ev);
1.1.2.9 +22 -19
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.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- FoPageSequenceMaster.java 12 Oct 2002 03:55:30 -0000 1.1.2.8
+++ FoPageSequenceMaster.java 21 Oct 2002 16:12:54 -0000 1.1.2.9
@@ -17,9 +17,10 @@
import org.apache.fop.fo.FOAttributes;
import org.apache.fop.xml.XMLEvent;
import org.apache.fop.xml.XMLNamespaces;
+import org.apache.fop.xml.UriLocalName;
import org.apache.fop.apps.FOPException;
import org.apache.fop.fo.expr.PropertyException;
-import org.apache.fop.fo.Properties;
+import org.apache.fop.fo.properties.Property;
import org.apache.fop.fo.PropNames;
import org.apache.fop.fo.FOPropertySets;
import org.apache.fop.fo.FObjectNames;
@@ -28,7 +29,6 @@
import org.apache.fop.datastructs.Tree;
import org.apache.fop.datatypes.PropertyValue;
import org.apache.fop.datatypes.NCName;
-import org.apache.fop.xml.XMLEvent;
/**
* Implements the fo:page-sequence-master flow object. These Fos are
@@ -42,23 +42,26 @@
private static final String revision = "$Revision$";
/**
- * An array with <tt>XMLEvent.UriLocalName</tt> objects identifying
+ * An array with <tt>UriLocalName</tt> objects identifying
* <tt>single-page-master-reference</tt>,
* <tt>repeatable-page-master-reference</tt> and
* <tt>repeatable-page-master-alternatives</tt> XML events.
*/
- private static final XMLEvent.UriLocalName[]
- singleOrRepeatableMasterRefs = {
- new XMLEvent.UriLocalName
+ private static final UriLocalName[] singleOrRepeatableMasterRefs = {
+ new UriLocalName
(XMLNamespaces.XSLNSpaceIndex, "single-page-master-reference"),
- new XMLEvent.UriLocalName
+ new UriLocalName
(XMLNamespaces.XSLNSpaceIndex, "repeatable-page-master-reference"),
- new XMLEvent.UriLocalName
+ new UriLocalName
(XMLNamespaces.XSLNSpaceIndex, "repeatable-page-master-alternatives")
};
- private static final XMLEvent.UriLocalName conditionalPageMasterRef =
- new XMLEvent.UriLocalName(XMLNamespaces.XSLNSpaceIndex,
+ /**
+ * A <tt>UriLocalName</tt> object identifying a
+ * <tt>conditional-page-master-reference</tt>,
+ */
+ private static final UriLocalName conditionalPageMasterRef =
+ new UriLocalName(XMLNamespaces.XSLNSpaceIndex,
"conditional-page-master-reference");
private String masterName;
@@ -77,21 +80,21 @@
(singleOrRepeatableMasterRefs, XMLEvent.DISCARD_W_SPACE);
String localName = ev.getLocalName();
if (localName.equals("single-page-master-reference")) {
- System.out.println("Found single-page-master-reference");
+ //System.out.println("Found single-page-master-reference");
//subSequenceList.add(new FoSinglePageMasterReference
//(foTree, this, ev));
new FoSinglePageMasterReference(foTree, this, ev);
} else if (localName.equals
("repeatable-page-master-reference")) {
- System.out.println
- ("Found repeatable-page-master-reference");
+ //System.out.println
+ // ("Found repeatable-page-master-reference");
//subSequenceList.add(new FoRepeatablePageMasterReference
//(foTree, this, ev));
new FoRepeatablePageMasterReference(foTree, this, ev);
} else if (localName.equals
("repeatable-page-master-alternatives")) {
- System.out.println
- ("Found repeatable-page-master-alternatives");
+ //System.out.println
+ // ("Found repeatable-page-master-alternatives");
//subSequenceList.add(new FoRepeatablePageMasterAlternatives
//(foTree, this, ev));
new FoRepeatablePageMasterAlternatives(foTree, this, ev);
@@ -187,8 +190,8 @@
(conditionalPageMasterRef.uriIndex,
conditionalPageMasterRef.localName,
XMLEvent.DISCARD_W_SPACE);
- System.out.println
- ("Found conditional-page-master-reference");
+ //System.out.println
+ // ("Found conditional-page-master-reference");
new FoConditionalPageMasterReference(foTree, this, ev);
this.xmlevents.getEndElement(ev);
} while (true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
