Remainder of pslm.gKNE() consolidated into pb.gKNE().

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

1 files changed, 6 insertions, 18 deletions

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index f5611051f..04038e011 100644
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -166,7 +166,11 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
         }
         
         protected LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
-            LinkedList contentList = pslm.getNextKnuthElements(context, alignment);
+            LinkedList contentList = null;
+            
+            while (!childFLM.isFinished() && contentList == null) {
+                contentList = childFLM.getNextKnuthElements(context, alignment);
+            }
 
             // scan contentList, searching for footnotes
             boolean bFootnotesPresent = false;
@@ -221,7 +225,7 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
         }
         
         protected boolean hasMoreContent() {
-            return !isFinished();
+            return !childFLM.isFinished();
         }
         
         protected void addAreas(PositionIterator posIter, LayoutContext context) {
@@ -303,22 +307,6 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
     }
     
     /**
-     * @see org.apache.fop.layoutmgr.LayoutManager#getNextKnuthElements(Layout Context, int)
-     */
-    public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {       
-        while (!childFLM.isFinished()) {
-            LinkedList returnedList = childFLM.getNextKnuthElements(context, alignment);
-
-            if (returnedList != null) {
-                return returnedList;
-            }
-        }
-
-        setFinished(true);
-        return null;
-    }
-
-    /**
      * Provides access to the current page.
      * @return the current PageViewport
      */