From c318530d4280ca01a47442a5262c58e6b9ccfa48 Mon Sep 17 00:00:00 2001 From: wumpz Date: Tue, 11 Apr 2017 09:42:43 +0200 Subject: [PATCH] removed abstract example class --- .../java/difflib/examples/ApplyPatch.java | 11 ++-- .../difflib/examples/ComputeDifference.java | 11 ++-- src/test/java/difflib/examples/Example.java | 50 ------------------- 3 files changed, 14 insertions(+), 58 deletions(-) delete mode 100644 src/test/java/difflib/examples/Example.java diff --git a/src/test/java/difflib/examples/ApplyPatch.java b/src/test/java/difflib/examples/ApplyPatch.java index 1a8c7f2..fdf1855 100644 --- a/src/test/java/difflib/examples/ApplyPatch.java +++ b/src/test/java/difflib/examples/ApplyPatch.java @@ -5,16 +5,19 @@ import difflib.TestConstants; import difflib.UnifiedDiffUtils; import difflib.patch.Patch; import difflib.patch.PatchFailedException; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; import java.util.List; -public class ApplyPatch extends Example { +public class ApplyPatch { static final String ORIGINAL = TestConstants.MOCK_FOLDER + "issue10_base.txt"; static final String PATCH = TestConstants.MOCK_FOLDER + "issue10_patch.txt"; - public static void main(String[] args) throws PatchFailedException { - List original = fileToLines(ORIGINAL); - List patched = fileToLines(PATCH); + public static void main(String[] args) throws PatchFailedException, IOException { + List original = Files.readAllLines(new File(ORIGINAL).toPath()); + List patched = Files.readAllLines(new File(PATCH).toPath()); // At first, parse the unified diff file and get the patch Patch patch = UnifiedDiffUtils.parseUnifiedDiff(patched); diff --git a/src/test/java/difflib/examples/ComputeDifference.java b/src/test/java/difflib/examples/ComputeDifference.java index f235b16..29f73b9 100644 --- a/src/test/java/difflib/examples/ComputeDifference.java +++ b/src/test/java/difflib/examples/ComputeDifference.java @@ -5,16 +5,19 @@ import difflib.TestConstants; import difflib.algorithm.DiffException; import difflib.patch.Delta; import difflib.patch.Patch; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; import java.util.List; -public class ComputeDifference extends Example { +public class ComputeDifference { static final String ORIGINAL = TestConstants.MOCK_FOLDER + "original.txt"; static final String RIVISED = TestConstants.MOCK_FOLDER + "revised.txt"; - public static void main(String[] args) throws DiffException { - List original = fileToLines(ORIGINAL); - List revised = fileToLines(RIVISED); + public static void main(String[] args) throws DiffException, IOException { + List original = Files.readAllLines(new File(ORIGINAL).toPath()); + List revised = Files.readAllLines(new File(RIVISED).toPath()); // Compute diff. Get the Patch object. Patch is the container for computed deltas. Patch patch = DiffUtils.diff(original, revised); diff --git a/src/test/java/difflib/examples/Example.java b/src/test/java/difflib/examples/Example.java deleted file mode 100644 index 502a6ef..0000000 --- a/src/test/java/difflib/examples/Example.java +++ /dev/null @@ -1,50 +0,0 @@ -package difflib.examples; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.util.LinkedList; -import java.util.List; - -public abstract class Example { - - /** - * File separator. - */ - protected static final String FS = File.separator; - /** - * The base resource path. - */ - protected static String BASE_PATH = "src" + FS + "test" + FS + "resources"; - - /** - * Tries to read the file and split it into a list of lines. - * - * @param filename The filename as path. - * @return A list of lines. - */ - public static List fileToLines(String filename) { - List lines = new LinkedList<>(); - String line = ""; - BufferedReader in = null; - try { - in = new BufferedReader(new FileReader(filename)); - while ((line = in.readLine()) != null) { - lines.add(line); - } - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (in != null) { - try { - in.close(); - } catch (IOException e) { - // ignore ... any errors should already have been - // reported via an IOException from the final flush. - } - } - } - return lines; - } -}