summaryrefslogtreecommitdiff
path: root/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
diff options
context:
space:
mode:
Diffstat (limited to 'xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
index 2ab19045f613..0d2a3aa67b64 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharArrayLCSAlgorithm.java
@@ -54,7 +54,7 @@ public class CharArrayLCSAlgorithm {
// in those 2 sequences
diffTable = createDiffTable(orgSeq, modSeq);
- ArrayList diffResult = new ArrayList();
+ ArrayList<Difference> diffResult = new ArrayList<Difference>();
generateResult(diffTable, orgSeqlen, modSeqlen, diffResult);
@@ -154,7 +154,7 @@ public class CharArrayLCSAlgorithm {
* and positions filled 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) {