From: Keiron Liddle Date: Tue, 4 Mar 2003 03:55:54 +0000 (+0000) Subject: fixed for changed method X-Git-Tag: Alt-Design-integration-base~90 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c6376bf3d5ce2edd0002ef1a902c974a62fc38d5;p=xmlgraphics-fop.git fixed for changed method git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@196012 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/org/apache/fop/fo/Title.java b/src/org/apache/fop/fo/Title.java index 12bd99d95..b45b483ac 100644 --- a/src/org/apache/fop/fo/Title.java +++ b/src/org/apache/fop/fo/Title.java @@ -8,16 +8,17 @@ package org.apache.fop.fo; // FOP -import org.apache.fop.fo.*; -import org.apache.fop.datatypes.*; -import org.apache.fop.layout.*; -import org.apache.fop.fo.flow.*; -import org.apache.fop.fo.properties.*; -import org.apache.fop.apps.FOPException; - -import org.apache.fop.layoutmgr.LMiter; -import org.apache.fop.layoutmgr.InlineStackingLayoutManager; +import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.Length; +import org.apache.fop.layout.AccessibilityProps; +import org.apache.fop.layout.AuralProps; +import org.apache.fop.layout.BackgroundProps; +import org.apache.fop.layout.BorderAndPadding; +import org.apache.fop.layout.FontState; +import org.apache.fop.layout.MarginInlineProps; import org.apache.fop.layoutmgr.ContentLayoutManager; +import org.apache.fop.layoutmgr.InlineStackingLayoutManager; +import org.apache.fop.layoutmgr.LMiter; /** */ @@ -43,7 +44,7 @@ public class Title extends FObjMixed { ContentLayoutManager clm = new ContentLayoutManager(title); clm.setUserAgent(getUserAgent()); - lm.setParentLM(clm); + lm.setParent(clm); clm.fillArea(lm); diff --git a/src/org/apache/fop/fo/flow/Leader.java b/src/org/apache/fop/fo/flow/Leader.java index 4846652a9..d5de744da 100644 --- a/src/org/apache/fop/fo/flow/Leader.java +++ b/src/org/apache/fop/fo/flow/Leader.java @@ -8,30 +8,35 @@ package org.apache.fop.fo.flow; // FOP -import org.apache.fop.fo.*; -import org.apache.fop.fo.properties.*; -import org.apache.fop.datatypes.*; +import java.util.List; + +import org.apache.fop.apps.StructureHandler; +import org.apache.fop.area.Trait; +import org.apache.fop.area.inline.FilledArea; import org.apache.fop.area.inline.InlineArea; -import org.apache.fop.layout.*; +import org.apache.fop.area.inline.Space; +import org.apache.fop.area.inline.Word; +import org.apache.fop.datatypes.ColorType; +import org.apache.fop.datatypes.Length; +import org.apache.fop.datatypes.PercentLength; +import org.apache.fop.fo.FONode; +import org.apache.fop.fo.FObjMixed; +import org.apache.fop.fo.properties.LeaderPattern; +import org.apache.fop.layout.AccessibilityProps; +import org.apache.fop.layout.AuralProps; +import org.apache.fop.layout.BackgroundProps; +import org.apache.fop.layout.BorderAndPadding; +import org.apache.fop.layout.FontInfo; import org.apache.fop.layout.FontState; -import org.apache.fop.apps.FOPException; -import org.apache.fop.layoutmgr.LayoutManager; -import org.apache.fop.layoutmgr.InlineStackingLayoutManager; -import org.apache.fop.layoutmgr.LeafNodeLayoutManager; +import org.apache.fop.layout.MarginInlineProps; +import org.apache.fop.layout.RelativePositionProps; import org.apache.fop.layoutmgr.ContentLayoutManager; -import org.apache.fop.layoutmgr.LayoutContext; +import org.apache.fop.layoutmgr.InlineStackingLayoutManager; import org.apache.fop.layoutmgr.LMiter; +import org.apache.fop.layoutmgr.LayoutContext; +import org.apache.fop.layoutmgr.LeafNodeLayoutManager; import org.apache.fop.layoutmgr.MinOptMax; -import org.apache.fop.area.inline.Space; -import org.apache.fop.area.inline.Word; -import org.apache.fop.area.inline.InlineParent; -import org.apache.fop.area.inline.FilledArea; import org.apache.fop.util.CharUtilities; -import org.apache.fop.apps.StructureHandler; -import org.apache.fop.area.Trait; - -import java.util.List; -import java.util.ArrayList; /** * Implements fo:leader; main property of leader leader-pattern. @@ -134,7 +139,7 @@ public class Leader extends FObjMixed { ContentLayoutManager clm = new ContentLayoutManager(fa); clm.setUserAgent(getUserAgent()); - lm.setParentLM(clm); + lm.setParent(clm); clm.fillArea(lm); int width = clm.getStackingSize();