small fixes in javadocs, fix GNU license in myers package

Dmitry Naumenko · Dmitry Naumenko · commit bdaf7e81e30a · 2016-02-28T13:17:00.000+02:00
diff --git a/src/main/java/difflib/myers/DiffNode.java b/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/src/main/java/difflib/myers/Equalizer.java b/src/main/java/difflib/myers/Equalizer.java
@@ -3,7 +3,7 @@
 /**
  * Specifies when two compared elements in the Myers algorithm are equal.
  * 
- * @param T The type of the compared elements in the 'lines'.
+ * T The type of the compared elements in the 'lines'.
  */
 public interface Equalizer<T> {
 	
diff --git a/src/main/java/difflib/myers/MyersDiff.java b/src/main/java/difflib/myers/MyersDiff.java
@@ -72,7 +72,7 @@
  * http://www.cs.arizona.edu/people/gene/PAPERS/diff.ps</a></p>
  *
  * @author <a href="mailto:juanco@suigeneris.org">Juanco Anez</a>
- * @param T The type of the compared elements in the 'lines'.
+ * T The type of the compared elements in the 'lines'.
  */
 public class MyersDiff<T> implements DiffAlgorithm<T> {
     
diff --git a/src/main/java/difflib/myers/Snake.java b/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/src/main/java/difflib/myers/package.html b/src/main/java/difflib/myers/package.html
@@ -1,23 +1,58 @@
 <!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
 <!--
-/*
-    Copyright 2009 Dmitry Naumenko (dm.naumenko@gmail.com)
-    
-    This file is part of Java Diff Utills Library.
-
-    Java Diff Utills Library is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    Java Diff Utills Library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with Java Diff Utills Library.  If not, see <http://www.gnu.org/licenses/>.
-*/
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ *    "Apache Maven" must not be used to endorse or promote products
+ *    derived from this software without prior written permission. For
+ *    written permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    "Apache Maven", nor may "Apache" appear in their name, without
+ *    prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
  -->
 <html>
   <head>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`/**`
`4`	`4`	`* Specifies when two compared elements in the Myers algorithm are equal.`
`5`	`5`	`*`
`6`		`- * @param T The type of the compared elements in the 'lines'.`
	`6`	`+ * T The type of the compared elements in the 'lines'.`
`7`	`7`	`*/`
`8`	`8`	`public interface Equalizer<T> {`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@`
`72`	`72`	`* http://www.cs.arizona.edu/people/gene/PAPERS/diff.ps</a></p>`
`73`	`73`	`*`
`74`	`74`	`* @author <a href="mailto:juanco@suigeneris.org">Juanco Anez</a>`
`75`		`- * @param T The type of the compared elements in the 'lines'.`
	`75`	`+ * T The type of the compared elements in the 'lines'.`
`76`	`76`	`*/`
`77`	`77`	`public class MyersDiff<T> implements DiffAlgorithm<T> {`
`78`	`78`