Commitededee0

committed

fixes#51

1 parenteada27b commitededee0Copy full SHA for ededee0

File tree

+51

-4

lines changed

+51

-4

lines changed

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,18 @@`
	`1`	`+<?xml version="1.0" encoding="UTF-8"?>`
	`2`	`+<project-shared-configuration>`
	`3`	`+<!--`
	`4`	`+This file contains additional configuration written by modules in the NetBeans IDE.`
	`5`	`+The configuration is intended to be shared among all the users of project and`
	`6`	`+therefore it is assumed to be part of version control checkout.`
	`7`	`+Without this configuration present, some functionality in the IDE may be limited or fail altogether.`
	`8`	`+-->`
	`9`	`+ <propertiesxmlns="http://www.netbeans.org/ns/maven-properties-data/1">`
	`10`	`+<!--`
	`11`	`+Properties that influence various parts of the IDE, especially code formatting and the like.`
	`12`	`+You can copy and paste the single properties, into the pom.xml file and the IDE will pick them up.`
	`13`	`+That way multiple projects can share the same settings (useful for formatting rules for example).`
	`14`	`+Any value defined here will override the pom.xml file value but is only applicable to the current project.`
	`15`	`+-->`
	`16`	`+ <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>`
	`17`	`+ </properties>`
	`18`	`+</project-shared-configuration>`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@`
`49`	`49`	`<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>`
`50`	`50`	`<manifestEntries>`
`51`	`51`	`<!-- identical to OSGI name-->`
`52`		`- <Automatic-Module-Name>io.github.java-diff-utils</Automatic-Module-Name>`
	`52`	`+ <Automatic-Module-Name>io.github.javadiffutils</Automatic-Module-Name>`
`53`	`53`	`</manifestEntries>`
`54`	`54`	`</archive>`
`55`	`55`	`</configuration>`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,9 @@ private UnifiedDiff parse() throws IOException, UnifiedDiffParserException {`
`97`	`97`	`if (processLine(line,LINE_NORMAL,LINE_ADD,LINE_DEL) ==false) {`
`98`	`98`	`thrownewUnifiedDiffParserException("expected data line not found");`
`99`	`99`	`}`
`100`		`-if (originalTxt.size() ==old_size &&revisedTxt.size() ==new_size) {`
	`100`	`+if ((originalTxt.size() ==old_size &&revisedTxt.size() ==new_size)`
	`101`	`+ \|\| (old_size==0 &&new_size==0 &&originalTxt.size() ==this.old_ln`
	`102`	`+ &&revisedTxt.size() ==this.new_ln)) {`
`101`	`103`	`finalizeChunk();`
`102`	`104`	`break;`
`103`	`105`	`}`
`@@ -241,9 +243,9 @@ private String extractFileName(String _line) {`
`241`	`243`	`Matchermatcher =TIMESTAMP_REGEXP.matcher(_line);`
`242`	`244`	`Stringline =_line;`
`243`	`245`	`if (matcher.find()) {`
`244`		`-line =line.substring(1,matcher.start());`
	`246`	`+line =line.substring(0,matcher.start());`
`245`	`247`	`}`
`246`		`-returnline.substring(4).replaceFirst("^(a\|b)\\/","")`
	`248`	`+returnline.substring(4).replaceFirst("^(a\|b\|old\|new)(\\/)?","")`
`247`	`249`	`.replace(TIMESTAMP_REGEXP.toString(),"").trim();`
`248`	`250`	`}`
`249`	`251`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -141,4 +141,20 @@ public void testParseIssue33() throws IOException {`
`141`	`141`	`assertThat(diff.getTail()).isNull();`
`142`	`142`	`assertThat(diff.getHeader()).isNull();`
`143`	`143`	`}`
	`144`	`+`
	`145`	`+@Test`
	`146`	`+publicvoidtestParseIssue51()throwsIOException {`
	`147`	`+UnifiedDiffdiff =UnifiedDiffReader.parseUnifiedDiff(`
	`148`	`+UnifiedDiffReaderTest.class.getResourceAsStream("problem_diff_issue51.diff"));`
	`149`	`+`
	`150`	`+System.out.println(diff);`
	`151`	`+`
	`152`	`+assertThat(diff.getFiles().size()).isEqualTo(2);`
	`153`	`+`
	`154`	`+UnifiedDiffFilefile1 =diff.getFiles().get(0);`
	`155`	`+assertThat(file1.getFromFile()).isEqualTo("f1");`
	`156`	`+assertThat(file1.getPatch().getDeltas().size()).isEqualTo(1);`
	`157`	`+`
	`158`	`+assertThat(diff.getTail()).isNull();`
	`159`	`+ }`
`144`	`160`	`}`

Lines changed: 11 additions & 0 deletions

Comments

(0)