Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit bdaf7e8

Browse filesBrowse files
author
Dmitry Naumenko
committed
small fixes in javadocs, fix GNU license in myers package
1 parent fc40fbd commit bdaf7e8
Copy full SHA for bdaf7e8

File tree

5 files changed

+59
-24
lines changed
Filter options

5 files changed

+59
-24
lines changed

‎src/main/java/difflib/myers/DiffNode.java

Copy file name to clipboardExpand all lines: src/main/java/difflib/myers/DiffNode.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ public final class DiffNode extends PathNode {
3434
* will be followed using {@link PathNode#previousSnake}
3535
* until a non-diff node is found.
3636
*
37-
* @param the position in the original sequence
38-
* @param the position in the revised sequence
37+
* @param i position in the original sequence
38+
* @param j position in the revised sequence
3939
* @param prev the previous node in the path.
4040
*/
4141
public DiffNode(int i, int j, PathNode prev) {

‎src/main/java/difflib/myers/Equalizer.java

Copy file name to clipboardExpand all lines: src/main/java/difflib/myers/Equalizer.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Specifies when two compared elements in the Myers algorithm are equal.
55
*
6-
* @param T The type of the compared elements in the 'lines'.
6+
* T The type of the compared elements in the 'lines'.
77
*/
88
public interface Equalizer<T> {
99

‎src/main/java/difflib/myers/MyersDiff.java

Copy file name to clipboardExpand all lines: src/main/java/difflib/myers/MyersDiff.java
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
* http://www.cs.arizona.edu/people/gene/PAPERS/diff.ps</a></p>
7373
*
7474
* @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'.
7676
*/
7777
public class MyersDiff<T> implements DiffAlgorithm<T> {
7878

‎src/main/java/difflib/myers/Snake.java

Copy file name to clipboardExpand all lines: src/main/java/difflib/myers/Snake.java
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ public final class Snake extends PathNode {
7474
/**
7575
* Constructs a snake node.
7676
*
77-
* @param the position in the original sequence
78-
* @param the position in the revised sequence
77+
* @param i position in the original sequence
78+
* @param j position in the revised sequence
7979
* @param prev the previous node in the path.
8080
*/
8181
public Snake(int i, int j, PathNode prev) {

‎src/main/java/difflib/myers/package.html

Copy file name to clipboardExpand all lines: src/main/java/difflib/myers/package.html
+53-18Lines changed: 53 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,58 @@
11
<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
22
<!--
3-
/*
4-
Copyright 2009 Dmitry Naumenko (dm.naumenko@gmail.com)
5-
6-
This file is part of Java Diff Utills Library.
7-
8-
Java Diff Utills Library is free software: you can redistribute it and/or modify
9-
it under the terms of the GNU General Public License as published by
10-
the Free Software Foundation, either version 3 of the License, or
11-
(at your option) any later version.
12-
13-
Java Diff Utills Library is distributed in the hope that it will be useful,
14-
but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
GNU General Public License for more details.
17-
18-
You should have received a copy of the GNU General Public License
19-
along with Java Diff Utills Library. If not, see <http://www.gnu.org/licenses/>.
20-
*/
3+
/* ====================================================================
4+
* The Apache Software License, Version 1.1
5+
*
6+
* Copyright (c) 2002 The Apache Software Foundation. All rights
7+
* reserved.
8+
*
9+
* Redistribution and use in source and binary forms, with or without
10+
* modification, are permitted provided that the following conditions
11+
* are met:
12+
*
13+
* 1. Redistributions of source code must retain the above copyright
14+
* notice, this list of conditions and the following disclaimer.
15+
*
16+
* 2. Redistributions in binary form must reproduce the above copyright
17+
* notice, this list of conditions and the following disclaimer in
18+
* the documentation and/or other materials provided with the
19+
* distribution.
20+
*
21+
* 3. The end-user documentation included with the redistribution,
22+
* if any, must include the following acknowledgment:
23+
* "This product includes software developed by the
24+
* Apache Software Foundation (http://www.apache.org/)."
25+
* Alternately, this acknowledgment may appear in the software itself,
26+
* if and wherever such third-party acknowledgments normally appear.
27+
*
28+
* 4. The names "Apache" and "Apache Software Foundation" and
29+
* "Apache Maven" must not be used to endorse or promote products
30+
* derived from this software without prior written permission. For
31+
* written permission, please contact apache@apache.org.
32+
*
33+
* 5. Products derived from this software may not be called "Apache",
34+
* "Apache Maven", nor may "Apache" appear in their name, without
35+
* prior written permission of the Apache Software Foundation.
36+
*
37+
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
38+
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
39+
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
40+
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
41+
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
42+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
43+
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
44+
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
45+
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
46+
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
47+
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
48+
* SUCH DAMAGE.
49+
* ====================================================================
50+
*
51+
* This software consists of voluntary contributions made by many
52+
* individuals on behalf of the Apache Software Foundation. For more
53+
* information on the Apache Software Foundation, please see
54+
* <http://www.apache.org/>.
55+
*/
2156
-->
2257
<html>
2358
<head>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.