Commit306f926

committed

Use Objects.hash() instead of custom hashCode() method

1 parentd4f1142 commit306f926Copy full SHA for 306f926

File tree

-37

lines changed

-37

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,7 @@ protected void verifyChunk(List<T> target) throws PatchFailedException {`
`63`	`63`
`64`	`64`	`@Override`
`65`	`65`	`publicinthashCode() {`
`66`		`-inthash =3;`
`67`		`-hash =61 *hash +Objects.hashCode(this.source);`
`68`		`-hash =61 *hash +Objects.hashCode(this.target);`
`69`		`-hash =61 *hash +Objects.hashCode(this.type);`
`70`		`-returnhash;`
	`66`	`+returnObjects.hash(this.source,this.target,this.type);`
`71`	`67`	`}`
`72`	`68`
`73`	`69`	`@Override`

Lines changed: 2 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`
`22`	`22`	`importjava.util.Arrays;`
`23`	`23`	`importjava.util.List;`
	`24`	`+importjava.util.Objects;`
`24`	`25`
`25`	`26`	`/**`
`26`	`27`	`* Holds the information about the part of text involved in the diff process`
`@@ -108,26 +109,11 @@ public int last() {`
`108`	`109`	`returngetPosition() +size() -1;`
`109`	`110`	`}`
`110`	`111`
`111`		`-/*`
`112`		`- * (non-Javadoc)`
`113`		`- *`
`114`		`- * @see java.lang.Object#hashCode()`
`115`		`- */`
`116`	`112`	`@Override`
`117`	`113`	`publicinthashCode() {`
`118`		`-finalintprime =31;`
`119`		`-intresult =1;`
`120`		`-result =prime *result + ((lines ==null) ?0 :lines.hashCode());`
`121`		`-result =prime *result +position;`
`122`		`-result =prime *result +size();`
`123`		`-returnresult;`
	`114`	`+returnObjects.hash(lines,position,size());`
`124`	`115`	`}`
`125`	`116`
`126`		`-/*`
`127`		`- * (non-Javadoc)`
`128`		`- *`
`129`		`- * @see java.lang.Object#equals(java.lang.Object)`
`130`		`- */`
`131`	`117`	`@Override`
`132`	`118`	`publicbooleanequals(Objectobj) {`
`133`	`119`	`if (this ==obj) {`

Lines changed: 2 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`packagecom.github.difflib.text;`
`21`	`21`
`22`	`22`	`importjava.io.Serializable;`
	`23`	`+importjava.util.Objects;`
`23`	`24`
`24`	`25`	`/**`
`25`	`26`	`* Describes the diff row in form [tag, oldLine, newLine) for showing the difference between two texts`
`@@ -70,26 +71,11 @@ public String getNewLine() {`
`70`	`71`	`returnnewLine;`
`71`	`72`	`}`
`72`	`73`
`73`		`-/*`
`74`		`- * (non-Javadoc)`
`75`		`- *`
`76`		`- * @see java.lang.Object#hashCode()`
`77`		`- */`
`78`	`74`	`@Override`
`79`	`75`	`publicinthashCode() {`
`80`		`-finalintprime =31;`
`81`		`-intresult =1;`
`82`		`-result =prime *result + ((newLine ==null) ?0 :newLine.hashCode());`
`83`		`-result =prime *result + ((oldLine ==null) ?0 :oldLine.hashCode());`
`84`		`-result =prime *result + ((tag ==null) ?0 :tag.hashCode());`
`85`		`-returnresult;`
	`76`	`+returnObjects.hash(newLine,oldLine,tag);`
`86`	`77`	`}`
`87`	`78`
`88`		`-/*`
`89`		`- * (non-Javadoc)`
`90`		`- *`
`91`		`- * @see java.lang.Object#equals(java.lang.Object)`
`92`		`- */`
`93`	`79`	`@Override`
`94`	`80`	`publicbooleanequals(Objectobj) {`
`95`	`81`	`if (this ==obj) {`

Comments

(0)