Add generics to layout

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index dced733176948ff9b343319ff1f522cc373db48d..ad49720e8f559d721c903f8a7bceb1ccdfc2c13e 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -182,7 +182,7 @@ public class BlockContainerLayoutManager extends SpacedBorderedPaddedBlockLayout
 
     /** {@inheritDoc} */
     @Override
-    public List getNextKnuthElements(LayoutContext context, int alignment) {
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment) {
         return getNextKnuthElements(context, alignment, null, null, null);
     }
 
@@ -203,7 +203,7 @@ public class BlockContainerLayoutManager extends SpacedBorderedPaddedBlockLayout
 
     /** {@inheritDoc} */
     @Override
-    public List getNextKnuthElements(LayoutContext context, int alignment, Stack lmStack,
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment, Stack lmStack,
         Position restartPosition, LayoutManager restartAtLM) {
 
         resetSpaces();
@@ -659,7 +659,7 @@ public class BlockContainerLayoutManager extends SpacedBorderedPaddedBlockLayout
             return lc;
         }
 
-        protected List getNextKnuthElements(LayoutContext context, int alignment) {
+        protected List<ListElement> getNextKnuthElements(LayoutContext context, int alignment) {
             LayoutManager curLM; // currently active LM
             List<ListElement> returnList = new LinkedList<ListElement>();
 

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
index 92fac64c45fb37afe65c9a0b1b0766d9822b3aad..afa90ef640a3da8f04224de85ea6db12b599ae3f 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
@@ -101,13 +101,13 @@ public class BlockLayoutManager extends SpacedBorderedPaddedBlockLayoutManager
 
     /** {@inheritDoc} */
     @Override
-    public List getNextKnuthElements(LayoutContext context, int alignment) {
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment) {
         return getNextKnuthElements(context, alignment, null, null, null);
     }
 
     /** {@inheritDoc} */
     @Override
-    public List getNextKnuthElements(LayoutContext context, int alignment, Stack lmStack,
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment, Stack lmStack,
             Position restartPosition, LayoutManager restartAtLM) {
         resetSpaces();
         return super.getNextKnuthElements(

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
index 1e55edd07677e659a9e90c032c75f3d6d3d2d58c..cecc3211e261ca68059547d46bda71fc0bb970d6 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
@@ -237,13 +237,13 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
 
     /** {@inheritDoc} */
     @Override
-    public List getNextKnuthElements(LayoutContext context, int alignment) {
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment) {
         return getNextKnuthElements(context, alignment, null, null, null);
     }
 
     /** {@inheritDoc} */
     @Override
-    public List getNextKnuthElements(LayoutContext context, int alignment,
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment,
             Stack lmStack, Position restartPosition, LayoutManager restartAtLM) {
         isRestartAtLM = restartAtLM != null;
         referenceIPD = context.getRefIPD();
@@ -669,12 +669,12 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
 
     /** {@inheritDoc} */
     @Override
-    public List getChangedKnuthElements(List oldList, int alignment) {
+    public List<ListElement> getChangedKnuthElements(List oldList, int alignment) {
         ListIterator<KnuthElement> oldListIterator = oldList.listIterator();
         KnuthElement currElement = null;
         KnuthElement prevElement = null;
         List<KnuthElement> returnedList = new LinkedList<KnuthElement>();
-        List<KnuthElement> returnList = new LinkedList<KnuthElement>();
+        List<ListElement> returnList = new LinkedList<>();
         int fromIndex = 0;
 
         // "unwrap" the Positions stored in the elements

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/FlowLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
index 9a625ad73f46ed80b1a2060ec88cc27e2b896bf3..1d5acdee1e31b6eec2b5492b217f813f7e6e996e 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
@@ -65,7 +65,7 @@ public class FlowLayoutManager extends BlockStackingLayoutManager {
 
     /** {@inheritDoc} */
     @Override
-    public List getNextKnuthElements(LayoutContext context, int alignment) {
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment) {
         return getNextKnuthElements(context, alignment, null, null);
     }
 
@@ -79,7 +79,7 @@ public class FlowLayoutManager extends BlockStackingLayoutManager {
      * @return the list of KnuthElements
      * @see LayoutManager#getNextKnuthElements(LayoutContext,int)
      */
-    List getNextKnuthElements(LayoutContext context, int alignment,
+    List<ListElement> getNextKnuthElements(LayoutContext context, int alignment,
             Position restartPosition, LayoutManager restartLM) {
 
         List<ListElement> elements = new LinkedList<ListElement>();
@@ -289,11 +289,11 @@ public class FlowLayoutManager extends BlockStackingLayoutManager {
 
     /** {@inheritDoc} */
     @Override
-    public List<KnuthElement> getChangedKnuthElements(List oldList, int alignment) {
+    public List<ListElement> getChangedKnuthElements(List oldList, int alignment) {
         ListIterator<KnuthElement> oldListIterator = oldList.listIterator();
         KnuthElement returnedElement;
         List<KnuthElement> returnedList = new LinkedList<KnuthElement>();
-        List<KnuthElement> returnList = new LinkedList<KnuthElement>();
+        List<ListElement> returnList = new LinkedList<>();
         KnuthElement prevElement = null;
         KnuthElement currElement = null;
         int fromIndex = 0;

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
index 1ba50e9923cbc33ae39b756daa632a93427c3a18..9bf6063f72010380ceba0b6c4ecd6e819df06570 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
@@ -36,6 +36,7 @@ import org.apache.fop.layoutmgr.KnuthPenalty;
 import org.apache.fop.layoutmgr.KnuthSequence;
 import org.apache.fop.layoutmgr.LayoutContext;
 import org.apache.fop.layoutmgr.LeafPosition;
+import org.apache.fop.layoutmgr.ListElement;
 import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.layoutmgr.TraitSetter;
 import org.apache.fop.traits.MinOptMax;
@@ -188,12 +189,12 @@ public class CharacterLayoutManager extends LeafNodeLayoutManager {
 
     /** {@inheritDoc} */
     @Override
-    public List getChangedKnuthElements(List oldList, int alignment) {
+    public List<ListElement> getChangedKnuthElements(List<ListElement> oldList, int alignment) {
         if (isFinished()) {
             return null;
         }
 
-        LinkedList<KnuthElement> returnList = new LinkedList<KnuthElement>();
+        LinkedList<ListElement> returnList = new LinkedList<>();
 
         addKnuthElementsForBorderPaddingStart(returnList);
 

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
index 0b419217c84f0a6c679295ea7909c0d59ee86a91..ba520c5bc088304613e3ff61df30b0aef3f8e729 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
@@ -252,7 +252,7 @@ public class ContentLayoutManager extends AbstractBaseLayoutManager
     }
 
     /** {@inheritDoc} */
-    public List getNextKnuthElements(LayoutContext context, int alignment) {
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment) {
         List contentList = new LinkedList();
         List returnedList;
 

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java
index 1fd29eb591f1c7e045945a9236c40f85f1ef0018..289cb9a49ab8826dec1f5b87c0ded6468c71837e 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java
@@ -75,7 +75,7 @@ public class FootnoteLayoutManager extends InlineStackingLayoutManager {
 
     /** {@inheritDoc} */
     @Override
-    public List getNextKnuthElements(LayoutContext context,
+    public List<KnuthSequence> getNextKnuthElements(LayoutContext context,
                                            int alignment) {
         // for the moment, this LM is set as the citationLM's parent
         // later on, when this LM will have nothing more to do, the citationLM's parent
@@ -125,7 +125,7 @@ public class FootnoteLayoutManager extends InlineStackingLayoutManager {
 
     /** {@inheritDoc} */
     @Override
-    public List getChangedKnuthElements(List oldList, int alignment, int depth) {
+    public List<ListElement> getChangedKnuthElements(List<ListElement> oldList, int alignment, int depth) {
         List returnedList = super.getChangedKnuthElements(oldList, alignment, depth);
         addAnchor(returnedList);
         return returnedList;

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
index 08a85a9315fae425b869291e17c0189697dc5f92..360c1816e8f9145a0720a35f71d2bce47ee5993c 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
@@ -51,6 +51,7 @@ import org.apache.fop.layoutmgr.KnuthBox;
 import org.apache.fop.layoutmgr.KnuthSequence;
 import org.apache.fop.layoutmgr.LayoutContext;
 import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.ListElement;
 import org.apache.fop.layoutmgr.NonLeafPosition;
 import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.layoutmgr.PositionIterator;
@@ -566,7 +567,7 @@ public class InlineLayoutManager extends InlineStackingLayoutManager {
 
     /** {@inheritDoc} */
     @Override
-    public List getChangedKnuthElements(List oldList, int alignment, int depth) {
+    public List<ListElement> getChangedKnuthElements(List<ListElement> oldList, int alignment, int depth) {
         List returnedList = new LinkedList();
         addKnuthElementsForBorderPaddingStart(returnedList);
         returnedList.addAll(super.getChangedKnuthElements(oldList, alignment, depth));

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
index 9ba707e3c806c2ba318c52583e3a5f0633bd2551..1b186109cc0ec1b872429f051d235bf973d3123f 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java
@@ -649,7 +649,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager
      * @return the list of KnuthElements
      * @see LayoutManager#getNextKnuthElements(LayoutContext,int)
      */
-    public List getNextKnuthElements(LayoutContext context, int alignment,
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment,
             LeafPosition restartPosition) {
         int parIndex = 0;
         int restartPositionIdx = 0;
@@ -1220,14 +1220,14 @@ public class LineLayoutManager extends InlineStackingLayoutManager
 
     /** {@inheritDoc} */
     @Override
-    public List getChangedKnuthElements(List oldList, int alignment, int depth) {
+    public List<ListElement> getChangedKnuthElements(List<ListElement> oldList, int alignment, int depth) {
         return getChangedKnuthElements(oldList, alignment);
     }
 
     /** {@inheritDoc} */
     @Override
-    public List getChangedKnuthElements(List oldList, int alignment) {
-        List<KnuthElement> returnList = new LinkedList<KnuthElement>();
+    public List<ListElement> getChangedKnuthElements(List<ListElement> oldList, int alignment) {
+        List<ListElement> returnList = new LinkedList<>();
         for (int p = 0; p < knuthParagraphs.size(); p++) {
             LineLayoutPossibilities llPoss = lineLayoutsList[p];
             //log.debug("demerits of the chosen layout: " + llPoss.getChosenDemerits());

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
index aab2dd56c344774aa3375b10c1ce0f9cf49bcd7e..e6b64cb2d2215433f2324cb73b00846135774bfa 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
@@ -760,7 +760,7 @@ public class TextLayoutManager extends LeafNodeLayoutManager {
     }
 
     /** {@inheritDoc} */
-    public List getNextKnuthElements(final LayoutContext context, final int alignment) {
+    public List<KnuthSequence> getNextKnuthElements(final LayoutContext context, final int alignment) {
 
         lineStartBAP = context.getLineStartBorderAndPaddingWidth();
         lineEndBAP = context.getLineEndBorderAndPaddingWidth();

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
index b73abeb0da15f3617be48d87d320b09824c4d185..10c444cce911e81cae82b65579c29b3217953419 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
@@ -34,6 +34,7 @@ import org.apache.fop.fo.properties.KeepProperty;
 import org.apache.fop.layoutmgr.ElementListUtils;
 import org.apache.fop.layoutmgr.LayoutContext;
 import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.ListElement;
 import org.apache.fop.layoutmgr.NonLeafPosition;
 import org.apache.fop.layoutmgr.Position;
 import org.apache.fop.layoutmgr.PositionIterator;
@@ -96,8 +97,8 @@ public class ListBlockLayoutManager extends SpacedBorderedPaddedBlockLayoutManag
     }
 
     /** {@inheritDoc} */
-    public List getNextKnuthElements(LayoutContext context, int alignment, Stack lmStack,
-            Position restartPosition, LayoutManager restartAtLM) {
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment, Stack lmStack,
+                                                  Position restartPosition, LayoutManager restartAtLM) {
         resetSpaces();
         List returnList;
         returnList = super.getNextKnuthElements(context, alignment, lmStack, restartPosition, restartAtLM);

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
index 0cc877e372d18d3c03c16f665e27d35f42698245..acb06bbf4da6c9737f96a9156e0f112c27cccbaf 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
@@ -228,7 +228,7 @@ public class ListItemContentLayoutManager extends BlockStackingLayoutManager imp
     }
 
     /** {@inheritDoc} */
-    public List getNextKnuthElements(LayoutContext context, int alignment, Stack lmStack,
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment, Stack lmStack,
             Position restartPosition, LayoutManager restartAtLM) {
         List<ListElement> elements = new LinkedList<ListElement>();
         do {

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index 807d79b0ea40e80068477c76031657c1dd400544..94764ed4a5c5469a5022e38e6adf824134a1851e 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -211,7 +211,7 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage
     }
 
     /** {@inheritDoc} */
-    public List getNextKnuthElements(LayoutContext context, int alignment, Stack lmStack,
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment, Stack lmStack,
             Position restartPosition, LayoutManager restartAtLM) {
         referenceIPD = context.getRefIPD();
         LayoutContext childLC;
@@ -614,7 +614,7 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage
 
     /** {@inheritDoc} */
     @Override
-    public List getChangedKnuthElements(List oldList, int alignment) {
+    public List<ListElement> getChangedKnuthElements(List oldList, int alignment) {
         // label
         labelList = label.getChangedKnuthElements(labelList, alignment);
 

diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
index e656b505c6a23ef08c3b5addec99cc3c0be2a5bc..03d27b1469a461c2893d6b8dab358152bc08ec0d 100644 (file)
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
@@ -145,7 +145,7 @@ public class TableContentLayoutManager implements PercentBaseContext {
      * @return          the list of KnuthElements
      * @see org.apache.fop.layoutmgr.LayoutManager#getNextKnuthElements(LayoutContext, int)
      */
-    public List getNextKnuthElements(LayoutContext context, int alignment) {
+    public List<ListElement> getNextKnuthElements(LayoutContext context, int alignment) {
         if (LOG.isDebugEnabled()) {
             LOG.debug("==> Columns: " + getTableLM().getColumns());
         }