From c49ab18415da946d5d452e68f9f9215e338f1c04 Mon Sep 17 00:00:00 2001 From: Glen Mazza Date: Fri, 10 Jun 2005 22:17:38 +0000 Subject: generatesInlineAreas() methods removed. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198741 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java | 11 ----------- src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java | 5 ----- src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java | 4 ---- .../org/apache/fop/layoutmgr/InlineStackingLayoutManager.java | 11 ----------- src/java/org/apache/fop/layoutmgr/LayoutManager.java | 9 --------- src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java | 8 -------- src/java/org/apache/fop/layoutmgr/TextLayoutManager.java | 9 --------- 7 files changed, 57 deletions(-) diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java index 03df7ed39..cb33e9b0c 100644 --- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java @@ -83,11 +83,6 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants return this.parentLM; } - /** @see org.apache.fop.layoutmgr.LayoutManager#generatesInlineAreas() */ - public boolean generatesInlineAreas() { - return false; - } - /** * Return currently active child LayoutManager or null if * all children have finished layout. @@ -162,12 +157,6 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants public void addAreas(PositionIterator posIter, LayoutContext context) { } - - /* --------------------------------------------------------- - * PROVIDE NULL IMPLEMENTATIONS OF METHODS from LayoutManager - * interface which are declared abstract in AbstractLayoutManager. - * ---------------------------------------------------------*/ - public LinkedList getNextKnuthElements(LayoutContext context, int alignment) { log.warn("null implementation of getNextKnuthElements() called!"); diff --git a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java index c662dbad5..945cdf525 100644 --- a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java @@ -161,11 +161,6 @@ public class ContentLayoutManager implements InlineLevelLayoutManager { return stackSize; } - /** @see org.apache.fop.layoutmgr.LayoutManager */ - public boolean generatesInlineAreas() { - return true; - } - /** @see org.apache.fop.layoutmgr.LayoutManager */ public Area getParentArea(Area childArea) { return holder; diff --git a/src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java b/src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java index 4c9d3a06f..f66f2611a 100644 --- a/src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java @@ -46,10 +46,6 @@ public class FootnoteLayoutManager extends AbstractLayoutManager bodyLM = new FootnoteBodyLayoutManager(footnote.getFootnoteBody()); } - public boolean generatesInlineAreas() { - return true; - } - public LinkedList getNextKnuthElements(LayoutContext context, int alignment) { // this is the only method that must be implemented: diff --git a/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java index 0fe9fa8a4..2272d58bb 100644 --- a/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java @@ -102,16 +102,6 @@ public class InlineStackingLayoutManager extends AbstractLayoutManager childLMiter = iter; } - /** - * Check if this generates inline areas. - * This creates inline areas that contain other inline areas. - * - * @return true - */ - public boolean generatesInlineAreas() { - return true; - } - protected MinOptMax getExtraIPD(boolean bNotFirst, boolean bNotLast) { return new MinOptMax(0); } @@ -545,4 +535,3 @@ public class InlineStackingLayoutManager extends AbstractLayoutManager return returnList; } } - diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManager.java b/src/java/org/apache/fop/layoutmgr/LayoutManager.java index 1cc40f689..3d6053248 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutManager.java @@ -49,15 +49,6 @@ public interface LayoutManager { */ PageSequenceLayoutManager getPSLM(); - /** - * Generates inline areas. - * This is used to check if the layout manager generates inline - * areas. - * - * @return true if the layout manager generates inline areas - */ - boolean generatesInlineAreas(); - /** * Reset to the position. * diff --git a/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java b/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java index 7149a3450..42339f1cc 100644 --- a/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java @@ -92,14 +92,6 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager return curArea; } - /** - * Check if this generates inline areas. - * @return true always since this is an inline area manager - */ - public boolean generatesInlineAreas() { - return true; - } - /** * Check if this inline area is resolved due to changes in * page or ipd. diff --git a/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java b/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java index df7a218ce..9a214b905 100644 --- a/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java @@ -185,15 +185,6 @@ public class TextLayoutManager extends LeafNodeLayoutManager { } } - /** - * Text always generates inline areas. - * - * @return true - */ - public boolean generatesInlineAreas() { - return true; - } - /** * Reset position for returning next BreakPossibility. * -- cgit v1.2.3