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

remove verification from applyTo

Browse Source
This commit is contained in:
Tobias Warneke
2021-02-07 13:22:34 +01:00
parent b9fea86e43
commit 307574225a
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
View File

@@ -57,10 +57,18 @@ public abstract class AbstractDelta<T> implements Serializable {
protected VerifyChunk verifyChunkToFitTarget(List<T> target) throws PatchFailedException {
return getSource().verifyChunk(target);
}
protected VerifyChunk verifyAntApplyTo(List<T> target) throws PatchFailedException {
final VerifyChunk verify = verifyChunkToFitTarget(target);
if (verify == VerifyChunk.OK) {
applyTo(target);
}
return verify;
}
public abstract void applyTo(List<T> target) throws PatchFailedException;
protected abstract void applyTo(List<T> target) throws PatchFailedException;
public abstract void restore(List<T> target);
protected abstract void restore(List<T> target);
/**
* Create a new delta of the actual instance with customized chunk data.

5
java-diff-utils/src/main/java/com/github/difflib/patch/ChangeDelta.java
View File

@@ -39,8 +39,7 @@ public final class ChangeDelta<T> extends AbstractDelta<T> {
}
@Override
public void applyTo(List<T> target) throws PatchFailedException {
verifyChunk(target);
protected void applyTo(List<T> target) throws PatchFailedException {
int position = getSource().getPosition();
int size = getSource().size();
for (int i = 0; i < size; i++) {
@@ -54,7 +53,7 @@ public final class ChangeDelta<T> extends AbstractDelta<T> {
}
@Override
public void restore(List<T> target) {
protected void restore(List<T> target) {
int position = getTarget().getPosition();
int size = getTarget().size();
for (int i = 0; i < size; i++) {

5
java-diff-utils/src/main/java/com/github/difflib/patch/DeleteDelta.java
View File

@@ -36,8 +36,7 @@ public final class DeleteDelta<T> extends AbstractDelta<T> {
}
@Override
public void applyTo(List<T> target) throws PatchFailedException {
verifyChunk(target);
protected void applyTo(List<T> target) throws PatchFailedException {
int position = getSource().getPosition();
int size = getSource().size();
for (int i = 0; i < size; i++) {
@@ -46,7 +45,7 @@ public final class DeleteDelta<T> extends AbstractDelta<T> {
}
@Override
public void restore(List<T> target) {
protected void restore(List<T> target) {
int position = this.getTarget().getPosition();
List<T> lines = this.getSource().getLines();
for (int i = 0; i < lines.size(); i++) {

5
java-diff-utils/src/main/java/com/github/difflib/patch/EqualDelta.java
View File

@@ -28,12 +28,11 @@ public class EqualDelta<T> extends AbstractDelta<T> {
}
@Override
public void applyTo(List<T> target) throws PatchFailedException {
verifyChunk(target);
protected void applyTo(List<T> target) throws PatchFailedException {
}
@Override
public void restore(List<T> target) {
protected void restore(List<T> target) {
}
@Override

5
java-diff-utils/src/main/java/com/github/difflib/patch/InsertDelta.java
View File

@@ -36,8 +36,7 @@ public final class InsertDelta<T> extends AbstractDelta<T> {
}
@Override
public void applyTo(List<T> target) throws PatchFailedException {
verifyChunk(target);
protected void applyTo(List<T> target) throws PatchFailedException {
int position = this.getSource().getPosition();
List<T> lines = this.getTarget().getLines();
for (int i = 0; i < lines.size(); i++) {
@@ -46,7 +45,7 @@ public final class InsertDelta<T> extends AbstractDelta<T> {
}
@Override
public void restore(List<T> target) {
protected void restore(List<T> target) {
int position = getTarget().getPosition();
int size = getTarget().size();
for (int i = 0; i < size; i++) {