Commit06f1e05

committed

1 parent26be870 commit06f1e05Copy full SHA for 06f1e05

File tree

-6

lines changed

java-diff-utils/src/main/java/com/github/difflib
- patch
  - AbstractDelta.java
- unifieddiff
  - UnifiedDiffReader.java

-6

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,6 @@ public boolean equals(Object obj) {`
`90`	`90`	`if (!Objects.equals(this.target,other.target)) {`
`91`	`91`	`returnfalse;`
`92`	`92`	`}`
`93`		`-if (this.type !=other.type) {`
`94`		`-returnfalse;`
`95`		`- }`
`96`		`-returntrue;`
	`93`	`+returnthis.type ==other.type;`
`97`	`94`	`}`
`98`	`95`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {`
`91`	`91`	`if (!CHUNK.validLine(line)) {`
`92`	`92`	`initFileIfNecessary();`
`93`	`93`	`while (line !=null && !CHUNK.validLine(line)) {`
`94`		`-if (processLine(line,DIFF_COMMAND,INDEX,FROM_FILE,TO_FILE,NEW_FILE_MODE,DELETED_FILE_MODE) ==false) {`
	`94`	`+if (!processLine(line,DIFF_COMMAND,INDEX,FROM_FILE,TO_FILE,NEW_FILE_MODE,DELETED_FILE_MODE)) {`
`95`	`95`	`thrownewUnifiedDiffParserException("expected file start line not found");`
`96`	`96`	`}`
`97`	`97`	`line =READER.readLine();`
`@@ -100,7 +100,7 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {`
`100`	`100`	`if (line !=null) {`
`101`	`101`	`processLine(line,CHUNK);`
`102`	`102`	`while ((line =READER.readLine()) !=null) {`
`103`		`-if (processLine(line,LINE_NORMAL,LINE_ADD,LINE_DEL) ==false) {`
	`103`	`+if (!processLine(line,LINE_NORMAL,LINE_ADD,LINE_DEL)) {`
`104`	`104`	`thrownewUnifiedDiffParserException("expected data line not found");`
`105`	`105`	`}`
`106`	`106`	`if ((originalTxt.size() ==old_size &&revisedTxt.size() ==new_size)`

Comments

(0)