mirror of
https://github.com/java-diff-utils/java-diff-utils.git
synced 2026-03-13 10:11:17 +08:00
removed comparator
This commit is contained in:
@@ -1,48 +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 difflib.patch;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Comparator;
|
||||
|
||||
/**
|
||||
* @author mksenzov
|
||||
* @param T The type of the compared elements in the 'lines'.
|
||||
*/
|
||||
public class DeltaComparator implements Comparator<Delta<?>>, Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
public static final Comparator<Delta<?>> INSTANCE = new DeltaComparator();
|
||||
|
||||
private DeltaComparator() {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compare(final Delta<?> a, final Delta<?> b) {
|
||||
final int posA = a.getOriginal().getPosition();
|
||||
final int posB = b.getOriginal().getPosition();
|
||||
if (posA > posB) {
|
||||
return 1;
|
||||
} else if (posA < posB) {
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -20,6 +20,7 @@ limitations under the License.
|
||||
package difflib.patch;
|
||||
|
||||
import java.util.Collections;
|
||||
import static java.util.Comparator.comparing;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.ListIterator;
|
||||
@@ -81,7 +82,7 @@ public final class Patch<T> {
|
||||
* @return the deltas
|
||||
*/
|
||||
public List<Delta<T>> getDeltas() {
|
||||
Collections.sort(deltas, DeltaComparator.INSTANCE);
|
||||
Collections.sort(deltas, comparing(d -> d.getOriginal().getPosition()));
|
||||
return deltas;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user