summaryrefslogtreecommitdiff
path: root/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
diff options
context:
space:
mode:
Diffstat (limited to 'xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
index 3f35dcbfde30..58e511c5f022 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/IteratorLCSAlgorithm.java
@@ -50,7 +50,7 @@ public class IteratorLCSAlgorithm implements DiffAlgorithm {
printDiffTable(diffTable);
}
- ArrayList diffResult = new ArrayList();
+ ArrayList<Difference> diffResult = new ArrayList<Difference>();
generateResult(diffTable, orgSeqlen, modSeqlen, diffResult);
@@ -161,7 +161,7 @@ public class IteratorLCSAlgorithm implements DiffAlgorithm {
* and positions fill in.
*/
private void generateResult(int[][] diffTable,
- int i, int j, ArrayList diffVector) {
+ int i, int j, ArrayList<Difference> diffVector) {
// handle the first element
if (i == 0 && j == 0) {