From babba6b8ba63197a3d97aac3b2bb42c155e7531d Mon Sep 17 00:00:00 2001 From: Dmitry Naumenko Date: Sun, 28 Feb 2016 13:17:00 +0200 Subject: [PATCH 1/3] small fixes in javadocs, fix GNU license in myers package Backports https://github.com/dnaumenko/java-diff-utils/commit/bdaf7e81e30a6d3ea924eff2f0d925d38c86e0bf --- .../src/main/java/difflib/myers/DiffNode.java | 4 +- .../main/java/difflib/myers/MyersDiff.java | 2 +- .../src/main/java/difflib/myers/Snake.java | 4 +- .../src/main/java/difflib/myers/package.html | 71 ++++++++++++++----- 4 files changed, 58 insertions(+), 23 deletions(-) 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..477689a 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 @@ -34,8 +34,8 @@ public final class DiffNode extends PathNode { * will be followed using {@link PathNode#previousSnake} * until a non-diff node is found. * - * @param the position in the original sequence - * @param the position in the revised sequence + * @param i position in the original sequence + * @param j position in the revised sequence * @param prev the previous node in the path. */ public DiffNode(int i, int j, PathNode prev) { diff --git a/java-diff-utils-lib/src/main/java/difflib/myers/MyersDiff.java b/java-diff-utils-lib/src/main/java/difflib/myers/MyersDiff.java index 9cccc85..32a47e3 100644 --- a/java-diff-utils-lib/src/main/java/difflib/myers/MyersDiff.java +++ b/java-diff-utils-lib/src/main/java/difflib/myers/MyersDiff.java @@ -72,7 +72,7 @@ * http://www.cs.arizona.edu/people/gene/PAPERS/diff.ps

* * @author Juanco Anez - * @param T The type of the compared elements in the 'lines'. + * T The type of the compared elements in the 'lines'. */ public class MyersDiff implements DiffAlgorithm { /** Default equalizer. */ 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..ebdc2ce 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 @@ -74,8 +74,8 @@ public final class Snake extends PathNode { /** * Constructs a snake node. * - * @param the position in the original sequence - * @param the position in the revised sequence + * @param i position in the original sequence + * @param j position in the revised sequence * @param prev the previous node in the path. */ public Snake(int i, int j, PathNode prev) { diff --git a/java-diff-utils-lib/src/main/java/difflib/myers/package.html b/java-diff-utils-lib/src/main/java/difflib/myers/package.html index 3ccec66..ca8f0d0 100644 --- a/java-diff-utils-lib/src/main/java/difflib/myers/package.html +++ b/java-diff-utils-lib/src/main/java/difflib/myers/package.html @@ -1,23 +1,58 @@ From 6785d7a349e2a32e3e156e517dd74279db66d418 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Fri, 25 Nov 2016 19:09:43 +0100 Subject: [PATCH 2/3] Fix @param annotation for generics --- .../src/main/java/difflib/myers/MyersDiff.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java-diff-utils-lib/src/main/java/difflib/myers/MyersDiff.java b/java-diff-utils-lib/src/main/java/difflib/myers/MyersDiff.java index 32a47e3..47f8b89 100644 --- a/java-diff-utils-lib/src/main/java/difflib/myers/MyersDiff.java +++ b/java-diff-utils-lib/src/main/java/difflib/myers/MyersDiff.java @@ -72,7 +72,7 @@ * http://www.cs.arizona.edu/people/gene/PAPERS/diff.ps

* * @author Juanco Anez - * T The type of the compared elements in the 'lines'. + * @param The type of the compared elements in the 'lines'. */ public class MyersDiff implements DiffAlgorithm { /** Default equalizer. */ @@ -309,4 +309,4 @@ public static T[] copyOfRange2(U[] original, int from, int to, public Equalizer getEqualizer() { return equalizer; } -} \ No newline at end of file +} From 764f7d0a552ceed8ab43568e5dcd6b383951966b Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Fri, 25 Nov 2016 18:50:23 +0100 Subject: [PATCH 3/3] Clarify license --- README.md | 6 ++ .../src/main/java/difflib/myers/package.html | 72 +++---------------- 2 files changed, 16 insertions(+), 62 deletions(-) diff --git a/README.md b/README.md index 57df06e..3b139f3 100644 --- a/README.md +++ b/README.md @@ -79,3 +79,9 @@ This library implements Myers' diff algorithm, but it is modular so it is easy t - add Guava to dependency - let user uses other string to represent line which does not exist - implement event based parser like SAX (in difflib.event package) + +### License + +The license of the library is Apache-2.0. +Until version 1.3.1, the license was Apache-1.1. +The files in the directory `java-diff-utils-lib/src/main/java/difflib/myers` are subject to LGPL-2.1. diff --git a/java-diff-utils-lib/src/main/java/difflib/myers/package.html b/java-diff-utils-lib/src/main/java/difflib/myers/package.html index ca8f0d0..5a2547c 100644 --- a/java-diff-utils-lib/src/main/java/difflib/myers/package.html +++ b/java-diff-utils-lib/src/main/java/difflib/myers/package.html @@ -1,67 +1,10 @@ - - - + + - - + difflib.myers -

+

The {@link difflib.myers diff.myers} package implements Gene Myers' @@ -72,6 +15,11 @@ consumes considerably more memory than SimpleDiff, so its not suitable for very large files.

-@author Juanco Anez +

+ @author Juanco Anez +

+

+ In an email on 2012-12-17, Juancarlo Añez clearly stated that the license of the files in this directory is LGPL-2.1. +