gmazza 2004/06/19 22:15:40
Modified: src/java/org/apache/fop/apps Driver.java
src/java/org/apache/fop/fo/pagination
RepeatablePageMasterReference.java
Removed: src/java/org/apache/fop/tools ProxyContentHandler.java
Log:
1. ProxyContentHandler no longer needed.
2. fo:repeatable-page-master-reference's ValidateChildNode() implemented.
Revision Changes Path
1.71 +5 -26 xml-fop/src/java/org/apache/fop/apps/Driver.java
Index: Driver.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Driver.java 19 Jun 2004 13:35:33 -0000 1.70
+++ Driver.java 20 Jun 2004 05:15:40 -0000 1.71
@@ -30,20 +30,16 @@
import org.apache.fop.render.rtf.RTFHandler;
import org.apache.fop.tools.DocumentInputSource;
import org.apache.fop.tools.DocumentReader;
-import org.apache.fop.tools.ProxyContentHandler;
import org.apache.commons.logging.impl.SimpleLog;
import org.apache.commons.logging.Log;
-// DOM
-/* org.w3c.dom.Document is not imported to reduce confusion with
- org.apache.fop.control.Document */
-
-// SAX
+// XML
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
+import org.w3c.dom.Document;
// Java
import java.io.IOException;
@@ -483,24 +479,7 @@
}
treeBuilder.setFOInputHandler(foInputHandler);
-
- return new ProxyContentHandler(treeBuilder) {
-
- public void startDocument() throws SAXException {
- if (foInputHandler instanceof FOTreeHandler) {
- FOTreeHandler foTreeHandler = (FOTreeHandler)foInputHandler;
- }
- super.startDocument();
- }
-
- public void endDocument() throws SAXException {
- super.endDocument();
- if (foInputHandler instanceof FOTreeHandler) {
- FOTreeHandler foTreeHandler = (FOTreeHandler)foInputHandler;
- }
- }
-
- };
+ return treeBuilder;
}
/**
@@ -564,7 +543,7 @@
* @param document the DOM document to read from
* @throws FOPException if anything goes wrong.
*/
- public synchronized void render(org.w3c.dom.Document document)
+ public synchronized void render(Document document)
throws FOPException {
DocumentInputSource source = new DocumentInputSource(document);
DocumentReader reader = new DocumentReader();
1.8 +9 -0
xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
Index: RepeatablePageMasterReference.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RepeatablePageMasterReference.java 12 Jun 2004 23:18:52 -0000 1.7
+++ RepeatablePageMasterReference.java 20 Jun 2004 05:15:40 -0000 1.8
@@ -20,6 +20,7 @@
// XML
import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
// FOP
import org.apache.fop.fo.FONode;
@@ -46,6 +47,14 @@
*/
public RepeatablePageMasterReference(FONode parent) {
super(parent);
+ }
+
+ /**
+ * @see org.apache.fop.fo.FONode#validateChildNode(Locator, String, String)
+ * XSL/FOP Content Model: empty
+ */
+ protected void validateChildNode(Locator loc, String nsURI, String localName) {
+ invalidChildError(loc, nsURI, localName);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
