Added source jar to pom, Bugfixes

Kogoro · Kogoro · commit 1757a420addf · 2017-11-01T03:30:25.000+01:00
diff --git a/pom.xml b/pom.xml
@@ -159,6 +159,21 @@
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.0.1</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <phase>verify</phase>
                         <goals>
                             <goal>jar</goal>
                         </goals>
diff --git a/src/main/java/com/github/difflib/patch/ChangeDelta.java b/src/main/java/com/github/difflib/patch/ChangeDelta.java
@@ -22,9 +22,7 @@
 import java.util.List;
 
 /**
- * Describes the change-delta between original and revised texts.
- * <p>
- * T The type of the compared elements in the 'lines'.
+ * Describes the change-delta between original and revised texts. <p> T The type of the compared elements in the 'lines'.
  *
  * @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
  */
@@ -71,7 +69,6 @@ public void restore(List<T> target) {
 
     @Override
     public String toString() {
-        return "[ChangeDelta, position: " + getOriginal().getPosition() + ", lines: "
-                + getOriginal().getLines() + " to " + getRevised().getLines() + "]";
+        return "[ChangeDelta, position: " + getOriginal().getPosition() + ", lines: " + getOriginal().getLines() + " to " + getRevised().getLines() + "]";
     }
 }
diff --git a/src/main/java/com/github/difflib/patch/Chunk.java b/src/main/java/com/github/difflib/patch/Chunk.java
@@ -24,14 +24,10 @@
 import java.util.List;
 
 /**
- * Holds the information about the part of text involved in the diff process
- * <p>
- * Text is represented as <code>Object[]</code> because the diff engine is capable of handling more
- * than plain ascci. In fact, arrays or lists of any type that implements
- * {@link java.lang.Object#hashCode hashCode()} and {@link java.lang.Object#equals equals()}
- * correctly can be subject to differencing using this library.
- * </p>
- * T The type of the compared elements in the 'lines'.
+ * Holds the information about the part of text involved in the diff process <p> Text is represented as <code>Object[]</code> because the diff engine is capable
+ * of handling more than plain ascci. In fact, arrays or lists of any type that implements {@link java.lang.Object#hashCode hashCode()} and
+ * {@link java.lang.Object#equals equals()} correctly can be subject to differencing using this library. </p> T The type of the compared elements in the
+ * 'lines'.
  *
  * @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>
  * @author <a href="ch.sontag@gmail.com">Christopher Sontag</a>
@@ -76,17 +72,16 @@ public void verify(List<T> target) throws PatchFailedException {
         }
         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");
+                throw new PatchFailedException("Incorrect Chunk: the chunk content doesn't match the target");
             }
         }
-        for (int i = 0; i < before.size(); i++) {
-            if (!before.get(i).equals(target.get(position - before.size() + i))) {
+        for (int i = before.size(); i > 0; i--) {
+            if (!before.get(before.size() - i).equals(target.get(position - i))) {
                 throw new PatchFailedException("Incorrect Chunk: the chunk's surroundings (before) doesn't match the target");
             }
         }
         for (int i = 0; i < after.size(); i++) {
-            if (!after.get(i).equals(target.get(last() + after.size() - i))) {
+            if (!after.get(i).equals(target.get(last() + i + 1))) {
                 throw new PatchFailedException("Incorrect Chunk: the chunk's surroundings (after) doesn't match the target");
             }
         }
@@ -157,7 +152,6 @@ public void setAfter(List<T> after) {
 
     /*
      * (non-Javadoc)
-     *
      * @see java.lang.Object#hashCode()
      */
     @Override
@@ -172,7 +166,6 @@ public int hashCode() {
 
     /*
      * (non-Javadoc)
-     *
      * @see java.lang.Object#equals(java.lang.Object)
      */
     @Override

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,7 @@`
`22`	`22`	`import java.util.List;`
`23`	`23`
`24`	`24`	`/**`
`25`		`- * Describes the change-delta between original and revised texts.`
`26`		`- * <p>`
`27`		`- * T The type of the compared elements in the 'lines'.`
	`25`	`+ * Describes the change-delta between original and revised texts. <p> T The type of the compared elements in the 'lines'.`
`28`	`26`	`*`
`29`	`27`	`* @author <a href="dm.naumenko@gmail.com">Dmitry Naumenko</a>`
`30`	`28`	`*/`
`@@ -71,7 +69,6 @@ public void restore(List<T> target) {`
`71`	`69`
`72`	`70`	`@Override`
`73`	`71`	`public String toString() {`
`74`		`- return "[ChangeDelta, position: " + getOriginal().getPosition() + ", lines: "`
`75`		`- + getOriginal().getLines() + " to " + getRevised().getLines() + "]";`
	`72`	`+ return "[ChangeDelta, position: " + getOriginal().getPosition() + ", lines: " + getOriginal().getLines() + " to " + getRevised().getLines() + "]";`
`76`	`73`	`}`
`77`	`74`	`}`