java/java-diff-utils
1
0
Fork 0
mirror of https://github.com/java-diff-utils/java-diff-utils.git synced 2026-03-13 10:11:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: java:diffutils-3.0
Branches Tags
java:master java:dependabot/maven/org.assertj-assertj-core-3.27.7 java:introduce-optimized-meyers-algorithm java:gh-pages
java:java-diff-utils-parent-4.16 java:java-diff-utils-parent-4.15 java:java-diff-utils-parent-4.12 java:java-diff-utils-parent-4.11 java:java-diff-utils-parent-4.10 java:java-diff-utils-parent-4.9 java:java-diff-utils-parent-4.8 java:java-diff-utils-parent-4.7 java:java-diff-utils-parent-4.5 java:java-diff-utils-parent-4.4 java:java-diff-utils-4.0 java:diffutils-3.0 java:diffutils-2.2 java:diffutils-2.1 java:diffutils-2.0
...
compare: java:java-diff-utils-4.0
Branches Tags
java:dependabot/maven/org.assertj-assertj-core-3.27.7 java:master java:introduce-optimized-meyers-algorithm java:gh-pages
java:java-diff-utils-parent-4.16 java:java-diff-utils-parent-4.15 java:java-diff-utils-parent-4.12 java:java-diff-utils-parent-4.11 java:java-diff-utils-parent-4.10 java:java-diff-utils-parent-4.9 java:java-diff-utils-parent-4.8 java:java-diff-utils-parent-4.7 java:java-diff-utils-parent-4.5 java:java-diff-utils-parent-4.4 java:java-diff-utils-4.0 java:diffutils-3.0 java:diffutils-2.2 java:diffutils-2.1 java:diffutils-2.0

11 Commits
diffutils- ... java-diff-

Author SHA1 Message Date
wumpz
4bab820483 [maven-release-plugin] prepare release java-diff-utils-4.0 2018-11-22 21:50:52 +01:00
wumpz
4fe80bdf1e changed readme to new home 2018-11-16 00:30:34 +01:00
wumpz
005ba349f8 2018-11-15 17:32:08 +01:00
wumpz
0fbbb53b77 2018-11-12 18:10:49 +01:00
wumpz
d5fbf5022e changed groupid, artifactid 
moved to new organistion java-diff-utils
switched to version 4.0-SNAPSHOT
 2018-11-04 22:56:17 +01:00
