aboutsummaryrefslogtreecommitdiffstats
path: root/fop-core
diff options
context:
space:
mode:
Diffstat (limited to 'fop-core')
-rw-r--r--fop-core/src/main/java/org/apache/fop/fo/flow/table/Table.java4
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java8
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java6
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/BreakElement.java8
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/ElementListObserver.java4
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthBlockBox.java6
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutContext.java16
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java4
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/LocalBreaker.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java8
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java4
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/RestartAtLM.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/SpaceResolver.java10
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/SpaceSpecifier.java8
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java10
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java6
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java3
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/ActiveCell.java10
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/ColumnSetup.java18
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java4
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java8
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java2
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java6
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java12
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentPosition.java8
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableHFPenaltyPosition.java5
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableHeaderFooterPosition.java5
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java4
-rw-r--r--fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableStepper.java4
37 files changed, 106 insertions, 105 deletions
diff --git a/fop-core/src/main/java/org/apache/fop/fo/flow/table/Table.java b/fop-core/src/main/java/org/apache/fop/fo/flow/table/Table.java
index 212608664..5fa17cf17 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/flow/table/Table.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/flow/table/Table.java
@@ -83,7 +83,7 @@ public class Table extends TableFObj implements ColumnNumberManagerHolder, Break
private Length orphanContentLimit;
/** collection of columns in this table */
- private List columns = new ArrayList();
+ private List<FONode> columns = new ArrayList<FONode>();
private ColumnNumberManager columnNumberManager = new ColumnNumberManager();
@@ -405,7 +405,7 @@ public class Table extends TableFObj implements ColumnNumberManagerHolder, Break
*
* @return a list of {@link TableColumn} elements, may contain null elements
*/
- public List getColumns() {
+ public List<FONode> getColumns() {
return columns;
}
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index f7f269df1..ff693ed67 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -509,7 +509,7 @@ public abstract class AbstractLayoutManager extends AbstractBaseLayoutManager im
}
public void recreateChildrenLMs() {
- childLMs = new ArrayList();
+ childLMs = new ArrayList<>();
isFinished = false;
if (fobj == null) {
return;
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java
index 64f87757a..dd30b8abf 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/AbstractPageSequenceLayoutManager.java
@@ -122,9 +122,9 @@ public abstract class AbstractPageSequenceLayoutManager extends AbstractLayoutMa
* @return the first PageViewport that contains the ID trait
*/
public PageViewport getFirstPVWithID(String idref) {
- List list = idTracker.getPageViewportsContainingID(idref);
+ List<PageViewport> list = idTracker.getPageViewportsContainingID(idref);
if (list != null && list.size() > 0) {
- return (PageViewport) list.get(0);
+ return list.get(0);
}
return null;
}
@@ -137,9 +137,9 @@ public abstract class AbstractPageSequenceLayoutManager extends AbstractLayoutMa
* @return the last PageViewport that contains the ID trait
*/
public PageViewport getLastPVWithID(String idref) {
- List list = idTracker.getPageViewportsContainingID(idref);
+ List<PageViewport> list = idTracker.getPageViewportsContainingID(idref);
if (list != null && list.size() > 0) {
- return (PageViewport) list.get(list.size() - 1);
+ return list.get(list.size() - 1);
}
return null;
}
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 ad49720e8..7f5403378 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -666,7 +666,7 @@ public class BlockContainerLayoutManager extends SpacedBorderedPaddedBlockLayout
while ((curLM = getChildLM()) != null) {
LayoutContext childLC = makeChildLayoutContext(context);
- List returnedList = null;
+ List<ListElement> returnedList = null;
if (!curLM.isFinished()) {
returnedList = curLM.getNextKnuthElements(childLC, alignment);
}
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 9a6c7dc8f..c7ca3a6c4 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
@@ -1164,7 +1164,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
* @param sourceList source list
* @param targetList target list receiving the wrapped position elements
*/
- protected void wrapPositionElements(List sourceList, List targetList) {
+ protected void wrapPositionElements(List sourceList, List<ListElement> targetList) {
wrapPositionElements(sourceList, targetList, false);
}
@@ -1175,7 +1175,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
* @param targetList target list receiving the wrapped position elements
* @param force if true, every Position is wrapped regardless of its LM of origin
*/
- protected void wrapPositionElements(List sourceList, List targetList, boolean force) {
+ protected void wrapPositionElements(List sourceList, List<ListElement> targetList, boolean force) {
ListIterator listIter = sourceList.listIterator();
Object tempElement;
@@ -1201,7 +1201,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
* @param targetList target list receiving the wrapped position elements
* @param force if true, every Position is wrapped regardless of its LM of origin
*/
- protected void wrapPositionElement(ListElement el, List targetList, boolean force) {
+ protected void wrapPositionElement(ListElement el, List<ListElement> targetList, boolean force) {
if (force || el.getLayoutManager() != this) {
el.setPosition(notifyPos(new NonLeafPosition(this, el.getPosition())));
}
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/BreakElement.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/BreakElement.java
index f3f173d8c..e71c5d22f 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/BreakElement.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/BreakElement.java
@@ -31,8 +31,8 @@ public class BreakElement extends UnresolvedListElement {
private int penaltyWidth;
private int penaltyValue;
private int breakClass;
- private List pendingBeforeMarks;
- private List pendingAfterMarks;
+ private List<ListElement> pendingBeforeMarks;
+ private List<ListElement> pendingAfterMarks;
/**
* Main constructor
@@ -165,12 +165,12 @@ public class BreakElement extends UnresolvedListElement {
}
/** @return the pending border and padding elements at the before edge */
- public List getPendingBeforeMarks() {
+ public List<ListElement> getPendingBeforeMarks() {
return this.pendingBeforeMarks;
}
/** @return the pending border and padding elements at the after edge */
- public List getPendingAfterMarks() {
+ public List<ListElement> getPendingAfterMarks() {
return this.pendingAfterMarks;
}
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/ElementListObserver.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/ElementListObserver.java
index 8108cda7e..c06d6bf41 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/ElementListObserver.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/ElementListObserver.java
@@ -31,7 +31,7 @@ public final class ElementListObserver {
private ElementListObserver() {
}
- private static List activeObservers;
+ private static List<Observer> activeObservers;
/**
* Adds a new Observer to the list.
@@ -39,7 +39,7 @@ public final class ElementListObserver {
*/
public static void addObserver(Observer observer) {
if (!isObservationActive()) {
- activeObservers = new java.util.ArrayList();
+ activeObservers = new java.util.ArrayList<>();
}
activeObservers.add(observer);
}
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthBlockBox.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthBlockBox.java
index 92ae1aacf..6d92c9abc 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthBlockBox.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/KnuthBlockBox.java
@@ -38,7 +38,7 @@ public class KnuthBlockBox extends KnuthBox {
private List<FootnoteBodyLayoutManager> footnoteList;
private List<FloatContentLayoutManager> floatContentLMs;
/** List of Knuth elements. This is a list of LinkedList elements. */
- private List elementLists;
+ private List<List<KnuthElement>> elementLists;
/**
* Creates a new box.
@@ -104,7 +104,7 @@ public class KnuthBlockBox extends KnuthBox {
*/
public void addElementList(List list) {
if (elementLists == null) {
- elementLists = new LinkedList();
+ elementLists = new LinkedList<>();
}
elementLists.add(list);
}
@@ -114,7 +114,7 @@ public class KnuthBlockBox extends KnuthBox {
*
* @return a list of KnuthElement sequences corresponding to footnotes cited in this box
*/
- public List getElementLists() {
+ public List<List<KnuthElement>> getElementLists() {
return elementLists;
}
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutContext.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutContext.java
index bb240e637..c2082108d 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutContext.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutContext.java
@@ -85,13 +85,13 @@ public final class LayoutContext {
* A list of pending marks (border and padding) on the after edge when a page break occurs.
* May be null.
*/
- private List pendingAfterMarks;
+ private List<ListElement> pendingAfterMarks;
/**
* A list of pending marks (border and padding) on the before edge when a page break occurs.
* May be null.
*/
- private List pendingBeforeMarks;
+ private List<ListElement> pendingBeforeMarks;
/** Current hyphenation context. May be null. */
private HyphContext hyphContext;
@@ -177,10 +177,10 @@ public final class LayoutContext {
/** @param source from which pending marks are copied */
public void copyPendingMarksFrom(LayoutContext source) {
if (source.pendingAfterMarks != null) {
- this.pendingAfterMarks = new java.util.ArrayList(source.pendingAfterMarks);
+ this.pendingAfterMarks = new java.util.ArrayList<>(source.pendingAfterMarks);
}
if (source.pendingBeforeMarks != null) {
- this.pendingBeforeMarks = new java.util.ArrayList(source.pendingBeforeMarks);
+ this.pendingBeforeMarks = new java.util.ArrayList<>(source.pendingBeforeMarks);
}
}
@@ -334,7 +334,7 @@ public final class LayoutContext {
*/
public void addPendingAfterMark(UnresolvedListElementWithLength element) {
if (this.pendingAfterMarks == null) {
- this.pendingAfterMarks = new java.util.ArrayList();
+ this.pendingAfterMarks = new java.util.ArrayList<>();
}
this.pendingAfterMarks.add(element);
}
@@ -343,7 +343,7 @@ public final class LayoutContext {
* @return the pending border and padding elements at the after edge
* @see #addPendingAfterMark(UnresolvedListElementWithLength)
*/
- public List getPendingAfterMarks() {
+ public List<ListElement> getPendingAfterMarks() {
if (this.pendingAfterMarks != null) {
return Collections.unmodifiableList(this.pendingAfterMarks);
} else {
@@ -367,7 +367,7 @@ public final class LayoutContext {
*/
public void addPendingBeforeMark(UnresolvedListElementWithLength element) {
if (this.pendingBeforeMarks == null) {
- this.pendingBeforeMarks = new java.util.ArrayList();
+ this.pendingBeforeMarks = new java.util.ArrayList<>();
}
this.pendingBeforeMarks.add(element);
}
@@ -376,7 +376,7 @@ public final class LayoutContext {
* @return the pending border and padding elements at the before edge
* @see #addPendingBeforeMark(UnresolvedListElementWithLength)
*/
- public List getPendingBeforeMarks() {
+ public List<ListElement> getPendingBeforeMarks() {
if (this.pendingBeforeMarks != null) {
return Collections.unmodifiableList(this.pendingBeforeMarks);
} else {
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java
index 789d66eb2..d1055a036 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java
@@ -42,7 +42,7 @@ public interface LayoutManagerMaker {
* @param node the FO node for which the LayoutManagers are made
* @param lms the list to which the LayoutManagers are added
*/
- void makeLayoutManagers(FONode node, List lms);
+ void makeLayoutManagers(FONode node, List<LayoutManager> lms);
/**
* Make a specific LayoutManager for the node.
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
index 4ab176b9e..8be8b5803 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
@@ -186,7 +186,7 @@ public class LayoutManagerMapping implements LayoutManagerMaker {
/** {@inheritDoc} */
public LayoutManager makeLayoutManager(FONode node) {
- List lms = new ArrayList();
+ List<LayoutManager> lms = new ArrayList<>();
makeLayoutManagers(node, lms);
if (lms.size() == 0) {
throw new IllegalStateException("LayoutManager for class "
@@ -197,7 +197,7 @@ public class LayoutManagerMapping implements LayoutManagerMaker {
+ node.getClass()
+ " found, only one may be declared.");
}
- return (LayoutManager) lms.get(0);
+ return lms.get(0);
}
/** {@inheritDoc} */
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/LocalBreaker.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/LocalBreaker.java
index 41a7b3813..5d632c658 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/LocalBreaker.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/LocalBreaker.java
@@ -100,7 +100,7 @@ public abstract class LocalBreaker extends AbstractBreaker {
childLC.setRefIPD(context.getRefIPD());
childLC.setWritingMode(context.getWritingMode());
- List returnedList = null;
+ List<ListElement> returnedList = null;
// The following is a HACK! Ignore leading and trailing white space
boolean ignore = curLM instanceof TextLayoutManager;
if (!curLM.isFinished()) {
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 1f2d57bdb..1e9a1e87b 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
@@ -56,8 +56,8 @@ public class PageBreaker extends AbstractBreaker {
private int floatHeight;
private int floatYOffset;
- private List relayedFootnotesList;
- private List relayedLengthList;
+ private List<ListElement> relayedFootnotesList;
+ private List<Integer> relayedLengthList;
private int relayedTotalFootnotesLength;
private int relayedInsertedFootnotesLength;
private boolean relayedFootnotesPending;
@@ -926,8 +926,8 @@ public class PageBreaker extends AbstractBreaker {
pageBreakHandled = true;
}
- public void holdFootnotes(List fl, List ll, int tfl, int ifl, boolean fp, boolean nf, int fnfi, int fli,
- int fei, MinOptMax fsl, int pfli, int pfei) {
+ public void holdFootnotes(List fl, List<Integer> ll, int tfl, int ifl, boolean fp, boolean nf, int fnfi, int fli,
+ int fei, MinOptMax fsl, int pfli, int pfei) {
relayedFootnotesList = fl;
relayedLengthList = ll;
relayedTotalFootnotesLength = tfl;
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
index b72124c77..93eeaf0e8 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java
@@ -1344,7 +1344,7 @@ class PageBreakingAlgorithm extends BreakingAlgorithm {
handlingStartOfFloat = false;
}
- public void loadFootnotes(List fl, List ll, int tfl, int ifl, boolean fp, boolean nf, int fnfi, int fli,
+ public void loadFootnotes(List fl, List<Integer> ll, int tfl, int ifl, boolean fp, boolean nf, int fnfi, int fli,
int fei, MinOptMax fsl, int pfli, int pfei) {
footnotesList = fl;
lengthList = ll;
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 1f0b50162..32c7661bd 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -395,8 +395,8 @@ public class PageSequenceLayoutManager extends AbstractPageSequenceLayoutManager
return flowIPD;
}
- public void holdFootnotes(List fl, List ll, int tfl, int ifl, boolean fp, boolean nf, int fnfi, int fli,
- int fei, MinOptMax fsl, int pfli, int pfei) {
+ public void holdFootnotes(List fl, List<Integer> ll, int tfl, int ifl, boolean fp, boolean nf, int fnfi, int fli,
+ int fei, MinOptMax fsl, int pfli, int pfei) {
if (fl != null && fl.size() > 0) {
pageBreaker.holdFootnotes(fl, ll, tfl, ifl, fp, nf, fnfi, fli, fei, fsl, pfli, pfei);
}
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/RestartAtLM.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/RestartAtLM.java
index 6dd80075d..08189cba9 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/RestartAtLM.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/RestartAtLM.java
@@ -50,7 +50,7 @@ class RestartAtLM {
.get(eventBroadcaster);
eventProducer.nonRestartableContentFlowingToNarrowerPage(this);
}
- breaker.firstElementsForRestart = new LinkedList();
+ breaker.firstElementsForRestart = new LinkedList<>();
boolean boxFound = false;
Iterator iter = blockList.listIterator(positionIndex + 1);
Position position = null;
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/SpaceResolver.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/SpaceResolver.java
index 868b467f7..3666f286a 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/SpaceResolver.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/SpaceResolver.java
@@ -57,7 +57,7 @@ public final class SpaceResolver {
* @param isFirst Resolution at the beginning of a (full) element list
* @param isLast Resolution at the end of a (full) element list
*/
- private SpaceResolver(List first, BreakElement breakPoss, List second,
+ private SpaceResolver(List first, BreakElement breakPoss, List<ListElement> second,
boolean isFirst, boolean isLast) {
this.isFirst = isFirst;
this.isLast = isLast;
@@ -603,9 +603,9 @@ public final class SpaceResolver {
boolean first = true;
boolean last = false;
boolean skipNextElement = false;
- List unresolvedFirst = new java.util.ArrayList();
- List unresolvedSecond = new java.util.ArrayList();
- List currentGroup;
+ List<ListElement> unresolvedFirst = new java.util.ArrayList<>();
+ List<ListElement> unresolvedSecond = new java.util.ArrayList<>();
+ List<ListElement> currentGroup;
ListIterator iter = elems.listIterator();
while (iter.hasNext()) {
ListElement el = (ListElement)iter.next();
@@ -651,7 +651,7 @@ public final class SpaceResolver {
LOG.trace("Swap first and second parts in no-break condition,"
+ " second part is empty.");
//The first list is reversed, so swap if this shouldn't happen
- List swapList = unresolvedSecond;
+ List<ListElement> swapList = unresolvedSecond;
unresolvedSecond = unresolvedFirst;
unresolvedFirst = swapList;
}
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/SpaceSpecifier.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/SpaceSpecifier.java
index dd525e16f..2c08f352b 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/SpaceSpecifier.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/SpaceSpecifier.java
@@ -34,7 +34,7 @@ public class SpaceSpecifier implements Cloneable {
private boolean startsReferenceArea;
private boolean hasForcing;
- private List spaceVals = new ArrayList();
+ private List<SpaceVal> spaceVals = new ArrayList<SpaceVal>();
/**
* Creates a new SpaceSpecifier.
@@ -53,7 +53,7 @@ public class SpaceSpecifier implements Cloneable {
ss.startsReferenceArea = startsReferenceArea;
ss.hasForcing = hasForcing;
// Clone the vector, but share the objects in it!
- ss.spaceVals = new ArrayList();
+ ss.spaceVals = new ArrayList<SpaceVal>();
ss.spaceVals.addAll(spaceVals);
return ss;
} catch (CloneNotSupportedException cnse) {
@@ -118,7 +118,7 @@ public class SpaceSpecifier implements Cloneable {
// Start from the end and count conditional specifiers
// Stop at first non-conditional
for (; lastIndex > 0; --lastIndex) {
- SpaceVal spaceVal = (SpaceVal) spaceVals.get(lastIndex - 1);
+ SpaceVal spaceVal = spaceVals.get(lastIndex - 1);
if (!spaceVal.isConditional()) {
break;
}
@@ -127,7 +127,7 @@ public class SpaceSpecifier implements Cloneable {
MinOptMax resolvedSpace = MinOptMax.ZERO;
int maxPrecedence = -1;
for (int index = 0; index < lastIndex; index++) {
- SpaceVal spaceVal = (SpaceVal) spaceVals.get(index);
+ SpaceVal spaceVal = spaceVals.get(index);
MinOptMax space = spaceVal.getSpace();
if (hasForcing) {
resolvedSpace = resolvedSpace.plus(space);
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 881f596e9..5366592c3 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
@@ -220,7 +220,7 @@ public class ContentLayoutManager extends AbstractBaseLayoutManager
* {@inheritDoc}
*/
public List<LayoutManager> getChildLMs() {
- List childLMs = new ArrayList(1);
+ List<LayoutManager> childLMs = new ArrayList<>(1);
childLMs.add(childLM);
return childLMs;
}
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 df733d358..d13edf1ce 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
@@ -333,7 +333,7 @@ public abstract class InlineStackingLayoutManager extends AbstractLayoutManager
depth += 1;
KnuthElement returnedElement;
- LinkedList returnedList = new LinkedList();
+ LinkedList returnedList = new LinkedList<>();
LinkedList<ListElement> returnList = new LinkedList<>();
InlineLevelLayoutManager prevLM = null;
InlineLevelLayoutManager currLM;
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 1b186109c..ddffde3e1 100644
--- 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
@@ -706,7 +706,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager
InlineLevelLayoutManager curLM;
while ((curLM = (InlineLevelLayoutManager) getChildLM()) != null) {
- List inlineElements = curLM.getNextKnuthElements(inlineLC, effectiveAlignment);
+ List<KnuthSequence> inlineElements = curLM.getNextKnuthElements(inlineLC, effectiveAlignment);
if (inlineElements == null || inlineElements.size() == 0) {
/* curLM.getNextKnuthElements() returned null or an empty list;
* this can happen if there is nothing more to layout,
@@ -715,7 +715,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager
}
if (lastPar != null) {
- KnuthSequence firstSeq = (KnuthSequence) inlineElements.get(0);
+ KnuthSequence firstSeq = inlineElements.get(0);
// finish last paragraph before a new block sequence
if (!firstSeq.isInlineSequence()) {
@@ -1281,7 +1281,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager
// hyphenate every word
ListIterator currParIterator = currPar.listIterator(currPar.ignoreAtStart);
// list of TLM involved in hyphenation
- List updateList = new LinkedList();
+ List<Update> updateList = new LinkedList<>();
KnuthElement firstElement;
KnuthElement nextElement;
// current InlineLevelLayoutManager
@@ -1366,7 +1366,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager
processUpdates(currPar, updateList);
}
- private void processUpdates(Paragraph par, List<ListElement> updateList) {
+ private void processUpdates(Paragraph par, List<Update> updateList) {
// create iterator for the updateList
ListIterator updateListIterator = updateList.listIterator();
Update currUpdate;
@@ -1625,7 +1625,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager
* The positionList must contain one area-generating position,
* which creates one line area.
*/
- List positionList = new ArrayList(1);
+ List<Position> positionList = new ArrayList<>(1);
Position innerPosition = pos.getPosition();
positionList.add(innerPosition);
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java
index 54ca3e54f..75aa3467a 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java
@@ -73,8 +73,8 @@ public class LineLayoutPossibilities {
/** default constructor */
public LineLayoutPossibilities() {
- possibilitiesList = new java.util.ArrayList();
- savedPossibilities = new java.util.ArrayList();
+ possibilitiesList = new java.util.ArrayList<>();
+ savedPossibilities = new java.util.ArrayList<>();
optimumIndex = -1;
}
@@ -117,7 +117,7 @@ public class LineLayoutPossibilities {
savedOptLineCount = 0;
}
savedPossibilities = possibilitiesList;
- possibilitiesList = new java.util.ArrayList();
+ possibilitiesList = new java.util.ArrayList<>();
}
/**
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 35a63a9e5..a96e5706e 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
@@ -116,7 +116,7 @@ public class TextLayoutManager extends LeafNodeLayoutManager {
private int changeOffset;
private int thisStart;
private int tempStart;
- private List changeList = new LinkedList();
+ private List<PendingChange> changeList = new LinkedList<>();
private AlignmentContext alignmentContext;
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 91f7b3678..3857ef070 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
@@ -44,6 +44,7 @@ import org.apache.fop.layoutmgr.ElementListObserver;
import org.apache.fop.layoutmgr.ElementListUtils;
import org.apache.fop.layoutmgr.FloatContentLayoutManager;
import org.apache.fop.layoutmgr.FootenoteUtil;
+import org.apache.fop.layoutmgr.FootnoteBodyLayoutManager;
import org.apache.fop.layoutmgr.Keep;
import org.apache.fop.layoutmgr.KnuthBlockBox;
import org.apache.fop.layoutmgr.KnuthElement;
@@ -422,7 +423,7 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage
// collect footnote information
// TODO this should really not be done like this. ListItemLM should remain as
// footnote-agnostic as possible
- LinkedList<LayoutManager> footnoteList = new LinkedList<LayoutManager>();
+ LinkedList<FootnoteBodyLayoutManager> footnoteList = new LinkedList<>();
for (int i = 0; i < elementLists.length; i++) {
footnoteList.addAll(FootenoteUtil.getFootnotes(elementLists[i], start[i], end[i]));
}
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/ActiveCell.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/ActiveCell.java
index 668bd9c19..ca869c733 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/ActiveCell.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/ActiveCell.java
@@ -33,11 +33,13 @@ import org.apache.fop.fo.flow.table.EffRow;
import org.apache.fop.fo.flow.table.PrimaryGridUnit;
import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
import org.apache.fop.layoutmgr.ElementListUtils;
+import org.apache.fop.layoutmgr.FootnoteBodyLayoutManager;
import org.apache.fop.layoutmgr.Keep;
import org.apache.fop.layoutmgr.KnuthBlockBox;
import org.apache.fop.layoutmgr.KnuthBox;
import org.apache.fop.layoutmgr.KnuthElement;
import org.apache.fop.layoutmgr.KnuthPenalty;
+import org.apache.fop.layoutmgr.ListElement;
import org.apache.fop.traits.MinOptMax;
/**
@@ -49,7 +51,7 @@ class ActiveCell {
private PrimaryGridUnit pgu;
/** Knuth elements for this active cell. */
- private List elementList;
+ private List<ListElement> elementList;
/** Iterator over the Knuth element list. */
private ListIterator knuthIter;
/** Number of the row where the row-span ends, zero-based. */
@@ -104,7 +106,7 @@ class ActiveCell {
/** Value of the penalty ending this step, 0 if the step does not end on a penalty. */
private int penaltyValue;
/** List of footnotes for this step. */
- private List footnoteList;
+ private List<FootnoteBodyLayoutManager> footnoteList;
/**
* One of {@link Constants#EN_AUTO}, {@link Constants#EN_COLUMN},
* {@link Constants#EN_PAGE}, {@link Constants#EN_EVEN_PAGE},
@@ -136,7 +138,7 @@ class ActiveCell {
this.penaltyValue = other.penaltyValue;
if (other.footnoteList != null) {
if (this.footnoteList == null) {
- this.footnoteList = new ArrayList();
+ this.footnoteList = new ArrayList<>();
}
this.footnoteList.addAll(other.footnoteList);
}
@@ -338,7 +340,7 @@ class ActiveCell {
} else {
if (el instanceof KnuthBlockBox && ((KnuthBlockBox) el).hasAnchors()) {
if (afterNextStep.footnoteList == null) {
- afterNextStep.footnoteList = new LinkedList();
+ afterNextStep.footnoteList = new LinkedList<>();
}
afterNextStep.footnoteList.addAll(((KnuthBlockBox) el).getFootnoteBodyLMs());
}
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/ColumnSetup.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
index 1835d0547..f219dc9aa 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
@@ -46,8 +46,8 @@ public class ColumnSetup {
private Table table;
private WritingModeTraitsGetter wmTraits;
- private List columns = new java.util.ArrayList();
- private List colWidths = new java.util.ArrayList();
+ private List<TableColumn> columns = new java.util.ArrayList<TableColumn>();
+ private List<Length> colWidths = new java.util.ArrayList<Length>();
private int maxColIndexReferenced;
@@ -64,7 +64,7 @@ public class ColumnSetup {
}
private void prepareColumns() {
- List rawCols = table.getColumns();
+ List<FONode> rawCols = table.getColumns();
if (rawCols != null) {
int colnum = 1;
for (Object rawCol : rawCols) {
@@ -122,9 +122,9 @@ public class ColumnSetup {
}
}
}
- return (TableColumn) columns.get(size - 1);
+ return columns.get(size - 1);
} else {
- return (TableColumn) columns.get(index - 1);
+ return columns.get(index - 1);
}
}
@@ -171,7 +171,7 @@ public class ColumnSetup {
for (int i = columns.size(); --i >= 0;) {
if (columns.get(i) != null) {
- col = (TableColumn) columns.get(i);
+ col = columns.get(i);
colWidth = col.getColumnWidth();
colWidths.add(0, colWidth);
}
@@ -265,7 +265,7 @@ public class ColumnSetup {
for (int i = (col + nrColSpan - 1), nc = colWidths.size(); ++i < nc;) {
int effCol = i;
if (colWidths.get(effCol) != null) {
- xoffset += ((Length) colWidths.get(effCol)).getValue(context);
+ xoffset += colWidths.get(effCol).getValue(context);
}
}
return xoffset;
@@ -286,7 +286,7 @@ public class ColumnSetup {
effCol = colWidths.size() - 1;
}
if (colWidths.get(effCol) != null) {
- xoffset += ((Length) colWidths.get(effCol)).getValue(context);
+ xoffset += colWidths.get(effCol).getValue(context);
}
}
return xoffset;
@@ -305,7 +305,7 @@ public class ColumnSetup {
effIndex = colWidths.size() - 1;
}
if (colWidths.get(effIndex) != null) {
- sum += ((Length) colWidths.get(effIndex)).getValue(context);
+ sum += colWidths.get(effIndex).getValue(context);
}
}
return sum;
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
index 6fce25c66..8b74f635d 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
@@ -118,7 +118,7 @@ class RowGroupLayoutManager {
childLC.setRefIPD(spanWidth);
//Get the element list for the cell contents
- List elems = primary.getCellLM().getNextKnuthElements(
+ List<ListElement> elems = primary.getCellLM().getNextKnuthElements(
childLC, alignment);
ElementListObserver.observe(elems, "table-cell", primary.getCell().getId());
primary.setElements(elems);
@@ -126,7 +126,7 @@ class RowGroupLayoutManager {
}
}
computeRowHeights();
- List elements = tableStepper.getCombinedKnuthElementsForRowGroup(context,
+ List<ListElement> elements = tableStepper.getCombinedKnuthElementsForRowGroup(context,
rowGroup, bodyType);
returnList.addAll(elements);
}
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java
index dbb1107ef..6de85c3a6 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/RowPainter.java
@@ -70,7 +70,7 @@ class RowPainter {
* This is particularly needed for spanned cells where you need to know the y-offset
* of the starting row when the area is generated at the time the cell is closed.
*/
- private List rowOffsets = new ArrayList();
+ private List<Integer> rowOffsets = new ArrayList<>();
private int[] cellHeights;
private boolean[] firstCellOnPage;
@@ -82,7 +82,7 @@ class RowPainter {
/** See {@link RowPainter#registerPartBackgroundArea(Block)}. */
private CommonBorderPaddingBackground tablePartBackground;
/** See {@link RowPainter#registerPartBackgroundArea(Block)}. */
- private List tablePartBackgroundAreas;
+ private List<Block> tablePartBackgroundAreas;
private TableContentLayoutManager tclm;
@@ -103,7 +103,7 @@ class RowPainter {
if (background.hasBackground()) {
tablePartBackground = background;
if (tablePartBackgroundAreas == null) {
- tablePartBackgroundAreas = new ArrayList();
+ tablePartBackgroundAreas = new ArrayList<Block>();
}
}
tablePartOffset = currentRowOffset;
@@ -538,7 +538,7 @@ class RowPainter {
* @return its y-offset on the page
*/
private int getRowOffset(int rowIndex) {
- return (Integer) rowOffsets.get(rowIndex - firstRowIndex);
+ return rowOffsets.get(rowIndex - firstRowIndex);
}
// TODO get rid of that
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
index d95e508c5..1d8cb890c 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
@@ -39,8 +39,6 @@ public class TableAndCaptionLayoutManager extends BlockStackingLayoutManager {
private Block curBlockArea;
- //private List childBreaks = new java.util.ArrayList();
-
/**
* Create a new table and caption layout manager.
* @param node table-and-caption FO
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java
index ee4cba2e4..a89519425 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java
@@ -37,8 +37,6 @@ public class TableCaptionLayoutManager extends BlockStackingLayoutManager {
private Block curBlockArea;
- //private List childBreaks = new ArrayList();
-
/**
* Create a new Caption layout manager.
* @param node table-caption FO
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 14485361d..7e369e526 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
@@ -176,7 +176,7 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager {
cellIPD = referenceIPD;
cellIPD -= getIPIndents();
- List returnedList;
+ List<ListElement> returnedList;
List<ListElement> contentList = new LinkedList<>();
List<ListElement> returnList = new LinkedList<>();
@@ -218,7 +218,7 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager {
}
primaryGridUnit.setKeepWithNext(context.getKeepWithNextPending());
- returnedList = new LinkedList();
+ returnedList = new LinkedList<>();
if (!contentList.isEmpty()) {
wrapPositionElements(contentList, returnList);
} else {
@@ -230,7 +230,7 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager {
}
//Space resolution
SpaceResolver.resolveElementList(returnList);
- if (((KnuthElement) returnList.get(0)).isForcedBreak()) {
+ if (returnList.get(0).isForcedBreak()) {
primaryGridUnit.setBreakBefore(((KnuthPenalty) returnList.get(0)).getBreakClass());
returnList.remove(0);
assert !returnList.isEmpty();
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 3f96eba5f..053ce737a 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
@@ -267,7 +267,7 @@ public class TableContentLayoutManager implements PercentBaseContext {
if (rowGroup != null) {
RowGroupLayoutManager rowGroupLM = new RowGroupLayoutManager(getTableLM(), rowGroup,
stepper);
- List nextRowGroupElems = rowGroupLM.getNextKnuthElements(context, alignment, bodyType);
+ List<ListElement> nextRowGroupElems = rowGroupLM.getNextKnuthElements(context, alignment, bodyType);
keepWithPrevious = keepWithPrevious.compare(context.getKeepWithPreviousPending());
breakBefore = context.getBreakBefore();
int breakBetween = context.getBreakAfter();
@@ -383,9 +383,9 @@ public class TableContentLayoutManager implements PercentBaseContext {
this.usedBPD = 0;
RowPainter painter = new RowPainter(this, layoutContext);
- List tablePositions = new java.util.ArrayList();
- List headerElements = null;
- List footerElements = null;
+ List<Position> tablePositions = new java.util.ArrayList<>();
+ List<ListElement> headerElements = null;
+ List<ListElement> footerElements = null;
Position firstPos = null;
Position lastPos = null;
Position lastCheckPos = null;
@@ -506,7 +506,7 @@ public class TableContentLayoutManager implements PercentBaseContext {
private void addHeaderFooterAreas(List elements, TablePart part, RowPainter painter,
boolean lastOnPage) {
- List lst = new java.util.ArrayList(elements.size());
+ List<Position> lst = new java.util.ArrayList<>(elements.size());
for (Iterator iter = new KnuthPossPosIter(elements); iter.hasNext();) {
Position pos = (Position) iter.next();
/*
@@ -533,7 +533,7 @@ public class TableContentLayoutManager implements PercentBaseContext {
private void addBodyAreas(Iterator iterator, RowPainter painter,
boolean lastOnPage) {
painter.startBody();
- List lst = new java.util.ArrayList();
+ List<TableContentPosition> lst = new java.util.ArrayList<>();
TableContentPosition pos = (TableContentPosition) iterator.next();
boolean isFirstPos = pos.getFlag(TableContentPosition.FIRST_IN_ROWGROUP)
&& pos.getRow().getFlag(EffRow.FIRST_IN_PART);
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentPosition.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentPosition.java
index e6dc5b22d..98d474f8e 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentPosition.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableContentPosition.java
@@ -38,7 +38,7 @@ class TableContentPosition extends Position {
public static final int LAST_IN_ROWGROUP = 2;
/** the list of CellParts making up this position */
- protected List cellParts;
+ protected List<CellPart> cellParts;
/** effective row this position belongs to */
private EffRow row;
/** flags for the position */
@@ -52,8 +52,8 @@ class TableContentPosition extends Position {
* @param cellParts the list of CellPart instances
* @param row effective row this position belongs to
*/
- protected TableContentPosition(LayoutManager lm, List cellParts,
- EffRow row) {
+ protected TableContentPosition(LayoutManager lm, List<CellPart> cellParts,
+ EffRow row) {
super(lm);
this.cellParts = cellParts;
this.row = row;
@@ -81,7 +81,7 @@ class TableContentPosition extends Position {
}
TablePart getTablePart() {
- return ((CellPart) cellParts.get(0)).pgu.getTablePart();
+ return cellParts.get(0).pgu.getTablePart();
}
/**
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableHFPenaltyPosition.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableHFPenaltyPosition.java
index 3e504a45c..47d80315e 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableHFPenaltyPosition.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableHFPenaltyPosition.java
@@ -22,6 +22,7 @@ package org.apache.fop.layoutmgr.table;
import java.util.List;
import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.ListElement;
import org.apache.fop.layoutmgr.Position;
/**
@@ -31,9 +32,9 @@ import org.apache.fop.layoutmgr.Position;
class TableHFPenaltyPosition extends Position {
/** Element list for the header */
- protected List headerElements;
+ protected List<ListElement> headerElements;
/** Element list for the footer */
- protected List footerElements;
+ protected List<ListElement> footerElements;
/**
* Creates a new TableHFPenaltyPosition
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableHeaderFooterPosition.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableHeaderFooterPosition.java
index 8d3b993b2..579539557 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableHeaderFooterPosition.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableHeaderFooterPosition.java
@@ -22,6 +22,7 @@ package org.apache.fop.layoutmgr.table;
import java.util.List;
import org.apache.fop.layoutmgr.LayoutManager;
+import org.apache.fop.layoutmgr.ListElement;
import org.apache.fop.layoutmgr.Position;
/**
@@ -33,7 +34,7 @@ class TableHeaderFooterPosition extends Position {
/** True indicates a position for a header, false for a footer. */
protected boolean header;
/** Element list representing the header/footer */
- protected List nestedElements;
+ protected List<ListElement> nestedElements;
/**
* Creates a new TableHeaderFooterPosition.
@@ -42,7 +43,7 @@ class TableHeaderFooterPosition extends Position {
* @param nestedElements Element list representing the header/footer
*/
protected TableHeaderFooterPosition(LayoutManager lm,
- boolean header, List nestedElements) {
+ boolean header, List<ListElement> nestedElements) {
super(lm);
this.header = header;
this.nestedElements = nestedElements;
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
index 91390dbcd..284dbdede 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
@@ -87,7 +87,7 @@ public class TableLayoutManager extends SpacedBorderedPaddedBlockLayoutManager
private int halfBorderSeparationIPD;
/** See {@link TableLayoutManager#registerColumnBackgroundArea(TableColumn, Block, int)}. */
- private List columnBackgroundAreas;
+ private List<ColumnBackgroundInfo> columnBackgroundAreas;
private Position auxiliaryPosition;
@@ -363,7 +363,7 @@ public class TableLayoutManager extends SpacedBorderedPaddedBlockLayoutManager
void registerColumnBackgroundArea(TableColumn column, Block backgroundArea, int xShift) {
addBackgroundArea(backgroundArea);
if (columnBackgroundAreas == null) {
- columnBackgroundAreas = new ArrayList();
+ columnBackgroundAreas = new ArrayList<>();
}
columnBackgroundAreas.add(new ColumnBackgroundInfo(column, backgroundArea, xShift));
}
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 ed9a29ad6..dc4559317 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
@@ -63,10 +63,10 @@ public class TableStepper {
private boolean rowFinished;
/** Cells spanning the current row. */
- private List activeCells = new LinkedList();
+ private List<ActiveCell> activeCells = new LinkedList<>();
/** Cells that will start the next row. */
- private List nextActiveCells = new LinkedList();
+ private List<ActiveCell> nextActiveCells = new LinkedList<>();
/**
* True if the next row is being delayed, that is, if cells spanning the current and