java/java-diff-utils
1
0
Fork 0
mirror of https://github.com/java-diff-utils/java-diff-utils.git synced 2026-03-13 10:11:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

add apply patch example

Browse Source
This commit is contained in:
dm.naumenko@gmail.com
2010-12-27 21:30:46 +00:00
parent 86d25b5a64
commit 4f9928e4ef
3 changed files with 55 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
test/examples/diffutils/ApplyPatch.java Normal file
View File

@@ -0,0 +1,27 @@
package diffutils;
import java.io.File;
import java.util.List;
import difflib.DiffUtils;
import difflib.Patch;
import difflib.PatchFailedException;
public class ApplyPatch extends Example {
static final String FS = File.separator;
static final String ORIGINAL = "test" + FS + "mocks" + FS + "issue10_base.txt";
static final String PATCH = "test" + FS + "mocks" + FS + "issue10_patch.txt";
public static void main(String[] args) throws PatchFailedException {
List<String> original = fileToLines(ORIGINAL);
List<String> patched = fileToLines(PATCH);
// At first, parse the unified diff file and get the patch
Patch patch = DiffUtils.parseUnifiedDiff(patched);
// Then apply the computed patch to the given text
List result = DiffUtils.patch(original, patch);
System.out.println(result);
/// Or we can call patch.applyTo(original). There is no difference.
}
}

28
test/examples/diffutils/ComputeDifference.java
View File

@@ -1,38 +1,20 @@
package diffutils;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
import difflib.Delta;
import difflib.DiffUtils;
import difflib.Patch;
public class ComputeDifference {
public class ComputeDifference extends Example {
static final String FS = File.separator;
static final String originalFilename = "test" + FS + "mocks" + FS + "original.txt";
static final String revisedFilename = "test" + FS + "mocks" + FS + "revised.txt";
private static List<String> fileToLines(String filename) {
List<String> lines = new LinkedList<String>();
String line = "";
try {
BufferedReader in = new BufferedReader(new FileReader(filename));
while ((line = in.readLine()) != null) {
lines.add(line);
}
} catch (IOException e) {
e.printStackTrace();
}
return lines;
}
static final String ORIGINAL = "test" + FS + "mocks" + FS + "original.txt";
static final String RIVISED = "test" + FS + "mocks" + FS + "revised.txt";
public static void main(String[] args) {
List<String> original = fileToLines(originalFilename);
List<String> revised = fileToLines(revisedFilename);
List<String> original = fileToLines(ORIGINAL);
List<String> revised = fileToLines(RIVISED);
// Compute diff. Get the Patch object. Patch is the container for computed deltas.
Patch patch = DiffUtils.diff(original, revised);

23
test/examples/diffutils/Example.java Normal file
View File

@@ -0,0 +1,23 @@
package diffutils;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
public class Example {
public static List<String> fileToLines(String filename) {
List<String> lines = new LinkedList<String>();
String line = "";
try {
BufferedReader in = new BufferedReader(new FileReader(filename));
while ((line = in.readLine()) != null) {
lines.add(line);
}
} catch (IOException e) {
e.printStackTrace();
}
return lines;
}
}