fixes #115

wumpz · wumpz · commit b17bbb12c3ff · 2021-02-07T00:47:27.000+01:00
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java b/java-diff-utils/src/main/java/com/github/difflib/patch/AbstractDelta.java
@@ -54,8 +54,8 @@ public DeltaType getType() {
      * @param target
      * @throws PatchFailedException 
      */
-    protected void verifyChunk(List<T> target) throws PatchFailedException {
-        getSource().verify(target);
+    protected VerifyChunk verifyChunkToFitTarget(List<T> target) throws PatchFailedException {
+        return getSource().verifyChunk(target);
     }
     
     public abstract void applyTo(List<T> target) throws PatchFailedException;
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/Chunk.java
@@ -92,16 +92,16 @@ public Chunk(int position, T[] lines) {
      * @param target the sequence to verify against.
      * @throws com.github.difflib.patch.PatchFailedException
      */
-    public void verify(List<T> target) throws PatchFailedException {
+    public VerifyChunk verifyChunk(List<T> target) throws PatchFailedException {
         if (position > target.size() || last() > target.size()) {
-            throw new PatchFailedException("Incorrect Chunk: the position of chunk > target size");
+            return VerifyChunk.POSITION_OUT_OF_TARGET;
         }
         for (int i = 0; i < size(); i++) {
             if (!target.get(position + i).equals(lines.get(i))) {
-                throw new PatchFailedException(
-                        "Incorrect Chunk: the chunk content doesn't match the target");
+                return VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET;
             }
         }
+        return VerifyChunk.OK;
     }
 
     /**
diff --git a/java-diff-utils/src/main/java/com/github/difflib/patch/VerifyChunk.java b/java-diff-utils/src/main/java/com/github/difflib/patch/VerifyChunk.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2021 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.
+ */
+package com.github.difflib.patch;
+
+/**
+ *
+ * @author tw
+ */
+public enum VerifyChunk {
+    OK,
+    POSITION_OUT_OF_TARGET,
+    CONTENT_DOES_NOT_MATCH_TARGET
+}

Original file line number	Diff line number	Diff line change
`@@ -92,16 +92,16 @@ public Chunk(int position, T[] lines) {`
`92`	`92`	`* @param target the sequence to verify against.`
`93`	`93`	`* @throws com.github.difflib.patch.PatchFailedException`
`94`	`94`	`*/`
`95`		`- public void verify(List<T> target) throws PatchFailedException {`
	`95`	`+ public VerifyChunk verifyChunk(List<T> target) throws PatchFailedException {`
`96`	`96`	`if (position > target.size() \|\| last() > target.size()) {`
`97`		`- throw new PatchFailedException("Incorrect Chunk: the position of chunk > target size");`
	`97`	`+ return VerifyChunk.POSITION_OUT_OF_TARGET;`
`98`	`98`	`}`
`99`	`99`	`for (int i = 0; i < size(); i++) {`
`100`	`100`	`if (!target.get(position + i).equals(lines.get(i))) {`
`101`		`- throw new PatchFailedException(`
`102`		`- "Incorrect Chunk: the chunk content doesn't match the target");`
	`101`	`+ return VerifyChunk.CONTENT_DOES_NOT_MATCH_TARGET;`
`103`	`102`	`}`
`104`	`103`	`}`
	`104`	`+ return VerifyChunk.OK;`
`105`	`105`	`}`
`106`	`106`
`107`	`107`	`/**`