diff --git a/.idea/ant.xml b/.idea/ant.xml deleted file mode 100644 index 6ddee46..0000000 --- a/.idea/ant.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 5267941..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index b385f01..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 7c62b52..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/libraries/Maven__junit_junit_4_8_1.xml b/.idea/libraries/Maven__junit_junit_4_8_1.xml deleted file mode 100644 index 21ab8f0..0000000 --- a/.idea/libraries/Maven__junit_junit_4_8_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 9835fae..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index fd2ff8f..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 1e7cce4..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,125 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index cce6fd9..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/README.md b/README.md index 39dc34a..4b15dfe 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ Diff Utils library is an OpenSource library for performing the comparison operat Main reason to build this library was the lack of easy-to-use libraries with all the usual stuff you need while working with diff files. Originally it was inspired by JRCS library and it's nice design of diff module. +This is originally a fork of java-diff-utils from Google Code Archive. + ## Main Features ## * computing the difference between two texts. @@ -16,7 +18,11 @@ Main reason to build this library was the lack of easy-to-use libraries with all This library implements Myer's diff algorithm. But it can easily replaced by any other which is better for handing your texts. I have plan to add implementation of some in future. ### Changelog ### - + * Version 1.4 + * switch to maven and removed other artifacts + * changed groupid to *com.github.java-diff-utils* due to different forks at github + * updated maven plugins + * JDK 1.7 compatibility * Version 1.2 * JDK 1.5 compatibility * Ant build script @@ -24,20 +30,17 @@ This library implements Myer's diff algorithm. But it can easily replaced by any ### To Install ### +This jar is not yet to get at maven central. + Just add the code below to your maven dependencies: ``` - com.googlecode.java-diff-utils + com.github.java-diff-utils diffutils 1.2.1 ``` -And for Ivy: -``` - -``` - ## Coming eventually ## * support for inline diffs in output diff --git a/build.xml b/build.xml deleted file mode 100644 index 621d364..0000000 --- a/build.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 15a78b2..bbd9ffc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,24 +1,24 @@ 4.0.0 - com.googlecode.java-diff-utils + com.github.java-diff-utils diffutils jar 1.4.0-SNAPSHOT java-diff-utils The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java. - http://code.google.com/p/java-diff-utils/ + https://github.com/wumpz/java-diff-utils 2009 org.sonatype.oss oss-parent - 7 + 9 - scm:svn:http://java-diff-utils.googlecode.com/svn/trunk/ - scm:svn:https://java-diff-utils.googlecode.com/svn/trunk/ - http://code.google.com/p/java-diff-utils/source/browse/ + scm:git:https://github.com/wumpz/java-diff-utils.git + scm:git:ssh://git@github.com:wumpz/java-diff-utils.git + https://github.com/wumpz/java-diff-utils.git @@ -37,7 +37,7 @@ junit junit - 4.11 + 4.12 jar test @@ -49,10 +49,10 @@ org.apache.maven.plugins maven-compiler-plugin - 2.3.2 + 3.6.1 - 1.5 - 1.5 + 1.7 + 1.7 UTF-8 @@ -63,7 +63,7 @@ --> maven-jar-plugin - 2.4 + 3.0.2 ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -73,7 +73,7 @@ org.apache.felix maven-bundle-plugin - 2.3.7 + 3.3.0 bundle-manifest @@ -84,9 +84,7 @@ - - diff --git a/src/main/java/difflib/DiffRow.java b/src/main/java/difflib/DiffRow.java index 6f8234b..a0a01cb 100644 --- a/src/main/java/difflib/DiffRow.java +++ b/src/main/java/difflib/DiffRow.java @@ -125,6 +125,7 @@ public class DiffRow { return true; } + @Override public String toString() { return "[" + this.tag + "," + this.oldLine + "," + this.newLine + "]"; } diff --git a/src/main/java/difflib/DiffRowGenerator.java b/src/main/java/difflib/DiffRowGenerator.java index d6ffb6b..2f6b4d3 100644 --- a/src/main/java/difflib/DiffRowGenerator.java +++ b/src/main/java/difflib/DiffRowGenerator.java @@ -17,7 +17,6 @@ package difflib; import difflib.DiffRow.Tag; import difflib.myers.Equalizer; - import java.util.*; /** diff --git a/src/main/java/difflib/DiffUtils.java b/src/main/java/difflib/DiffUtils.java index 62247b3..8b8ce87 100644 --- a/src/main/java/difflib/DiffUtils.java +++ b/src/main/java/difflib/DiffUtils.java @@ -17,7 +17,6 @@ package difflib; import difflib.myers.Equalizer; import difflib.myers.MyersDiff; - import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; @@ -159,7 +158,7 @@ public class DiffUtils { Matcher m = unifiedDiffChunkRe.matcher(line); if (m.find()) { // Process the lines in the previous chunk - if (rawChunk.size() != 0) { + if (!rawChunk.isEmpty()) { List oldChunkLines = new ArrayList(); List newChunkLines = new ArrayList(); @@ -202,7 +201,7 @@ public class DiffUtils { } // Process the lines in the last chunk - if (rawChunk.size() != 0) { + if (!rawChunk.isEmpty()) { List oldChunkLines = new ArrayList(); List newChunkLines = new ArrayList(); diff --git a/src/main/java/difflib/myers/MyersDiff.java b/src/main/java/difflib/myers/MyersDiff.java index 40be478..3ef17b5 100644 --- a/src/main/java/difflib/myers/MyersDiff.java +++ b/src/main/java/difflib/myers/MyersDiff.java @@ -58,7 +58,6 @@ package difflib.myers; import difflib.*; - import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/difflib/myers/PathNode.java b/src/main/java/difflib/myers/PathNode.java index 4ead5f2..a1fa3a0 100644 --- a/src/main/java/difflib/myers/PathNode.java +++ b/src/main/java/difflib/myers/PathNode.java @@ -123,6 +123,7 @@ public abstract class PathNode { /** * {@inheritDoc} */ + @Override public String toString() { StringBuffer buf = new StringBuffer("["); PathNode node = this; diff --git a/src/test/java/diffutils/DiffRowGeneratorTest.java b/src/test/java/diffutils/DiffRowGeneratorTest.java index de209d4..57af39c 100644 --- a/src/test/java/diffutils/DiffRowGeneratorTest.java +++ b/src/test/java/diffutils/DiffRowGeneratorTest.java @@ -1,11 +1,9 @@ package diffutils; -import java.util.Arrays; -import java.util.List; - import difflib.DiffRow; import difflib.DiffRowGenerator; - +import java.util.Arrays; +import java.util.List; import junit.framework.TestCase; public class DiffRowGeneratorTest extends TestCase { diff --git a/src/test/java/diffutils/DiffTest.java b/src/test/java/diffutils/DiffTest.java index 6d1ef31..87d9bac 100644 --- a/src/test/java/diffutils/DiffTest.java +++ b/src/test/java/diffutils/DiffTest.java @@ -1,12 +1,11 @@ package diffutils; import difflib.*; -import junit.framework.TestCase; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; +import junit.framework.TestCase; public class DiffTest extends TestCase { diff --git a/src/test/java/diffutils/GenerateUnifiedDiffTest.java b/src/test/java/diffutils/GenerateUnifiedDiffTest.java index 64432db..3b93cb0 100644 --- a/src/test/java/diffutils/GenerateUnifiedDiffTest.java +++ b/src/test/java/diffutils/GenerateUnifiedDiffTest.java @@ -1,5 +1,8 @@ package diffutils; +import difflib.DiffUtils; +import difflib.Patch; +import difflib.PatchFailedException; import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; @@ -7,11 +10,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; - import junit.framework.TestCase; -import difflib.DiffUtils; -import difflib.Patch; -import difflib.PatchFailedException; public class GenerateUnifiedDiffTest extends TestCase { diff --git a/src/test/java/diffutils/PatchTest.java b/src/test/java/diffutils/PatchTest.java index b6b4d74..5c03f7e 100644 --- a/src/test/java/diffutils/PatchTest.java +++ b/src/test/java/diffutils/PatchTest.java @@ -3,10 +3,9 @@ package diffutils; import difflib.DiffUtils; import difflib.Patch; import difflib.PatchFailedException; -import junit.framework.TestCase; - import java.util.Arrays; import java.util.List; +import junit.framework.TestCase; public class PatchTest extends TestCase { diff --git a/src/test/java/diffutils/examples/ApplyPatch.java b/src/test/java/diffutils/examples/ApplyPatch.java index 7ec1b45..9fd8dcb 100644 --- a/src/test/java/diffutils/examples/ApplyPatch.java +++ b/src/test/java/diffutils/examples/ApplyPatch.java @@ -1,11 +1,10 @@ package diffutils.examples; -import java.util.List; - import difflib.DiffUtils; import difflib.Patch; import difflib.PatchFailedException; import diffutils.TestConstants; +import java.util.List; public class ApplyPatch extends Example { diff --git a/src/test/java/diffutils/examples/ComputeDifference.java b/src/test/java/diffutils/examples/ComputeDifference.java index a1a3eb1..ecfc592 100644 --- a/src/test/java/diffutils/examples/ComputeDifference.java +++ b/src/test/java/diffutils/examples/ComputeDifference.java @@ -1,11 +1,10 @@ package diffutils.examples; -import java.util.List; - import difflib.Delta; import difflib.DiffUtils; import difflib.Patch; import diffutils.TestConstants; +import java.util.List; public class ComputeDifference extends Example {