1. ProxyContentHandler no longer needed.

2. fo:repeatable-page-master-reference's ValidateChildNode() implemented.

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

diff --git a/src/java/org/apache/fop/apps/Driver.java b/src/java/org/apache/fop/apps/Driver.java
index a5376877c8cea98c6413073f3c913ed34a0db8e7..7b0cece47b8b082f47d7ac7f649f974e937e2265 100644 (file)
--- a/src/java/org/apache/fop/apps/Driver.java
+++ b/src/java/org/apache/fop/apps/Driver.java
@@ -30,20 +30,16 @@ import org.apache.fop.render.mif.MIFHandler;
 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 @@ public class Driver {
         }
 
         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 @@ public class Driver {
      * @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();

diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
index bf954cddd82139814597c75cfd4aa4143bdf3125..d851f522c982134c7f749027d34b74587cd33116 100644 (file)
--- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
+++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java
@@ -20,6 +20,7 @@ package org.apache.fop.fo.pagination;
 
 // XML
 import org.xml.sax.Attributes;
+import org.xml.sax.Locator;
 
 // FOP
 import org.apache.fop.fo.FONode;
@@ -48,6 +49,14 @@ public class RepeatablePageMasterReference extends PageMasterReference
         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);
+    }
+
     /**
      * @see org.apache.fop.fo.FObj#addProperties
      */

diff --git a/src/java/org/apache/fop/tools/ProxyContentHandler.java b/src/java/org/apache/fop/tools/ProxyContentHandler.java
deleted file mode 100644 (file)
index 457ed5f..0000000
--- a/src/java/org/apache/fop/tools/ProxyContentHandler.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright 2004,2004 The Apache Software Foundation.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* $Id$ */
-
-package org.apache.fop.tools;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-
-/**
- * Simple proxying ContentHandler. It simply forwards all SAX events to its
- * delegate ContentHandler.
- */
-public class ProxyContentHandler implements ContentHandler {
-
-    private ContentHandler delegate;
-    
-    /**
-     * Constructs a new ProxyContentHandler
-     * @param delegate the ContentHandler that receives all SAX events.  
-     */
-    public ProxyContentHandler(ContentHandler delegate) {
-        super();
-        this.delegate = delegate;
-    }
-
-    /**
-     * @return the delegate ContentHandler
-     */
-    public ContentHandler getDelegate() {
-        return this.delegate;
-    }
-
-    /**
-     * @see org.xml.sax.ContentHandler#startDocument()
-     */
-    public void startDocument() throws SAXException {
-        getDelegate().startDocument();
-    }
-
-    /**
-     * @see org.xml.sax.ContentHandler#endDocument()
-     */
-    public void endDocument() throws SAXException {
-        getDelegate().endDocument();
-    }
-
-    /**
-     * @see org.xml.sax.ContentHandler#characters(char[], int, int)
-     */
-    public void characters(char[] ch, int start, int length)
-            throws SAXException {
-        getDelegate().characters(ch, start, length);
-    }
-
-    /**
-     * @see org.xml.sax.ContentHandler#ignorableWhitespace(char[], int, int)
-     */
-    public void ignorableWhitespace(char[] ch, int start, int length)
-            throws SAXException {
-        getDelegate().ignorableWhitespace(ch, start, length);
-    }
-
-    /**
-     * @see org.xml.sax.ContentHandler#startElement(java.lang.String, java.lang.String, java.lang.String, org.xml.sax.Attributes)
-     */
-    public void startElement(String namespaceURI,
-            String localName, String qName, Attributes atts)
-                throws SAXException {
-        getDelegate().startElement(namespaceURI, localName, qName, atts);
-    }
-
-    /**
-     * @see org.xml.sax.ContentHandler#endElement(java.lang.String, java.lang.String, java.lang.String)
-     */
-    public void endElement(String namespaceURI, String localName, String qName)
-            throws SAXException {
-        getDelegate().endElement(namespaceURI, localName, qName);
-    }
-
-    /**
-     * @see org.xml.sax.ContentHandler#skippedEntity(java.lang.String)
-     */
-    public void skippedEntity(String name) throws SAXException {
-        getDelegate().skippedEntity(name);
-    }
-
-    /**
-     * @see org.xml.sax.ContentHandler#setDocumentLocator(org.xml.sax.Locator)
-     */
-    public void setDocumentLocator(Locator locator) {
-        getDelegate().setDocumentLocator(locator);
-    }
-
-    /**
-     * @see org.xml.sax.ContentHandler#processingInstruction(java.lang.String, java.lang.String)
-     */
-    public void processingInstruction(String target, String data)
-            throws SAXException {
-        getDelegate().processingInstruction(target, data);
-    }
-
-    /**
-     * @see org.xml.sax.ContentHandler#startPrefixMapping(java.lang.String, java.lang.String)
-     */
-    public void startPrefixMapping(String prefix, String uri)
-            throws SAXException {
-        getDelegate().startPrefixMapping(prefix, uri);
-    }
-
-    /**
-     * @see org.xml.sax.ContentHandler#endPrefixMapping(java.lang.String)
-     */
-    public void endPrefixMapping(String prefix) throws SAXException {
-        getDelegate().endPrefixMapping(prefix);
-    }
-
-}