Skip to content

Commit 134f80f

Browse files
wumpzwumpz
committed
moved to new main package com.github
1 parent 8f207fe commit 134f80f

34 files changed

+122
-110
lines changed

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,17 @@ This is a test ~senctence~**for diffutils**.
5050
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.
5151

5252
### Changelog ###
53-
* Version 1.4
53+
* Version 2.0
5454
* switch to maven and removed other artifacts
5555
* changed groupid to **com.github.java-diff-utils** due to different forks at github
5656
* updated maven plugins
5757
   * JDK 1.8 compatibility, sorry if you have to stick with older versions
5858
   * support for inline merge
59-
* restructured packages
59+
* restructured packages heavily
6060
* changed API
6161
* changed Algorithm to provide only cursor positions
62-
* integrated JGit (Eclipse Licensed) to provide HistogramDiff to gain speed for large datasets
62+
* integrated JGit (Eclipse Licensed) to provide HistogramDiff to gain speed for large datasets
63+
* removed all kinds of helper classes in favour of new JDK 8 function classes like Predicate
6364
* Version 1.2
6465
* JDK 1.5 compatibility
6566
* Ant build script

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.github.java-diff-utils</groupId>
55
<artifactId>diffutils</artifactId>
66
<packaging>jar</packaging>
7-
<version>1.4.0-SNAPSHOT</version>
7+
<version>2.0-SNAPSHOT</version>
88

99
<name>java-diff-utils</name>
1010
<description>The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.</description>

‎src/main/java/difflib/DiffUtils.java renamed to ‎src/main/java/com/github/difflib/DiffUtils.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
limitations under the License.
1818
* #L%
1919
*/
20-
package difflib;
20+
package com.github.difflib;
2121

22-
import difflib.algorithm.DiffAlgorithm;
23-
import difflib.algorithm.DiffException;
24-
import difflib.algorithm.myers.MyersDiff;
25-
import difflib.patch.Delta;
26-
import difflib.patch.Patch;
27-
import difflib.patch.PatchFailedException;
22+
import com.github.difflib.algorithm.DiffAlgorithm;
23+
import com.github.difflib.algorithm.DiffException;
24+
import com.github.difflib.algorithm.myers.MyersDiff;
25+
import com.github.difflib.patch.Delta;
26+
import com.github.difflib.patch.Patch;
27+
import com.github.difflib.patch.PatchFailedException;
2828
import java.util.Arrays;
2929
import java.util.Collections;
3030
import java.util.LinkedList;

‎src/main/java/difflib/UnifiedDiffUtils.java renamed to ‎src/main/java/com/github/difflib/UnifiedDiffUtils.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package difflib;
16+
package com.github.difflib;
1717

18-
import difflib.patch.ChangeDelta;
19-
import difflib.patch.Chunk;
20-
import difflib.patch.Delta;
21-
import difflib.patch.Patch;
18+
import com.github.difflib.patch.ChangeDelta;
19+
import com.github.difflib.patch.Chunk;
20+
import com.github.difflib.patch.Delta;
21+
import com.github.difflib.patch.Patch;
2222
import java.util.ArrayList;
2323
import java.util.List;
2424
import java.util.regex.Matcher;

‎src/main/java/difflib/algorithm/Change.java renamed to ‎src/main/java/com/github/difflib/algorithm/Change.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package difflib.algorithm;
16+
package com.github.difflib.algorithm;
1717

18-
import difflib.patch.DeltaType;
18+
import com.github.difflib.patch.DeltaType;
1919

2020
/**
2121
*

‎src/main/java/difflib/algorithm/DiffAlgorithm.java renamed to ‎src/main/java/com/github/difflib/algorithm/DiffAlgorithm.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
limitations under the License.
1818
* #L%
1919
*/
20-
package difflib.algorithm;
20+
package com.github.difflib.algorithm;
2121

22-
import difflib.patch.Patch;
22+
import com.github.difflib.patch.Patch;
2323
import java.util.*;
2424

2525
/**

‎src/main/java/difflib/algorithm/DiffException.java renamed to ‎src/main/java/com/github/difflib/algorithm/DiffException.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
limitations under the License.
1818
* #L%
1919
*/
20-
package difflib.algorithm;
20+
package com.github.difflib.algorithm;
2121

2222
public class DiffException extends Exception {
2323

‎src/main/java/difflib/algorithm/DifferentiationFailedException.java renamed to ‎src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
limitations under the License.
1818
* #L%
1919
*/
20-
package difflib.algorithm;
20+
package com.github.difflib.algorithm;
2121

22-
import difflib.algorithm.DiffException;
22+
import com.github.difflib.algorithm.DiffException;
2323

2424
/**
2525
* Thrown whenever the differencing engine cannot produce the differences between two revisions of

‎src/main/java/difflib/algorithm/jgit/JGitDiff.java renamed to ‎src/main/java/com/github/difflib/algorithm/jgit/JGitDiff.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package difflib.algorithm.jgit;
16+
package com.github.difflib.algorithm.jgit;
1717

18-
import difflib.algorithm.Change;
19-
import difflib.algorithm.DiffAlgorithm;
20-
import difflib.algorithm.DiffException;
21-
import difflib.patch.DeltaType;
18+
import com.github.difflib.algorithm.Change;
19+
import com.github.difflib.algorithm.DiffAlgorithm;
20+
import com.github.difflib.algorithm.DiffException;
21+
import com.github.difflib.patch.DeltaType;
2222
import java.util.ArrayList;
2323
import java.util.List;
2424
import java.util.Objects;

‎src/main/java/difflib/algorithm/myers/MyersDiff.java renamed to ‎src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
limitations under the License.
1818
* #L%
1919
*/
20-
package difflib.algorithm.myers;
21-
22-
import difflib.algorithm.Change;
23-
import difflib.algorithm.DifferentiationFailedException;
24-
import difflib.algorithm.DiffAlgorithm;
25-
import difflib.algorithm.DiffException;
26-
import difflib.patch.DeltaType;
27-
import difflib.patch.Patch;
20+
package com.github.difflib.algorithm.myers;
21+
22+
import com.github.difflib.algorithm.Change;
23+
import com.github.difflib.algorithm.DifferentiationFailedException;
24+
import com.github.difflib.algorithm.DiffAlgorithm;
25+
import com.github.difflib.algorithm.DiffException;
26+
import com.github.difflib.patch.DeltaType;
27+
import com.github.difflib.patch.Patch;
2828
import java.util.ArrayList;
2929
import java.util.List;
3030
import java.util.Objects;

0 commit comments

Comments
 (0)