Fixes for issues introduced with fox:destination:

DestinationElementMapping masks ExtensionElementMapping. That caused the tests for widow/orphan extension on tables to fail.
Improved Block child validation code (will need to be done for all FOs where fox:destination should be valid. Currently works only as child of fo:block or above fo:page-sequence where no layout managers are constructed.
No LMMaker for fox:destination. Improved the handling there so adding the extension element to the list there isn't necessary.

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

1 files changed, 8 insertions, 2 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
index d296e1c5d..de779b011 100644
--- a/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
@@ -28,6 +28,7 @@ import java.util.Iterator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import org.apache.fop.fo.FOElementMapping;
 import org.apache.fop.fo.FONode;
 import org.apache.fop.fo.FOText;
 import org.apache.fop.fo.FObjMixed;
@@ -140,7 +141,6 @@ public class LayoutManagerMapping implements LayoutManagerMaker {
         makers.put(TableHeader.class, new Maker());
         makers.put(Wrapper.class, new WrapperLayoutManagerMaker());
         makers.put(Title.class, new InlineLayoutManagerMaker());
-        makers.put(Destination.class, new Maker());
     }
 
     /**
@@ -149,7 +149,13 @@ public class LayoutManagerMapping implements LayoutManagerMaker {
     public void makeLayoutManagers(FONode node, List lms) {
         Maker maker = (Maker) makers.get(node.getClass());
         if (maker == null) {
-            log.error("No LayoutManager maker for class " + node.getClass());
+            if (FOElementMapping.URI.equals(node.getNamespaceURI())) {
+                log.error("No LayoutManager maker for class " + node.getClass());
+            } else {
+                if (log.isDebugEnabled()) {
+                    log.debug("Skipping the creation of a layout manager for " + node.getClass());
+                }
+            }
         } else {
             maker.make(node, lms);
         }