java/java-diff-utils
1
0
Fork 0
mirror of https://github.com/java-diff-utils/java-diff-utils.git synced 2026-03-13 10:11:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed DiffAlgorithm.java and Delta.java due to licensing issues. The originals were Apache 1.1. Now we start a clean room implementation of those two files.

Browse Source
This commit is contained in:
wumpz
2018-06-28 21:46:18 +02:00
parent 42780b18a8
commit 696d22bd94
2 changed files with 0 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/com/github/difflib/algorithm/DiffAlgorithm.java
View File

@@ -1,55 +0,0 @@
/*-
* #%L
* java-diff-utils
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
* #L%
*/
package com.github.difflib.algorithm;
import com.github.difflib.patch.Patch;
import java.util.*;
/**
* The general interface for computing diffs between two lists of elements of type T.
*
* @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
* @author <a href="t.warneke@gmx.net">Tobias Warneke</a>
* @param T The type of the compared elements in the 'lines'.
*/
public interface DiffAlgorithm<T> {
/**
* Computes the difference between the original sequence and the revised sequence and returns it as a {@link Patch}
* object.
*
* @param original The original sequence. Must not be {@code null}.
* @param revised The revised sequence. Must not be {@code null}.
* @return The patch representing the diff of the given sequences. Never {@code null}.
*/
default List<Change> diff(T[] original, T[] revised, DiffAlgorithmListener progress) throws DiffException {
return diff(Arrays.asList(original), Arrays.asList(revised), progress);
}
/**
* Computes the difference between the original sequence and the revised sequence and returns it as a {@link Patch}
* object.
*
* @param original The original sequence. Must not be {@code null}.
* @param revised The revised sequence. Must not be {@code null}.
* @return The patch representing the diff of the given sequences. Never {@code null}.
*/
List<Change> diff(List<T> original, List<T> revised, DiffAlgorithmListener progress) throws DiffException;
}

134
src/main/java/com/github/difflib/patch/Delta.java
View File

@@ -1,134 +0,0 @@
/*-
* #%L
* java-diff-utils
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
* #L%
*/
package com.github.difflib.patch;
import java.util.*;
/**
* Describes the delta between original and revised texts.
*
* @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
* @author <a href="t.warneke@gmx.net">Tobias Warneke</a>
* @param T The type of the compared elements in the 'lines'.
*/
public abstract class Delta<T> {
private final DeltaType deltaType;
private final Chunk<T> original;
private final Chunk<T> revised;
/**
* Construct the delta for original and revised chunks
*
* @param original Chunk describing the original text. Must not be {@code null}.
* @param revised Chunk describing the revised text. Must not be {@code null}.
*/
public Delta(DeltaType deltaType, Chunk<T> original, Chunk<T> revised) {
Objects.requireNonNull(deltaType, "deltaType must not be null");
Objects.requireNonNull(original, "original must not be null");
Objects.requireNonNull(revised, "revised must not be null");
this.deltaType = deltaType;
this.original = original;
this.revised = revised;
}
/**
* Verifies that this delta can be used to patch the given text.
*
* @param target the text to patch.
* @throws PatchFailedException if the patch cannot be applied.
*/
public void verify(List<T> target) throws PatchFailedException {
getOriginal().verify(target);
}
/**
* Applies this delta as the patch for a given target
*
* @param target the given target
* @throws PatchFailedException
*/
public abstract void applyTo(List<T> target) throws PatchFailedException;
/**
* Cancel this delta for a given revised text. The action is opposite to patch.
*
* @param target the given revised text
*/
public abstract void restore(List<T> target);
public final DeltaType getType() {
return deltaType;
}
/**
* @return The Chunk describing the original text.
*/
public Chunk<T> getOriginal() {
return original;
}
/**
* @return The Chunk describing the revised text.
*/
public Chunk<T> getRevised() {
return revised;
}
@Override
public int hashCode() {
final int prime = 31;
int result = 1;
result = prime * result + ((original == null) ? 0 : original.hashCode());
result = prime * result + ((revised == null) ? 0 : revised.hashCode());
return result;
}
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
if (obj == null) {
return false;
}
if (getClass() != obj.getClass()) {
return false;
}
Delta<T> other = (Delta) obj;
if (original == null) {
if (other.original != null) {
return false;
}
} else if (!original.equals(other.original)) {
return false;
}
if (revised == null) {
if (other.revised != null) {
return false;
}
} else if (!revised.equals(other.revised)) {
return false;
}
return true;
}
}