changes to support named destination

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

diff --git a/src/java/org/apache/fop/fo/ElementMappingRegistry.java b/src/java/org/apache/fop/fo/ElementMappingRegistry.java
index 105a956a29094cf807016a5ff2649a741a71fb5a..887fe8b55d816daa834b844d5d4415392cbcf5dd 100644 (file)
--- a/src/java/org/apache/fop/fo/ElementMappingRegistry.java
+++ b/src/java/org/apache/fop/fo/ElementMappingRegistry.java
@@ -90,7 +90,6 @@ public class ElementMappingRegistry {
      */
     public void addElementMapping(String mappingClassName)
                 throws IllegalArgumentException {
-
         try {
             ElementMapping mapping
                 = (ElementMapping)Class.forName(mappingClassName).newInstance();

diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java
index 91817b87fd733e0d9e17a6a8aa5060bbd3afeb4d..baf964935bad45f3d826f64de57076723f2eb9e3 100644 (file)
--- a/src/java/org/apache/fop/fo/FONode.java
+++ b/src/java/org/apache/fop/fo/FONode.java
@@ -45,6 +45,7 @@ public abstract class FONode implements Cloneable {
 
     /** the XSL-FO namespace URI */
     protected static final String FO_URI = FOElementMapping.URI;
+    protected static final String FOX_URI = ExtensionElementMapping.URI;
 
     /** Parent FO node */
     protected FONode parent;

diff --git a/src/java/org/apache/fop/fo/FOTreeBuilder.java b/src/java/org/apache/fop/fo/FOTreeBuilder.java
index 4c754520ddedb5c9ce46e58ab99e6f52d588c3d4..2f1b53f1d6c9fb8ad1d953559d9a3cd3a5c21f3e 100644 (file)
--- a/src/java/org/apache/fop/fo/FOTreeBuilder.java
+++ b/src/java/org/apache/fop/fo/FOTreeBuilder.java
@@ -23,6 +23,7 @@ import java.io.OutputStream;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.fop.fo.extensions.ExtensionElementMapping;
 import org.apache.fop.apps.FOPException;
 import org.apache.fop.apps.FOUserAgent;
 import org.apache.fop.apps.FormattingResults;
@@ -296,9 +297,8 @@ public class FOTreeBuilder extends DefaultHandler {
                         + " Please make sure you're producing a valid XSL-FO document.");
                 }
             } else { // check that incoming node is valid for currentFObj
-                if (namespaceURI.equals(FOElementMapping.URI)) {
-                    // currently no fox: elements to validate
-                    // || namespaceURI.equals(ExtensionElementMapping.URI) */) {
+                if (namespaceURI.equals(FOElementMapping.URI)
+                    || namespaceURI.equals(ExtensionElementMapping.URI)) {
                     try {
                         currentFObj.validateChildNode(locator, namespaceURI, localName);
                     } catch (ValidationException e) {
@@ -368,7 +368,8 @@ public class FOTreeBuilder extends DefaultHandler {
                 throw new IllegalStateException(
                         "endElement() called for " + rawName 
                             + " where there is no current element.");
-            } else if (!currentFObj.getLocalName().equals(localName) 
+            } else
+            if (!currentFObj.getLocalName().equals(localName) 
                     || !currentFObj.getNamespaceURI().equals(uri)) {
                 log.warn("Mismatch: " + currentFObj.getLocalName() 
                         + " (" + currentFObj.getNamespaceURI()