From dfc42a33aa07661f895d7ad1666591dbb64f21c5 Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Fri, 15 Jul 2005 20:50:33 +0000 Subject: WrapperLayoutManagerMaker was used by RetrieveMarker. This caused a ClassCastException with my recent fix. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@219246 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/fop/layoutmgr/LayoutManagerMapping.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java index 74c4d160b..8395e339a 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java @@ -94,7 +94,7 @@ public class LayoutManagerMapping implements LayoutManagerMaker { makers.put(BasicLink.class, new BasicLinkLayoutManagerMaker()); makers.put(Block.class, new BlockLayoutManagerMaker()); makers.put(Leader.class, new LeaderLayoutManagerMaker()); - makers.put(RetrieveMarker.class, new WrapperLayoutManagerMaker()); + makers.put(RetrieveMarker.class, new RetrieveMarkerLayoutManagerMaker()); makers.put(Character.class, new CharacterLayoutManagerMaker()); makers.put(ExternalGraphic.class, new ExternalGraphicLayoutManagerMaker()); @@ -330,6 +330,20 @@ public class LayoutManagerMapping implements LayoutManagerMaker { } } + public class RetrieveMarkerLayoutManagerMaker extends Maker { + public void make(FONode node, List lms) { + Iterator baseIter; + baseIter = node.getChildNodes(); + if (baseIter == null) { + return; + } + while (baseIter.hasNext()) { + FONode child = (FONode) baseIter.next(); + makeLayoutManagers(child, lms); + } + } + } + public class WrapperLayoutManagerMaker extends Maker { public void make(FONode node, List lms) { //We insert the wrapper LM before it's children so an ID -- cgit v1.2.3