From 9f601b6785dfcc8ef52116cea0025762d78f7eae Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Fri, 25 Nov 2016 14:24:57 +0100 Subject: [PATCH 1/3] Remove obosolte SVN macros --- .../src/main/java/difflib/myers/DiffException.java | 2 -- .../src/main/java/difflib/myers/DiffNode.java | 12 +----------- .../myers/DifferentiationFailedException.java | 2 -- .../src/main/java/difflib/myers/PathNode.java | 3 +-- .../src/main/java/difflib/myers/Snake.java | 3 +-- 5 files changed, 3 insertions(+), 19 deletions(-) diff --git a/java-diff-utils-lib/src/main/java/difflib/myers/DiffException.java b/java-diff-utils-lib/src/main/java/difflib/myers/DiffException.java index d3802ff..bde025d 100644 --- a/java-diff-utils-lib/src/main/java/difflib/myers/DiffException.java +++ b/java-diff-utils-lib/src/main/java/difflib/myers/DiffException.java @@ -60,8 +60,6 @@ /** * Base class for all exceptions emanating from this package. * - * @version $Revision: 69 $ $Date: 2003-10-13 11:00:44 +0300 (Пнд, 13 Окт 2003) $ - * * @author Juanco Anez */ public class DiffException extends Exception { diff --git a/java-diff-utils-lib/src/main/java/difflib/myers/DiffNode.java b/java-diff-utils-lib/src/main/java/difflib/myers/DiffNode.java index a2fb071..64f0674 100644 --- a/java-diff-utils-lib/src/main/java/difflib/myers/DiffNode.java +++ b/java-diff-utils-lib/src/main/java/difflib/myers/DiffNode.java @@ -1,14 +1,5 @@ package difflib.myers; -/** - *

Title:

- *

Description:

- *

Copyright: Copyright (c) 2002

- *

Company:

- * @author not attributable - * @version 1.0 - */ - /** * A diffnode in a diffpath. *

@@ -21,7 +12,6 @@ * node and each contiguous series of insertions and deletions is represented * by a single {@link DiffNode DiffNodes}. * - * @version $Revision: 60 $ $Date: 2003-05-10 21:56:10 +0300 (Суб, 10 Май 2003) $ * @author Juanco Anez * */ @@ -50,4 +40,4 @@ public boolean isSnake() { return false; } -} \ No newline at end of file +} diff --git a/java-diff-utils-lib/src/main/java/difflib/myers/DifferentiationFailedException.java b/java-diff-utils-lib/src/main/java/difflib/myers/DifferentiationFailedException.java index c25c081..a3f158b 100644 --- a/java-diff-utils-lib/src/main/java/difflib/myers/DifferentiationFailedException.java +++ b/java-diff-utils-lib/src/main/java/difflib/myers/DifferentiationFailedException.java @@ -61,8 +61,6 @@ * Thrown whenever the differencing engine cannot produce the differences * between two revisions of ta text. * - * @version $Revision: 69 $ $Date: 2003-10-13 11:00:44 +0300 (Пнд, 13 Окт 2003) $ - * * @author Juanco Anez * @see MyersDiff * @see difflib.DiffAlgorithm diff --git a/java-diff-utils-lib/src/main/java/difflib/myers/PathNode.java b/java-diff-utils-lib/src/main/java/difflib/myers/PathNode.java index 4ead5f2..0e5b4b1 100644 --- a/java-diff-utils-lib/src/main/java/difflib/myers/PathNode.java +++ b/java-diff-utils-lib/src/main/java/difflib/myers/PathNode.java @@ -60,7 +60,6 @@ /** * A node in a diffpath. * - * @version $Revision: 69 $ $Date: 2003-10-13 11:00:44 +0300 (Пнд, 13 Окт 2003) $ * @author Juanco Anez * * @see DiffNode @@ -137,4 +136,4 @@ public String toString() { buf.append("]"); return buf.toString(); } -} \ No newline at end of file +} diff --git a/java-diff-utils-lib/src/main/java/difflib/myers/Snake.java b/java-diff-utils-lib/src/main/java/difflib/myers/Snake.java index 452829b..09dc7d9 100644 --- a/java-diff-utils-lib/src/main/java/difflib/myers/Snake.java +++ b/java-diff-utils-lib/src/main/java/difflib/myers/Snake.java @@ -66,7 +66,6 @@ * node and each contiguous series of insertions and deletions is represented * by a single {@link DiffNode DiffNodes}. * - * @version $Revision: 69 $ $Date: 2003-10-13 11:00:44 +0300 (Пнд, 13 Окт 2003) $ * @author Juanco Anez * */ @@ -90,4 +89,4 @@ public boolean isSnake() { return true; } -} \ No newline at end of file +} From eebb519742287b4a12f047e402ef3b764565fea1 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Fri, 25 Nov 2016 14:42:50 +0100 Subject: [PATCH 2/3] Add initial editorconfig --- java-diff-utils-lib/.editorconfig | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 java-diff-utils-lib/.editorconfig diff --git a/java-diff-utils-lib/.editorconfig b/java-diff-utils-lib/.editorconfig new file mode 100644 index 0000000..b0371ef --- /dev/null +++ b/java-diff-utils-lib/.editorconfig @@ -0,0 +1,5 @@ +[*] +charset = utf-8 +indent_style = space +indent_size = 4 +insert_final_newline = true From 3283738ba5eb32efeb8cd832a52098e7912c256c Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Fri, 25 Nov 2016 18:49:57 +0100 Subject: [PATCH 3/3] Add link to other fork --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 57df06e..b08092d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,8 @@ It is an open source library for performing comparison operations between chunks The main reason for creating this library was the lack of easy-to-use libraries with all the usual features necessary for working with diff files. Originally it was inspired by the JRCS library and its nice diff module design. -**Original code and docs were forked from:** [java-diff-utils](https://code.google.com/p/java-diff-utils/) +**Original code and docs were forked from:** [java-diff-utils](https://code.google.com/p/java-diff-utils/). +The original author created his own fork at . ## Main Features