Tobias
2c85597238 Merge pull request #28 from koppor/fix-headers 
Reformat Apache 2.0 headers (remove #%L things)
 2018-10-28 18:09:06 +01:00
Tobias
f88ce15ff8 Merge pull request #27 from koppor/use-objects-hash 
Use Objects.hash() instead of custom hashCode() method
 2018-10-28 18:08:50 +01:00
Oliver Kopp
30a23c00d1 Reformat Apache 2.0 headers (remove #%L things) 2018-10-28 17:25:20 +01:00
Oliver Kopp
306f92684f Use Objects.hash() instead of custom hashCode() method 2018-10-28 17:13:03 +01:00
wumpz
d4f114226d fixes #26 2018-10-18 21:52:57 +02:00
wumpz
65183197c5 [maven-release-plugin] prepare for next development iteration 2018-10-18 21:39:22 +02:00
17 changed files with 463 additions and 535 deletions
Expand all files Collapse all files

20
README.md
View File

@@ -1,7 +1,7 @@
# java-diff-utils # java-diff-utils
## Status ## ## Status ##
[![Build Status](https://travis-ci.org/wumpz/java-diff-utils.svg?branch=master)](https://travis-ci.org/wumpz/java-diff-utils) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=wumpz/java-diff-utils&utm_campaign=Badge_Grade) [![Build Status](https://travis-ci.org/wumpz/java-diff-utils.svg?branch=master)](https://travis-ci.org/java-diff-utils/java-diff-utils) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/7eba77f10bed4c2a8d08ac8dc8da4a86)](https://www.codacy.com/app/wumpz/java-diff-utils?utm_source=github.com&utm_medium=referral&utm_content=java-diff-utils/java-diff-utils&utm_campaign=Badge_Grade)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.wumpz/diffutils/badge.svg)](http://maven-badges.herokuapp.com/maven-central/com.github.wumpz/diffutils) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.wumpz/diffutils/badge.svg)](http://maven-badges.herokuapp.com/maven-central/com.github.wumpz/diffutils)
@@ -52,7 +52,10 @@ This is a test ~senctence~**for diffutils**.
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. 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 ### ### Changelog ###
* Version 3.0-SNAPSHOT * Version 4.0-SNAPSHOT
* moved to organisation **java-diff-utils**
* changed groupid to **io.github.java-diff-utils** and artifact id to **java-diff-utils**
* Version 3.0
* changed generation of inline diffes, if there are different linefeeds within one diff, then these are excluded * changed generation of inline diffes, if there are different linefeeds within one diff, then these are excluded
from the diff block. from the diff block.
* Due to licensing issues Delta.java and DiffAlgorithm.java were removed. * Due to licensing issues Delta.java and DiffAlgorithm.java were removed.
@@ -108,9 +111,20 @@ Just add the code below to your maven dependencies:
<dependency> <dependency>
<groupId>com.github.wumpz</groupId> <groupId>com.github.wumpz</groupId>
<artifactId>diffutils</artifactId> <artifactId>diffutils</artifactId>
   <version>2.2</version>    <version>3.0</version>
</dependency> </dependency>
``` ```
Attention. We changed groupid and artifactid. Starting with version 4 you have to use:
```
<dependency>
<groupId>io.github.java-diff-utils</groupId>
<artifactId>java-diff-utils</artifactId>
<version>4.0-SNAPSHOT</version>
</dependency>
```
or using gradle: or using gradle:
``` ```
// https://mvnrepository.com/artifact/com.github.wumpz/diffutils // https://mvnrepository.com/artifact/com.github.wumpz/diffutils

516
pom.xml
View File

@@ -1,253 +1,255 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.github.wumpz</groupId> <groupId>io.github.java-diff-utils</groupId>
<artifactId>diffutils</artifactId> <artifactId>java-diff-utils</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>3.0</version> <version>4.0</version>
<name>java-diff-utils</name> <name>java-diff-utils</name>
<description>The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.</description> <description>The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.</description>
<url>https://github.com/wumpz/java-diff-utils</url> <url>https://github.com/java-diff-utils/java-diff-utils</url>
<inceptionYear>2009</inceptionYear> <inceptionYear>2009</inceptionYear>
<distributionManagement> <distributionManagement>
<repository> <repository>
<id>sonatype-nexus-staging</id> <id>sonatype-nexus-staging</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url> <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository> </repository>
<snapshotRepository> <snapshotRepository>
<id>sonatype-nexus-snapshots</id> <id>sonatype-nexus-snapshots</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url> <url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository> </snapshotRepository>
</distributionManagement> </distributionManagement>
<scm> <scm>
<connection>scm:git:https://github.com/wumpz/java-diff-utils.git</connection> <connection>scm:git:https://github.com/java-diff-utils/java-diff-utils.git</connection>
<developerConnection>scm:git:ssh://git@github.com:wumpz/java-diff-utils.git</developerConnection> <developerConnection>scm:git:ssh://git@github.com:java-diff-utils/java-diff-utils.git</developerConnection>
<url>https://github.com/wumpz/java-diff-utils.git</url> <url>https://github.com/java-diff-utils/java-diff-utils.git</url>
<tag>diffutils-3.0</tag> <tag>java-diff-utils-4.0</tag>
</scm> </scm>
<issueManagement> <issueManagement>
<system>GitHub Issues</system> <system>GitHub Issues</system>
<url>https://github.com/wumpz/java-diff-utils/issues</url> <url>https://github.com/java-diff-utils/java-diff-utils/issues</url>
</issueManagement> </issueManagement>
<organization> <organization>
<name>java-diff-utils</name> <name>java-diff-utils</name>
</organization> </organization>
<developers> <developers>
<developer> <developer>
<name>Tobias Warneke</name> <name>Tobias Warneke</name>
<email>t.warneke@gmx.net</email> <email>t.warneke@gmx.net</email>
</developer> </developer>
<developer> <!--
<name>Dmitry Naumenko</name> <developer>
<email>dm.naumenko@gmail.com</email> <name>Dmitry Naumenko</name>
</developer> <email>dm.naumenko@gmail.com</email>
<developer> </developer>
<name>Juanco Anez</name> <developer>
<email>juanco@suigeneris.org</email> <name>Juanco Anez</name>
</developer> <email>juanco@suigeneris.org</email>
</developers> </developer>
-->
</developers>
<licenses> <licenses>
<license> <license>
<name>The Apache Software License, Version 2.0</name> <name>The Apache Software License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution> <distribution>repo</distribution>
<comments>A business-friendly OSS license</comments> <comments>A business-friendly OSS license</comments>
</license> </license>
</licenses> </licenses>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.12</version> <version>4.12</version>
<type>jar</type> <type>jar</type>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jgit</groupId> <groupId>org.eclipse.jgit</groupId>
<artifactId>org.eclipse.jgit</artifactId> <artifactId>org.eclipse.jgit</artifactId>
<version>4.4.1.201607150455-r</version> <version>4.4.1.201607150455-r</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>com.googlecode.javaewah</groupId> <groupId>com.googlecode.javaewah</groupId>
<artifactId>JavaEWAH</artifactId> <artifactId>JavaEWAH</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.apache.httpcomponents</groupId> <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId> <artifactId>httpclient</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>com.jcraft</groupId> <groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId> <artifactId>jsch</artifactId>
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version> <version>3.6.1</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
<!-- Make this JAR OSGi ready --> <!-- Make this JAR OSGi ready -->
<!-- We want to keep packaging type as jar. Therefore we need to customize the MANIFEST.MF. <!-- We want to keep packaging type as jar. Therefore we need to customize the MANIFEST.MF.
See http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html See http://felix.apache.org/site/apache-felix-maven-bundle-plugin-bnd.html
--> -->
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version> <version>3.0.2</version>
<configuration> <configuration>
<archive> <archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile> <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries> <manifestEntries>
<!-- identical to OSGI name --> <!-- identical to OSGI name -->
<Automatic-Module-Name>com.github.wumpz.diffutils</Automatic-Module-Name> <Automatic-Module-Name>com.github.wumpz.diffutils</Automatic-Module-Name>
</manifestEntries> </manifestEntries>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<version>3.3.0</version> <version>3.3.0</version>
<executions> <executions>
<execution> <execution>
<id>bundle-manifest</id> <id>bundle-manifest</id>
<phase>process-classes</phase> <phase>process-classes</phase>
<goals> <goals>
<goal>manifest</goal> <goal>manifest</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version> <version>2.10.4</version>
<configuration> <configuration>
<additionalparam>${javadoc.opts}</additionalparam> <additionalparam>${javadoc.opts}</additionalparam>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version> <version>2.19.1</version>
<configuration> <configuration>
<excludes> <excludes>
<exclude>**/LR*.java</exclude> <exclude>**/LR*.java</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.5.3</version> <version>2.5.3</version>
<configuration> <configuration>
<localCheckout>true</localCheckout> <localCheckout>true</localCheckout>
<pushChanges>false</pushChanges> <pushChanges>false</pushChanges>
<mavenExecutorId>forked-path</mavenExecutorId> <mavenExecutorId>forked-path</mavenExecutorId>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version> <version>2.17</version>
<executions> <executions>
<execution> <execution>
<id>verify-style</id> <id>verify-style</id>
<phase>process-classes</phase> <phase>process-classes</phase>
<goals> <goals>
<goal>check</goal> <goal>check</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<logViolationsToConsole>true</logViolationsToConsole> <logViolationsToConsole>true</logViolationsToConsole>
<includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestSourceDirectory>true</includeTestSourceDirectory>
<sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
<checkstyleRules> <checkstyleRules>
<module name="Checker"> <module name="Checker">
<module name="SuppressWarningsFilter" /> <module name="SuppressWarningsFilter" />
<module name="FileTabCharacter" /> <module name="FileTabCharacter" />
<!-- git checkout may change linefeeds on the fly <!-- git checkout may change linefeeds on the fly
<module name="RegexpMultiline"> <module name="RegexpMultiline">
<property name="format" value="(?s:(\r\n|\r).*)" /> <property name="format" value="(?s:(\r\n|\r).*)" />
<property name="message" value="CRLF and CR line endings are prohibited, but this file uses them." /> <property name="message" value="CRLF and CR line endings are prohibited, but this file uses them." />
</module> </module>
--> -->
<module name="TreeWalker"> <module name="TreeWalker">
<module name="AvoidNestedBlocks" /> <module name="AvoidNestedBlocks" />
<module name="ConstantName" /> <module name="ConstantName" />
<module name="EmptyCatchBlock" /> <module name="EmptyCatchBlock" />
<module name="EmptyStatement" /> <module name="EmptyStatement" />
<module name="MissingOverride" /> <module name="MissingOverride" />
<module name="MultipleVariableDeclarations" /> <module name="MultipleVariableDeclarations" />
<module name="ParameterAssignment" /> <module name="ParameterAssignment" />
<module name="StringLiteralEquality" /> <module name="StringLiteralEquality" />
<module name="RedundantImport" /> <module name="RedundantImport" />
<module name="UnusedImports" /> <module name="UnusedImports" />
<module name="WhitespaceAfter" /> <module name="WhitespaceAfter" />
<module name="NeedBraces" /> <module name="NeedBraces" />
<module name="UnnecessaryParentheses" /> <module name="UnnecessaryParentheses" />
<module name="LeftCurly" /> <module name="LeftCurly" />
<module name="RightCurly" /> <module name="RightCurly" />
<module name="SuppressWarningsHolder" /> <module name="SuppressWarningsHolder" />
</module> </module>
</module> </module>
</checkstyleRules> </checkstyleRules>
</configuration> </configuration>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.puppycrawl.tools</groupId> <groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId> <artifactId>checkstyle</artifactId>
<version>6.19</version> <version>6.19</version>
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile> <profile>
<id>sign-release-artifacts</id> <id>sign-release-artifacts</id>
<activation> <activation>
@@ -278,31 +280,31 @@
</plugins> </plugins>
</build> </build>
</profile> </profile>
<profile> <profile>
<id>doclint-java8-disable</id> <id>doclint-java8-disable</id>
<activation> <activation>
<jdk>[1.8,)</jdk> <jdk>[1.8,)</jdk>
</activation> </activation>
<properties> <properties>
<javadoc.opts>-Xdoclint:none</javadoc.opts> <javadoc.opts>-Xdoclint:none</javadoc.opts>
</properties> </properties>
</profile> </profile>
<profile> <profile>
<id>long-running-tests</id> <id>long-running-tests</id>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<excludes> <excludes>
<exclude>xxx</exclude> <exclude>xxx</exclude>
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>
</profiles> </profiles>
</project> </project>

30
src/main/java/com/github/difflib/DiffUtils.java
View File

@@ -1,21 +1,17 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib; package com.github.difflib;

30
src/main/java/com/github/difflib/algorithm/DiffException.java
View File

@@ -1,21 +1,17 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.algorithm; package com.github.difflib.algorithm;

30
src/main/java/com/github/difflib/algorithm/DifferentiationFailedException.java
View File

@@ -1,21 +1,17 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.algorithm; package com.github.difflib.algorithm;

30
src/main/java/com/github/difflib/algorithm/myers/MyersDiff.java
View File

@@ -1,21 +1,17 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.algorithm.myers; package com.github.difflib.algorithm.myers;

30
src/main/java/com/github/difflib/algorithm/myers/PathNode.java
View File

@@ -1,21 +1,17 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.algorithm.myers; package com.github.difflib.algorithm.myers;

6
src/main/java/com/github/difflib/patch/AbstractDelta.java
View File

@@ -63,11 +63,7 @@ public abstract class AbstractDelta<T> {
@Override @Override
public int hashCode() { public int hashCode() {
int hash = 3; return Objects.hash(this.source, this.target, this.type);
hash = 61 * hash + Objects.hashCode(this.source);
hash = 61 * hash + Objects.hashCode(this.target);
hash = 61 * hash + Objects.hashCode(this.type);
return hash;
} }
@Override @Override

30
src/main/java/com/github/difflib/patch/ChangeDelta.java
View File

@@ -1,21 +1,17 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.patch; package com.github.difflib.patch;

48
src/main/java/com/github/difflib/patch/Chunk.java
View File

@@ -1,26 +1,23 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.patch; package com.github.difflib.patch;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* Holds the information about the part of text involved in the diff process * Holds the information about the part of text involved in the diff process
@@ -108,26 +105,11 @@ public final class Chunk<T> {
return getPosition() + size() - 1; return getPosition() + size() - 1;
} }
/*
* (non-Javadoc)
*
* @see java.lang.Object#hashCode()
*/
@Override @Override
public int hashCode() { public int hashCode() {
final int prime = 31; return Objects.hash(lines, position, size());
int result = 1;
result = prime * result + ((lines == null) ? 0 : lines.hashCode());
result = prime * result + position;
result = prime * result + size();
return result;
} }
/*
* (non-Javadoc)
*
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (this == obj) { if (this == obj) {

30
src/main/java/com/github/difflib/patch/DeleteDelta.java
View File

@@ -1,21 +1,17 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.patch; package com.github.difflib.patch;

30
src/main/java/com/github/difflib/patch/DiffException.java
View File

@@ -1,21 +1,17 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.patch; package com.github.difflib.patch;

30
src/main/java/com/github/difflib/patch/InsertDelta.java
View File

@@ -1,21 +1,17 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.patch; package com.github.difflib.patch;

30
src/main/java/com/github/difflib/patch/PatchFailedException.java
View File

@@ -1,21 +1,17 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.patch; package com.github.difflib.patch;

48
src/main/java/com/github/difflib/text/DiffRow.java
View File

@@ -1,25 +1,22 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.text; package com.github.difflib.text;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects;
/** /**
* Describes the diff row in form [tag, oldLine, newLine) for showing the difference between two texts * Describes the diff row in form [tag, oldLine, newLine) for showing the difference between two texts
@@ -70,26 +67,11 @@ public final class DiffRow implements Serializable {
return newLine; return newLine;
} }
/*
* (non-Javadoc)
*
* @see java.lang.Object#hashCode()
*/
@Override @Override
public int hashCode() { public int hashCode() {
final int prime = 31; return Objects.hash(newLine, oldLine, tag);
int result = 1;
result = prime * result + ((newLine == null) ? 0 : newLine.hashCode());
result = prime * result + ((oldLine == null) ? 0 : oldLine.hashCode());
result = prime * result + ((tag == null) ? 0 : tag.hashCode());
return result;
} }
/*
* (non-Javadoc)
*
* @see java.lang.Object#equals(java.lang.Object)
*/
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
if (this == obj) { if (this == obj) {

30
src/main/java/com/github/difflib/text/DiffRowGenerator.java
View File

@@ -1,21 +1,17 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.text; package com.github.difflib.text;

30
src/main/java/com/github/difflib/text/StringUtils.java
View File

@@ -1,21 +1,17 @@
/*- /*
* #%L * Copyright 2009-2017 java-diff-utils.
* java-diff-utils *
* %%
* Copyright (C) 2009 - 2017 java-diff-utils
* %%
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
You may obtain a copy of the License at * You may obtain a copy of the License at
*
http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
*
Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
limitations under the License. * limitations under the License.
* #L%
*/ */
package com.github.difflib.text; package com.github.difflib.text;