diff options
18 files changed, 52 insertions, 51 deletions
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java index 3fc3951fc..e86d9cf50 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractBreaker.java @@ -41,7 +41,7 @@ public abstract class AbstractBreaker { protected LayoutManager originalRestartAtLM; protected Position positionAtBreak; - protected List firstElementsForRestart; + protected List<ListElement> firstElementsForRestart; protected PageSequenceLayoutManager pslm; /** 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 cecc3211e..9a6c7dc8f 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java @@ -991,7 +991,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager * @param isFirst true if this is the first time a layout manager instance needs to generate * border and padding */ - protected void addKnuthElementsForBorderPaddingBefore(List returnList, boolean isFirst) { + protected void addKnuthElementsForBorderPaddingBefore(List<ListElement> returnList, boolean isFirst) { //Border and Padding (before) CommonBorderPaddingBackground borderAndPadding = getBorderPaddingBackground(); if (borderAndPadding != null) { @@ -1018,7 +1018,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager * @param isLast true if this is the last time a layout manager instance needs to generate * border and padding */ - protected void addKnuthElementsForBorderPaddingAfter(List returnList, boolean isLast) { + protected void addKnuthElementsForBorderPaddingAfter(List<ListElement> returnList, boolean isLast) { //Border and Padding (after) CommonBorderPaddingBackground borderAndPadding = getBorderPaddingBackground(); if (borderAndPadding != null) { diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/ElementListUtils.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/ElementListUtils.java index 3920481e7..479d80b91 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/ElementListUtils.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/ElementListUtils.java @@ -42,7 +42,7 @@ public final class ElementListUtils { * @param constraint min/opt/max value to restrict the range in which the breaks are removed. * @return true if the opt constraint is bigger than the list contents */ - public static boolean removeLegalBreaks(List elements, MinOptMax constraint) { + public static boolean removeLegalBreaks(List<ListElement> elements, MinOptMax constraint) { return removeLegalBreaks(elements, constraint.getOpt()); } @@ -140,7 +140,7 @@ public final class ElementListUtils { * @param end element at which to stop * @return the content length */ - public static int calcContentLength(List elems, int start, int end) { + public static int calcContentLength(List<ListElement> elems, int start, int end) { ListIterator iter = elems.listIterator(start); int count = end - start + 1; int len = 0; @@ -177,7 +177,7 @@ public final class ElementListUtils { * @param elems the element list * @return true if the list ends with a forced break */ - public static boolean endsWithForcedBreak(List elems) { + public static boolean endsWithForcedBreak(List<ListElement> elems) { ListElement last = ListUtil.getLastListElement(elems); return last == null || last.isForcedBreak(); } @@ -187,8 +187,8 @@ public final class ElementListUtils { * @param elems the element list * @return true if the list starts with a forced break */ - public static boolean startsWithForcedBreak(List elems) { - return !elems.isEmpty() && ((ListElement) elems.get(0)).isForcedBreak(); + public static boolean startsWithForcedBreak(List<ListElement> elems) { + return !elems.isEmpty() && elems.get(0).isForcedBreak(); } /** @@ -197,8 +197,8 @@ public final class ElementListUtils { * @param elems the element list * @return true if the list ends with a non-infinite penalty */ - public static boolean endsWithNonInfinitePenalty(List elems) { - ListElement last = (ListElement) ListUtil.getLast(elems); + public static boolean endsWithNonInfinitePenalty(List<ListElement> elems) { + ListElement last = ListUtil.getLast(elems); if (last.isPenalty() && ((KnuthPenalty)last).getPenalty() < KnuthElement.INFINITE) { return true; } else if (last instanceof BreakElement @@ -215,7 +215,7 @@ public final class ElementListUtils { * @param startIndex the start index * @return the position of the previous break, or -1 if there was no previous break */ - public static int determinePreviousBreak(List elems, int startIndex) { + public static int determinePreviousBreak(List<ListElement> elems, int startIndex) { int prevBreak = startIndex - 1; while (prevBreak >= 0) { KnuthElement el = (KnuthElement)elems.get(prevBreak); diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java index 5e0bd37eb..23e567df7 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java @@ -114,7 +114,7 @@ public class InlineKnuthSequence<T extends ListElement> extends KnuthSequence { return; } removeLast(); - LinkedList oldList = new LinkedList(); + LinkedList<ListElement> oldList = new LinkedList<>(); // if there are two consecutive KnuthBoxes the // first one does not represent a whole word, // so it must be given one more letter space diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManager.java index 3adaceebc..065b89863 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManager.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManager.java @@ -114,7 +114,7 @@ public interface LayoutManager extends PercentBaseContext { /** * @return the list of child LMs */ - List getChildLMs(); + List<LayoutManager> getChildLMs(); /** * Add the LM in the argument to the list of child LMs; @@ -128,7 +128,7 @@ public interface LayoutManager extends PercentBaseContext { * Add the LMs in the argument to the list of child LMs; * @param newLMs the list of LMs to be added */ - void addChildLMs(List newLMs); + void addChildLMs(List<LayoutManager> newLMs); /** * Get a sequence of KnuthElements representing the content diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java index 3f246adfb..1f2d57bdb 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java @@ -161,7 +161,7 @@ public class PageBreaker extends AbstractBreaker { /** {@inheritDoc} */ protected int getNextBlockList(LayoutContext childLC, int nextSequenceStartsOn, - Position positionAtIPDChange, LayoutManager restartLM, List firstElements) { + Position positionAtIPDChange, LayoutManager restartLM, List<ListElement> firstElements) { if (!layoutRedone && !handlingFloat()) { if (!firstPart) { // if this is the first page that will be created by @@ -180,7 +180,7 @@ public class PageBreaker extends AbstractBreaker { restartLM, firstElements); } - private boolean containsFootnotes(List contentList, LayoutContext context) { + private boolean containsFootnotes(List<ListElement> contentList, LayoutContext context) { boolean containsFootnotes = false; if (contentList != null) { for (Object aContentList : contentList) { 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 ba520c5bc..881f596e9 100644 --- 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 @@ -219,7 +219,7 @@ public class ContentLayoutManager extends AbstractBaseLayoutManager /** * {@inheritDoc} */ - public List getChildLMs() { + public List<LayoutManager> getChildLMs() { List childLMs = new ArrayList(1); childLMs.add(childLM); return childLMs; @@ -241,7 +241,7 @@ public class ContentLayoutManager extends AbstractBaseLayoutManager /** * {@inheritDoc} */ - public void addChildLMs(List newLMs) { + public void addChildLMs(List<LayoutManager> newLMs) { if (newLMs == null || newLMs.size() == 0) { return; } diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java index e589ab0b9..4fb3ba18e 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineContainerLayoutManager.java @@ -296,11 +296,11 @@ public class InlineContainerLayoutManager extends AbstractLayoutManager implemen return true; } - public List addALetterSpaceTo(List oldList) { + public List<ListElement> addALetterSpaceTo(List<ListElement> oldList) { return oldList; } - public List addALetterSpaceTo(List oldList, int depth) { + public List<ListElement> addALetterSpaceTo(List<ListElement> oldList, int depth) { return oldList; } @@ -311,11 +311,11 @@ public class InlineContainerLayoutManager extends AbstractLayoutManager implemen public void hyphenate(Position pos, HyphContext hyphContext) { } - public boolean applyChanges(List oldList) { + public boolean applyChanges(List<ListElement> oldList) { return false; } - public boolean applyChanges(List oldList, int depth) { + public boolean applyChanges(List<ListElement> oldList, int depth) { return false; } 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 360c1816e..a718312f2 100644 --- 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 @@ -579,7 +579,7 @@ public class InlineLayoutManager extends InlineStackingLayoutManager { * Creates Knuth elements for start border padding and adds them to the return list. * @param returnList return list to add the additional elements to */ - protected void addKnuthElementsForBorderPaddingStart(List returnList) { + protected void addKnuthElementsForBorderPaddingStart(List<ListElement> returnList) { //Border and Padding (start) /* * If the returnlist is a BlockKnuthSequence, the border and padding should be added @@ -604,7 +604,7 @@ public class InlineLayoutManager extends InlineStackingLayoutManager { * Creates Knuth elements for end border padding and adds them to the return list. * @param returnList return list to add the additional elements to */ - protected void addKnuthElementsForBorderPaddingEnd(List returnList) { + protected void addKnuthElementsForBorderPaddingEnd(List<ListElement> returnList) { //Border and Padding (after) /* * If the returnlist is a BlockKnuthSequence, the border and padding should be added diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java index addad2b92..6e782c71e 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java @@ -38,7 +38,7 @@ public interface InlineLevelLayoutManager extends LayoutManager { * @param oldList the elements which must be given one more letter space * @return the new elements replacing the old ones */ - List addALetterSpaceTo(List oldList); + List<ListElement> addALetterSpaceTo(List<ListElement> oldList); /** * Tell the LM to modify its data, adding a letter space @@ -49,7 +49,7 @@ public interface InlineLevelLayoutManager extends LayoutManager { * @param depth the depth at which the Positions for this LM in oldList are found * @return the new elements replacing the old ones */ -List addALetterSpaceTo(List oldList, int depth); + List<ListElement> addALetterSpaceTo(List<ListElement> oldList, int depth); /** * Get the word chars corresponding to the given position. @@ -73,7 +73,7 @@ List addALetterSpaceTo(List oldList, int depth); * @param oldList the list of the old elements the changes refer to * @return true if the LM had to change its data, false otherwise */ - boolean applyChanges(List oldList); + boolean applyChanges(List<ListElement> oldList); /** * Tell the LM to apply the changes due to hyphenation @@ -82,7 +82,7 @@ List addALetterSpaceTo(List oldList, int depth); * @param depth the depth at which the Positions for this LM in oldList are found * @return true if the LM had to change its data, false otherwise */ - boolean applyChanges(List oldList, int depth); + boolean applyChanges(List<ListElement> oldList, int depth); /** * Get a sequence of KnuthElements representing the content diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java index d0ee9104b..df733d358 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java @@ -196,12 +196,12 @@ public abstract class InlineStackingLayoutManager extends AbstractLayoutManager } /** {@inheritDoc} */ - public List addALetterSpaceTo(List oldList) { + public List<ListElement> addALetterSpaceTo(List<ListElement> oldList) { return addALetterSpaceTo(oldList, 0); } /** {@inheritDoc} */ - public List addALetterSpaceTo(List oldList, int thisDepth) { + public List<ListElement> addALetterSpaceTo(List<ListElement> oldList, int thisDepth) { // old list contains only a box, or the sequence: box penalty glue box ListIterator oldListIterator = oldList.listIterator(oldList.size()); @@ -253,12 +253,12 @@ public abstract class InlineStackingLayoutManager extends AbstractLayoutManager } /** {@inheritDoc} */ - public boolean applyChanges(List oldList) { + public boolean applyChanges(List<ListElement> oldList) { return applyChanges(oldList, 0); } /** {@inheritDoc} */ - public boolean applyChanges(List oldList, int depth) { + public boolean applyChanges(List<ListElement> oldList, int depth) { ListIterator oldListIterator = oldList.listIterator(); KnuthElement oldElement; depth += 1; @@ -334,7 +334,7 @@ public abstract class InlineStackingLayoutManager extends AbstractLayoutManager KnuthElement returnedElement; LinkedList returnedList = new LinkedList(); - LinkedList returnList = new LinkedList(); + LinkedList<ListElement> returnList = new LinkedList<>(); InlineLevelLayoutManager prevLM = null; InlineLevelLayoutManager currLM; int fromIndex = 0; diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java index 0ccea3840..d9b163154 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java @@ -54,7 +54,7 @@ public class LeaderLayoutManager extends LeafNodeLayoutManager { private Leader fobj; private Font font; - private List contentList; + private List<ListElement> contentList; private ContentLayoutManager clm; private int contentAreaIPD; @@ -314,7 +314,7 @@ public class LeaderLayoutManager extends LeafNodeLayoutManager { } /** {@inheritDoc} */ - public boolean applyChanges(List oldList) { + public boolean applyChanges(List<ListElement> oldList) { setFinished(false); return false; } @@ -325,7 +325,7 @@ public class LeaderLayoutManager extends LeafNodeLayoutManager { return null; } - List returnList = new LinkedList(); + List<ListElement> returnList = new LinkedList<>(); addKnuthElementsForBorderPaddingStart(returnList); diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java index 04c6fd72c..f8ef59e4c 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java @@ -288,7 +288,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager } /** {@inheritDoc} */ - public List addALetterSpaceTo(List oldList) { + public List<ListElement> addALetterSpaceTo(List<ListElement> oldList) { // return the unchanged elements return oldList; } @@ -297,7 +297,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager * {@inheritDoc} * Only TextLM has a meaningful implementation of this method */ - public List addALetterSpaceTo(List oldList, int depth) { + public List<ListElement> addALetterSpaceTo(List<ListElement> oldList, int depth) { return addALetterSpaceTo(oldList); } @@ -311,7 +311,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager } /** {@inheritDoc} */ - public boolean applyChanges(List oldList) { + public boolean applyChanges(List<ListElement> oldList) { setFinished(false); return false; } @@ -320,7 +320,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager * {@inheritDoc} * Only TextLM has a meaningful implementation of this method */ - public boolean applyChanges(List oldList, int depth) { + public boolean applyChanges(List<ListElement> oldList, int depth) { return applyChanges(oldList); } @@ -358,7 +358,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager * Creates Knuth elements for start border padding and adds them to the return list. * @param returnList return list to add the additional elements to */ - protected void addKnuthElementsForBorderPaddingStart(List returnList) { + protected void addKnuthElementsForBorderPaddingStart(List<ListElement> returnList) { //Border and Padding (start) if (commonBorderPaddingBackground != null) { int ipStart = commonBorderPaddingBackground.getBorderStartWidth(false) @@ -376,7 +376,7 @@ public abstract class LeafNodeLayoutManager extends AbstractLayoutManager * Creates Knuth elements for end border padding and adds them to the return list. * @param returnList return list to add the additional elements to */ - protected void addKnuthElementsForBorderPaddingEnd(List returnList) { + protected void addKnuthElementsForBorderPaddingEnd(List<ListElement> returnList) { //Border and Padding (after) if (commonBorderPaddingBackground != null) { int ipEnd = commonBorderPaddingBackground.getBorderEndWidth(false) 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 e6b64cb2d..35a63a9e5 100644 --- 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 @@ -990,12 +990,12 @@ public class TextLayoutManager extends LeafNodeLayoutManager { } /** {@inheritDoc} */ - public List addALetterSpaceTo(List oldList) { + public List<ListElement> addALetterSpaceTo(List<ListElement> oldList) { return addALetterSpaceTo(oldList, 0); } /** {@inheritDoc} */ - public List addALetterSpaceTo(final List oldList, int depth) { + public List<ListElement> addALetterSpaceTo(final List<ListElement> oldList, int depth) { // old list contains only a box, or the sequence: box penalty glue box; // look at the Position stored in the first element in oldList // which is always a box @@ -1113,12 +1113,12 @@ public class TextLayoutManager extends LeafNodeLayoutManager { } /** {@inheritDoc} */ - public boolean applyChanges(final List oldList) { + public boolean applyChanges(final List<ListElement> oldList) { return applyChanges(oldList, 0); } /** {@inheritDoc} */ - public boolean applyChanges(final List oldList, int depth) { + public boolean applyChanges(final List<ListElement> oldList, int depth) { // make sure the LM appears unfinished in between this call // and the next call to getChangedKnuthElements() @@ -1195,7 +1195,7 @@ public class TextLayoutManager extends LeafNodeLayoutManager { return null; } - final LinkedList returnList = new LinkedList(); + final LinkedList<ListElement> returnList = new LinkedList<>(); for (; returnedIndices[0] <= returnedIndices[1]; returnedIndices[0]++) { GlyphMapping mapping = getGlyphMapping(returnedIndices[0]); 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 94764ed4a..91f7b3678 100644 --- 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 @@ -508,7 +508,7 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage return retval; } - private boolean shouldWeAvoidBreak(List returnList, LayoutManager lm) { + private boolean shouldWeAvoidBreak(List<ListElement> returnList, LayoutManager lm) { if (isChangingIPD(lm)) { if (lm instanceof BlockLayoutManager) { return true; diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java index b62e066d8..14485361d 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java @@ -177,7 +177,7 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager { cellIPD -= getIPIndents(); List returnedList; - List contentList = new LinkedList(); + List<ListElement> contentList = new LinkedList<>(); List<ListElement> returnList = new LinkedList<>(); LayoutManager curLM; // currently active LM 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 03d27b146..3f96eba5f 100644 --- 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 @@ -256,7 +256,7 @@ public class TableContentLayoutManager implements PercentBaseContext { */ private LinkedList getKnuthElementsForRowIterator(TableRowIterator iter, LayoutContext context, int alignment, int bodyType) { - LinkedList returnList = new LinkedList(); + LinkedList<ListElement> returnList = new LinkedList<>(); EffRow[] rowGroup = iter.getNextRowGroup(); // TODO homogenize the handling of keeps and breaks context.clearKeepsPending(); diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java index 3261a0afb..ed9a29ad6 100644 --- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java +++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java @@ -39,6 +39,7 @@ import org.apache.fop.layoutmgr.KnuthGlue; import org.apache.fop.layoutmgr.KnuthPenalty; import org.apache.fop.layoutmgr.LayoutContext; import org.apache.fop.layoutmgr.LayoutManager; +import org.apache.fop.layoutmgr.ListElement; import org.apache.fop.layoutmgr.Position; import org.apache.fop.util.BreakUtil; @@ -182,7 +183,7 @@ public class TableStepper { int cumulateLength = 0; // Length of the content accumulated before the break TableContentPosition lastTCPos = null; - LinkedList returnList = new LinkedList(); + LinkedList<ListElement> returnList = new LinkedList<>(); int laststep = 0; int step = getFirstStep(); do { |