refactored whole tooling packages

wumpz · wumpz · commit baf554a14015 · 2017-04-03T14:31:34.000+02:00
diff --git a/src/main/java/difflib/DiffUtils.java b/src/main/java/difflib/DiffUtils.java
@@ -15,8 +15,14 @@
  */
 package difflib;
 
-import difflib.myers.Equalizer;
-import difflib.myers.MyersDiff;
+import difflib.patch.PatchFailedException;
+import difflib.patch.Delta;
+import difflib.patch.Chunk;
+import difflib.patch.Patch;
+import difflib.patch.ChangeDelta;
+import difflib.algorithm.DiffAlgorithm;
+import difflib.algorithm.myers.Equalizer;
+import difflib.algorithm.myers.MyersDiff;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedList;
diff --git a/src/main/java/difflib/algorithm/DiffAlgorithm.java b/src/main/java/difflib/algorithm/DiffAlgorithm.java
@@ -13,8 +13,9 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package difflib;
+package difflib.algorithm;
 
+import difflib.patch.Patch;
 import java.util.*;
 
 /**
diff --git a/src/main/java/difflib/algorithm/myers/DiffException.java b/src/main/java/difflib/algorithm/myers/DiffException.java
@@ -54,7 +54,7 @@
  * <http://www.apache.org/>.
  *
  */
-package difflib.myers;
+package difflib.algorithm.myers;
 
 /**
  * Base class for all exceptions emanating from this package.
diff --git a/src/main/java/difflib/algorithm/myers/DiffNode.java b/src/main/java/difflib/algorithm/myers/DiffNode.java
@@ -1,4 +1,4 @@
-package difflib.myers;
+package difflib.algorithm.myers;
 
 /**
  * <p>
diff --git a/src/main/java/difflib/algorithm/myers/DifferentiationFailedException.java b/src/main/java/difflib/algorithm/myers/DifferentiationFailedException.java
@@ -54,7 +54,7 @@
  * <http://www.apache.org/>.
  *
  */
-package difflib.myers;
+package difflib.algorithm.myers;
 
 /**
  * Thrown whenever the differencing engine cannot produce the differences between two revisions of
diff --git a/src/main/java/difflib/algorithm/myers/Equalizer.java b/src/main/java/difflib/algorithm/myers/Equalizer.java
@@ -1,4 +1,4 @@
-package difflib.myers;
+package difflib.algorithm.myers;
 
 /**
  * Specifies when two compared elements in the Myers algorithm are equal.
diff --git a/src/main/java/difflib/algorithm/myers/MyersDiff.java b/src/main/java/difflib/algorithm/myers/MyersDiff.java
@@ -54,8 +54,15 @@
  * <http://www.apache.org/>.
  *
  */
-package difflib.myers;
+package difflib.algorithm.myers;
 
+import difflib.patch.InsertDelta;
+import difflib.patch.Delta;
+import difflib.patch.Chunk;
+import difflib.patch.Patch;
+import difflib.patch.DeleteDelta;
+import difflib.patch.ChangeDelta;
+import difflib.algorithm.DiffAlgorithm;
 import difflib.*;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
diff --git a/src/main/java/difflib/algorithm/myers/PathNode.java b/src/main/java/difflib/algorithm/myers/PathNode.java
@@ -54,7 +54,7 @@
  * <http://www.apache.org/>.
  *
  */
-package difflib.myers;
+package difflib.algorithm.myers;
 
 /**
  * A node in a diffpath.
diff --git a/src/main/java/difflib/algorithm/myers/Snake.java b/src/main/java/difflib/algorithm/myers/Snake.java
@@ -54,7 +54,7 @@
  * <http://www.apache.org/>.
  *
  */
