mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-08 21:30:57 +00:00
ssh://armin@sapsailing.com/home/trac/git into racecommittee_integrated Conflicts: java/com.sap.sailing.domain/src/com/sap/sailing/domain/leaderboard/impl/AbstractSimpleLeaderboardImpl.java
28 lines
988 B
Java
Executable File
28 lines
988 B
Java
Executable File
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<String> patch = DiffUtils.parseUnifiedDiff(patched);
|
|
|
|
// Then apply the computed patch to the given text
|
|
List<String> result = DiffUtils.patch(original, patch);
|
|
System.out.println(result);
|
|
/// Or we can call patch.applyTo(original). There is no difference.
|
|
}
|
|
}
|