summaryrefslogtreecommitdiff
path: root/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java
diff options
context:
space:
mode:
Diffstat (limited to 'xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java')
-rw-r--r--xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java
index 7e3775526dc1..da22778ad1ab 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/diff/CharacterParser.java
@@ -46,7 +46,7 @@ public class CharacterParser {
private TextNodeIterator textNodes;
private int currentPosition = 0;
- private List nodeList_ = null;
+ private List<TextNodeEntry> nodeList_ = null;
private char[] charArray;
@@ -57,7 +57,7 @@ public class CharacterParser {
*/
public CharacterParser(Node node) {
textNodes = new TextNodeIterator(node);
- nodeList_ = new ArrayList();
+ nodeList_ = new ArrayList<TextNodeEntry>();
parseNodes();
}
@@ -68,7 +68,7 @@ public class CharacterParser {
*
* @return The <code>Node</code> pointer with the given character position.
*/
- public List getNodeList() {
+ public List<TextNodeEntry> getNodeList() {
// will go through the nodeList to find the corresponding node
return nodeList_;
}