Removed Unknown.java; for mappings in which it is desired to process invalid nodes...

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

diff --git a/src/java/org/apache/fop/fo/FOTreeBuilder.java b/src/java/org/apache/fop/fo/FOTreeBuilder.java
index cda21f8e044820534e8aaca84025864922e397ae..57af117ded2ea77f8864cfd70346a1ecb1e74023 100644 (file)
--- a/src/java/org/apache/fop/fo/FOTreeBuilder.java
+++ b/src/java/org/apache/fop/fo/FOTreeBuilder.java
@@ -301,12 +301,13 @@ public class FOTreeBuilder extends DefaultHandler {
     }
 
     /**
-     * Finds the Maker used to create FO objects of a particular type
+     * Finds the Maker used to create node objects of a particular type
      * @param namespaceURI URI for the namespace of the element
      * @param localName name of the Element
      * @return the ElementMapping.Maker that can create an FO object for this element
+     * @throws SAXParseException if a Maker could not be found for a bound namespace.
      */
-    private Maker findFOMaker(String namespaceURI, String localName) {
+    private Maker findFOMaker(String namespaceURI, String localName) throws SAXParseException {
       Map table = (Map)fobjTable.get(namespaceURI);
       Maker fobjMaker = null;
       if (table != null) {
@@ -318,13 +319,12 @@ public class FOTreeBuilder extends DefaultHandler {
       }
 
       if (fobjMaker == null) {
-          if (log.isWarnEnabled()) {
-              log.warn("Unknown formatting object " + namespaceURI + "^" + localName);
-          }
           if (namespaces.contains(namespaceURI.intern())) {
-              // fall back
-              fobjMaker = new Unknown.Maker();
+                throw new SAXParseException (FONode.errorText(locator) + 
+                    "No element mapping definition found for "
+                    + FONode.getNodeString(namespaceURI, localName), locator);
           } else {
+              log.warn("Unknown formatting object " + namespaceURI + "^" + localName);
               fobjMaker = new UnknownXMLObj.Maker(namespaceURI);
           }
       }

diff --git a/src/java/org/apache/fop/fo/Unknown.java b/src/java/org/apache/fop/fo/Unknown.java
deleted file mode 100644 (file)
index 3be0727..0000000
--- a/src/java/org/apache/fop/fo/Unknown.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 1999-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.fo;
-
-/**
- * Class for handling an unknown element from a namespace recognized
- * by FOP.
- * This prevents any further problems arising from the unknown
- * data.
- */
-public class Unknown extends FONode {
-
-    /**
-     * Inner class for handling the creation of Unknown objects
-     */
-    public static class Maker extends ElementMapping.Maker {
-
-        /**
-         * @param parent the FONode that is the parent of the object to be
-         * created
-         * @return the created Unknown object
-         */
-        public FONode make(FONode parent) {
-            return new Unknown(parent);
-        }
-    }
-
-    /**
-     * @param parent FONode that is the parent of this object
-     */
-    public Unknown(FONode parent) {
-        super(parent);
-    }
-}