wumpz · wumpz · commit 11519058d8e1 · 2017-04-04T07:21:10.000+02:00
diff --git a/src/main/java/difflib/patch/ChangeDelta.java b/src/main/java/difflib/patch/ChangeDelta.java
@@ -39,11 +39,6 @@ public ChangeDelta(Chunk<T> original, Chunk<T> revised) {
         super(DeltaType.CHANGE, original, revised);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @throws PatchFailedException
-     */
     @Override
     public void applyTo(List<T> target) throws PatchFailedException {
         verify(target);
@@ -59,9 +54,6 @@ public void applyTo(List<T> target) throws PatchFailedException {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void restore(List<T> target) {
         int position = getRevised().getPosition();
@@ -76,18 +68,6 @@ public void restore(List<T> target) {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void verify(List<T> target) throws PatchFailedException {
-        getOriginal().verify(target);
-        if (getOriginal().getPosition() > target.size()) {
-            throw new PatchFailedException("Incorrect patch for delta: "
-                    + "delta original position > target size");
-        }
-    }
-
     @Override
     public String toString() {
         return "[ChangeDelta, position: " + getOriginal().getPosition() + ", lines: "
diff --git a/src/main/java/difflib/patch/Chunk.java b/src/main/java/difflib/patch/Chunk.java
@@ -68,7 +68,7 @@ public Chunk(int position, T[] lines) {
      * @param target the sequence to verify against.
      */
     public void verify(List<T> target) throws PatchFailedException {
-        if (last() > target.size()) {
+        if (position > target.size() || last() > target.size()) {
             throw new PatchFailedException("Incorrect Chunk: the position of chunk > target size");
         }
         for (int i = 0; i < size(); i++) {
diff --git a/src/main/java/difflib/patch/DeleteDelta.java b/src/main/java/difflib/patch/DeleteDelta.java
@@ -39,11 +39,6 @@ public DeleteDelta(Chunk<T> original, Chunk<T> revised) {
         super(DeltaType.DELETE, original, revised);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @throws PatchFailedException
-     */
     @Override
     public void applyTo(List<T> target) throws PatchFailedException {
         verify(target);
@@ -53,10 +48,7 @@ public void applyTo(List<T> target) throws PatchFailedException {
             target.remove(position);
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
+    
     @Override
     public void restore(List<T> target) {
         int position = this.getRevised().getPosition();
@@ -66,11 +58,6 @@ public void restore(List<T> target) {
         }
     }
 
-    @Override
-    public void verify(List<T> target) throws PatchFailedException {
-        getOriginal().verify(target);
-    }
-
     @Override
     public String toString() {
         return "[DeleteDelta, position: " + getOriginal().getPosition() + ", lines: "
diff --git a/src/main/java/difflib/patch/Delta.java b/src/main/java/difflib/patch/Delta.java
@@ -79,7 +79,9 @@ public Delta(DeltaType deltaType, Chunk<T> original, Chunk<T> revised) {
      * @param target the text to patch.
      * @throws PatchFailedException if the patch cannot be applied.
      */
-    public abstract void verify(List<T> target) throws PatchFailedException;
+    public void verify(List<T> target) throws PatchFailedException {
+        getOriginal().verify(target);
+    }
 
     /**
      * Applies this delta as the patch for a given target
diff --git a/src/main/java/difflib/patch/InsertDelta.java b/src/main/java/difflib/patch/InsertDelta.java
@@ -39,11 +39,6 @@ public InsertDelta(Chunk<T> original, Chunk<T> revised) {
         super(DeltaType.INSERT, original, revised);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @throws PatchFailedException
-     */
     @Override
     public void applyTo(List<T> target) throws PatchFailedException {
         verify(target);
@@ -53,10 +48,7 @@ public void applyTo(List<T> target) throws PatchFailedException {
             target.add(position + i, lines.get(i));
         }
     }
-
-    /**
-     * {@inheritDoc}
-     */
+    
     @Override
     public void restore(List<T> target) {
         int position = getRevised().getPosition();
@@ -66,15 +58,6 @@ public void restore(List<T> target) {
         }
     }
 
-    @Override
-    public void verify(List<T> target) throws PatchFailedException {
-        if (getOriginal().getPosition() > target.size()) {
-            throw new PatchFailedException("Incorrect patch for delta: "
-                    + "delta original position > target size");
-        }
-
-    }
-
     @Override
     public String toString() {
         return "[InsertDelta, position: " + getOriginal().getPosition()

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public Chunk(int position, T[] lines) {`
`68`	`68`	`* @param target the sequence to verify against.`
`69`	`69`	`*/`
`70`	`70`	`public void verify(List<T> target) throws PatchFailedException {`
`71`		`- if (last() > target.size()) {`
	`71`	`+ if (position > target.size() \|\| last() > target.size()) {`
`72`	`72`	`throw new PatchFailedException("Incorrect Chunk: the position of chunk > target size");`
`73`	`73`	`}`
`74`	`74`	`for (int i = 0; i < size(); i++) {`