-package difflib.myers;
+package difflib.algorithm.myers;
 
 /**
  * Represents a snake in a diffpath.
diff --git a/src/main/java/difflib/algorithm/myers/package.html b/src/main/java/difflib/algorithm/myers/package.html
diff --git a/src/main/java/difflib/package.html b/src/main/java/difflib/package.html
diff --git a/src/main/java/difflib/patch/ChangeDelta.java b/src/main/java/difflib/patch/ChangeDelta.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package difflib;
+package difflib.patch;
 
 import java.util.List;
 
@@ -32,7 +32,7 @@ public final class ChangeDelta<T> extends Delta<T> {
      * @param revised The original chunk. Must not be {@code null}.
      */
     public ChangeDelta(Chunk<T> original, Chunk<T> revised) {
-        super(TYPE.CHANGE, original, revised);
+        super(DeltaType.CHANGE, original, revised);
     }
 
     /**
diff --git a/src/main/java/difflib/patch/Chunk.java b/src/main/java/difflib/patch/Chunk.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package difflib;
+package difflib.patch;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/java/difflib/patch/DeleteDelta.java b/src/main/java/difflib/patch/DeleteDelta.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package difflib;
+package difflib.patch;
 
 import java.util.List;
 
@@ -32,7 +32,7 @@ public final class DeleteDelta<T> extends Delta<T> {
      * @param revised The original chunk. Must not be {@code null}.
      */
     public DeleteDelta(Chunk<T> original, Chunk<T> revised) {
-        super(TYPE.DELETE, original, revised);
+        super(DeltaType.DELETE, original, revised);
     }
 
     /**
diff --git a/src/main/java/difflib/patch/Delta.java b/src/main/java/difflib/patch/Delta.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package difflib;
+package difflib.patch;
 
 import java.util.*;
 
@@ -25,15 +25,15 @@
  */
 public abstract class Delta<T> {
 
-    private final TYPE deltaType;
+    private final DeltaType deltaType;
     private final Chunk<T> original;
     private final Chunk<T> revised;
 
     /**
      * Specifies the type of the delta.
      *
      */
-    public static enum TYPE {
+    public static enum DeltaType {
         /**
          * A change in the original.
          */
@@ -54,7 +54,7 @@ public static enum TYPE {
      * @param original Chunk describing the original text. Must not be {@code null}.
      * @param revised Chunk describing the revised text. Must not be {@code null}.
      */
-    public Delta(TYPE deltaType, Chunk<T> original, Chunk<T> revised) {
+    public Delta(DeltaType deltaType, Chunk<T> original, Chunk<T> revised) {
         if (deltaType == null) {
             throw new IllegalArgumentException("deltaType must not be null");
         }
@@ -92,7 +92,7 @@ public Delta(TYPE deltaType, Chunk<T> original, Chunk<T> revised) {
      */
     public abstract void restore(List<T> target);
 
-    public final TYPE getType() {
+    public final DeltaType getType() {
         return deltaType;
     }
 
diff --git a/src/main/java/difflib/patch/DeltaComparator.java b/src/main/java/difflib/patch/DeltaComparator.java
@@ -1,4 +1,4 @@
-package difflib;
+package difflib.patch;
 
 import java.io.Serializable;
 import java.util.Comparator;
diff --git a/src/main/java/difflib/patch/DiffException.java b/src/main/java/difflib/patch/DiffException.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package difflib;
+package difflib.patch;
 
 /**
  * Base class for all exceptions emanating from this package.
diff --git a/src/main/java/difflib/patch/InsertDelta.java b/src/main/java/difflib/patch/InsertDelta.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package difflib;
+package difflib.patch;
 
 import java.util.List;
 
@@ -32,7 +32,7 @@ public final class InsertDelta<T> extends Delta<T> {
      * @param revised The original chunk. Must not be {@code null}.
      */
     public InsertDelta(Chunk<T> original, Chunk<T> revised) {
-        super(TYPE.INSERT, original, revised);
+        super(DeltaType.INSERT, original, revised);
     }
 
     /**
diff --git a/src/main/java/difflib/patch/Patch.java b/src/main/java/difflib/patch/Patch.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package difflib;
+package difflib.patch;
 
 import java.util.Collections;
 import java.util.LinkedList;
diff --git a/src/main/java/difflib/patch/PatchFailedException.java b/src/main/java/difflib/patch/PatchFailedException.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package difflib;
+package difflib.patch;
 
 /**
  * Thrown whenever a delta cannot be applied as a patch to a given text.
diff --git a/src/main/java/difflib/text/DiffRow.java b/src/main/java/difflib/text/DiffRow.java
@@ -13,7 +13,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package difflib.rows;
+package difflib.text;
 
 /**
  * Describes the diff row in form [tag, oldLine, newLine) for showing the difference between two
diff --git a/src/main/java/difflib/text/DiffRowGenerator.java b/src/main/java/difflib/text/DiffRowGenerator.java
@@ -13,18 +13,17 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package difflib.rows;
+package difflib.text;
 
-import difflib.ChangeDelta;
-import difflib.Chunk;
-import difflib.DeleteDelta;
-import difflib.Delta;
-import difflib.rows.DiffRow.Tag;
+import difflib.patch.ChangeDelta;
+import difflib.patch.Chunk;
+import difflib.patch.DeleteDelta;
+import difflib.patch.Delta;
+import difflib.text.DiffRow.Tag;
 import difflib.DiffUtils;
-import difflib.InsertDelta;
-import difflib.Patch;
-import difflib.StringUtils;
-import difflib.myers.Equalizer;
+import difflib.patch.InsertDelta;
+import difflib.patch.Patch;
+import difflib.algorithm.myers.Equalizer;
 import java.util.*;
 
 /**
diff --git a/src/main/java/difflib/text/StringUtils.java b/src/main/java/difflib/text/StringUtils.java
@@ -13,36 +13,13 @@
    See the License for the specific language governing permissions and
    limitations under the License.
  */
-package difflib;
+package difflib.text;
 
-import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
 public final class StringUtils {
 
-    public static <T> String join(final Iterable<T> objs, final String delimiter) {
-        Iterator<T> iter = objs.iterator();
-        if (!iter.hasNext()) {
-            return "";
-        }
-        StringBuffer buffer = new StringBuffer(String.valueOf(iter.next()));
-        while (iter.hasNext()) {
-            buffer.append(delimiter).append(String.valueOf(iter.next()));
-        }
-        return buffer.toString();
-    }
-
-    /**
-     * Replaces all tabs with 4 spaces.
-     *
-     * @param str The string.
-     * @return
-     */
-    public static String expandTabs(String str) {
-        return str.replace("\t", "    ");
-    }
-
     /**
      * Replaces all opening an closing tags with <code>&lt;</code> or <code>&gt;</code>.
      *
@@ -54,7 +31,7 @@ public static String htmlEntites(String str) {
     }
 
     public static String normalize(String str) {
-        return expandTabs(htmlEntites(str));
+        return htmlEntites(str).replace("\t", "    ");
     }
 
     public static List<String> normalize(List<String> list) {
diff --git a/src/test/java/diffutils/DiffUtilsTest.java b/src/test/java/diffutils/DiffUtilsTest.java
@@ -1,5 +1,11 @@
 package diffutils;
 
+import difflib.patch.InsertDelta;
+import difflib.patch.Delta;
+import difflib.patch.Chunk;
+import difflib.patch.ChangeDelta;
+import difflib.patch.Patch;
+import difflib.patch.DeleteDelta;
 import difflib.*;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/test/java/diffutils/GenerateUnifiedDiffTest.java b/src/test/java/diffutils/GenerateUnifiedDiffTest.java
@@ -1,8 +1,8 @@
 package diffutils;
 
 import difflib.DiffUtils;
-import difflib.Patch;
-import difflib.PatchFailedException;
+import difflib.patch.Patch;
+import difflib.patch.PatchFailedException;
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.IOException;
diff --git a/src/test/java/diffutils/examples/ApplyPatch.java b/src/test/java/diffutils/examples/ApplyPatch.java
@@ -1,8 +1,8 @@
 package diffutils.examples;
 
 import difflib.DiffUtils;
-import difflib.Patch;
-import difflib.PatchFailedException;
+import difflib.patch.Patch;
+import difflib.patch.PatchFailedException;
 import diffutils.TestConstants;
 import java.util.List;
 
diff --git a/src/test/java/diffutils/examples/ComputeDifference.java b/src/test/java/diffutils/examples/ComputeDifference.java
@@ -1,8 +1,8 @@
 package diffutils.examples;
 
-import difflib.Delta;
+import difflib.patch.Delta;
 import difflib.DiffUtils;
-import difflib.Patch;
+import difflib.patch.Patch;
 import diffutils.TestConstants;
 import java.util.List;
 
diff --git a/src/test/java/diffutils/patch/PatchTest.java b/src/test/java/diffutils/patch/PatchTest.java
@@ -1,8 +1,8 @@
-package diffutils;
+package diffutils.patch;
 
 import difflib.DiffUtils;
-import difflib.Patch;
-import difflib.PatchFailedException;
+import difflib.patch.Patch;
+import difflib.patch.PatchFailedException;
 import java.util.Arrays;
 import java.util.List;
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/diffutils/rows/DiffRowGeneratorTest.java b/src/test/java/diffutils/rows/DiffRowGeneratorTest.java

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`* <http://www.apache.org/>.`
`55`	`55`	`*`
`56`	`56`	`*/`
`57`		`-package difflib.myers;`
	`57`	`+package difflib.algorithm.myers;`
`58`	`58`
`59`	`59`	`/**`
`60`	`60`	`* Base class for all exceptions emanating from this package.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package difflib.myers;`
	`1`	`+package difflib.algorithm.myers;`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* <p>`