Decommission BlockStackingLM.StackingIter

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

diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index b74df68bc008d01289a2058aae5534d1b33c83a5..56f286dd068a2beb6a439f59195a2b8034efdeed 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -861,7 +861,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
         if (bcpos == null) {
             // the Positions in positionList were inside the elements
             // created by the LineLM
-            childPosIter = new StackingIter(positionList.listIterator());
+            childPosIter = new PositionIterator(positionList.listIterator());
 
             while ((childLM = childPosIter.getNextChildLM()) != null) {
                 // set last area flag

diff --git a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
index a7361ae316ac3f7217b29c417bb3a8dd1ed893aa..45036b36ef9fc9e31881cf7881e8e4f65bfecdcc 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
@@ -279,7 +279,7 @@ public class BlockLayoutManager extends BlockStackingLayoutManager
 
         // the Positions in positionList were inside the elements
         // created by the LineLM
-        childPosIter = new StackingIter(positionList.listIterator());
+        childPosIter = new PositionIterator(positionList.listIterator());
 
         while ((childLM = childPosIter.getNextChildLM()) != null) {
             // set last area flag

diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
index 974222271f6690d6743e7913757907ecaceed8ba..7e1881f771740f21fe97416f85cb3c50a0dcedc4 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
@@ -599,7 +599,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
                     return adj;
                 }
             }
-        } else if (innerPosition.getLM() != this) {
+        } else if (innerPosition != null && innerPosition.getLM() != this) {
             // this adjustment concerns another LM
             NonLeafPosition savedPos = (NonLeafPosition) lastElement.getPosition();
             lastElement.setPosition(innerPosition);
@@ -1111,34 +1111,6 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
         }
     }
 
-    /** A stack iterator. */
-    protected static class StackingIter extends PositionIterator {
-
-        /**
-         * Construct a stacking iterator.
-         * @param parentIter the parent iterator
-         */
-        StackingIter(Iterator parentIter) {
-            super(parentIter);
-        }
-
-        /**
-         * @param nextObj the next position
-         * @return the layout manager of the next position
-         */
-        protected LayoutManager getLM(Object nextObj) {
-            return ((Position) nextObj).getLM();
-        }
-
-        /**
-         * @param nextObj the next position
-         * @return the next position
-         */
-        protected Position getPos(Object nextObj) {
-            return ((Position) nextObj);
-        }
-    }
-
     /** A mapping position. */
     protected static class MappingPosition extends Position {