udiff pattern fixed, test added

This commit is contained in:
shotwave
2011-04-06 17:01:37 +00:00
parent f17ae5816f
commit 9a6d3aef55
2 changed files with 32 additions and 55 deletions

View File

@@ -31,7 +31,7 @@ import java.util.regex.Pattern;
public class DiffUtils {
private static DiffAlgorithm defaultDiffAlgorithm = new MyersDiff();
private static Pattern unifiedDiffChunkRe =
Pattern.compile("@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@");
Pattern.compile("^@@\\s+-(?:(\\d+)(?:,(\\d+))?)\\s+\\+(?:(\\d+)(?:,(\\d+))?)\\s+@@$");
/**
* Compute the difference between the original and revised texts with default diff algorithm