aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlen Mazza <gmazza@apache.org>2005-06-10 22:17:38 +0000
committerGlen Mazza <gmazza@apache.org>2005-06-10 22:17:38 +0000
commitc49ab18415da946d5d452e68f9f9215e338f1c04 (patch)
tree6b7ab19668387259c90281dc84c44fbb39388550
parentd9a2b39380a246dd0cf774b6ef2319d53a1fac58 (diff)
downloadxmlgraphics-fop-c49ab18415da946d5d452e68f9f9215e338f1c04.tar.gz
xmlgraphics-fop-c49ab18415da946d5d452e68f9f9215e338f1c04.zip
generatesInlineAreas() methods removed.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@198741 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java11
-rw-r--r--src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java5
-rw-r--r--src/java/org/apache/fop/layoutmgr/FootnoteLayoutManager.java4
-rw-r--r--src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java11
-rw-r--r--src/java/org/apache/fop/layoutmgr/LayoutManager.java9
-rw-r--r--src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java8
-rw-r--r--src/java/org/apache/fop/layoutmgr/TextLayoutManager.java9
7 files changed, 0 insertions, 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
@@ -162,11 +162,6 @@ public class ContentLayoutManager implements InlineLevelLayoutManager {
}
/** @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
@@ -50,15 +50,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.
*
* @param position the Position to reset to
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
@@ -93,14 +93,6 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager
}
/**
- * 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.
* Currently not used.
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
@@ -186,15 +186,6 @@ public class TextLayoutManager extends LeafNodeLayoutManager {
}
/**
- * Text always generates inline areas.
- *
- * @return true
- */
- public boolean generatesInlineAreas() {
- return true;
- }
-
- /**
* Reset position for returning next BreakPossibility.
*
* @param prevPos the position to reset to