File tree Expand file tree Collapse file tree 3 files changed +14
-58
lines changed
src/test/java/difflib/examples Expand file tree Collapse file tree 3 files changed +14
-58
lines changed Original file line number Diff line number Diff line change 55import difflib .UnifiedDiffUtils ;
66import difflib .patch .Patch ;
77import difflib .patch .PatchFailedException ;
8+ import java .io .File ;
9+ import java .io .IOException ;
10+ import java .nio .file .Files ;
811import java .util .List ;
912
10- public class ApplyPatch extends Example {
13+ public class ApplyPatch {
1114
1215 static final String ORIGINAL = TestConstants .MOCK_FOLDER + "issue10_base.txt" ;
1316 static final String PATCH = TestConstants .MOCK_FOLDER + "issue10_patch.txt" ;
1417
15- public static void main (String [] args ) throws PatchFailedException {
16- List <String > original = fileToLines ( ORIGINAL );
17- List <String > patched = fileToLines ( PATCH );
18+ public static void main (String [] args ) throws PatchFailedException , IOException {
19+ List <String > original = Files . readAllLines ( new File ( ORIGINAL ). toPath () );
20+ List <String > patched = Files . readAllLines ( new File ( PATCH ). toPath () );
1821
1922 // At first, parse the unified diff file and get the patch
2023 Patch <String > patch = UnifiedDiffUtils .parseUnifiedDiff (patched );
Original file line number Diff line number Diff line change 55import difflib .algorithm .DiffException ;
66import difflib .patch .Delta ;
77import difflib .patch .Patch ;
8+ import java .io .File ;
9+ import java .io .IOException ;
10+ import java .nio .file .Files ;
811import java .util .List ;
912
10- public class ComputeDifference extends Example {
13+ public class ComputeDifference {
1114
1215 static final String ORIGINAL = TestConstants .MOCK_FOLDER + "original.txt" ;
1316 static final String RIVISED = TestConstants .MOCK_FOLDER + "revised.txt" ;
1417
15- public static void main (String [] args ) throws DiffException {
16- List <String > original = fileToLines ( ORIGINAL );
17- List <String > revised = fileToLines ( RIVISED );
18+ public static void main (String [] args ) throws DiffException , IOException {
19+ List <String > original = Files . readAllLines ( new File ( ORIGINAL ). toPath () );
20+ List <String > revised = Files . readAllLines ( new File ( RIVISED ). toPath () );
1821
1922 // Compute diff. Get the Patch object. Patch is the container for computed deltas.
2023 Patch <String > patch = DiffUtils .diff (original , revised );
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments