Commit88146c6

committed

make columnwith 0, meaning no text wrap, the standard

1 parentaed1d31 commit88146c6Copy full SHA for 88146c6

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public static class Builder {`
`76`	`76`	`privateFunction<Boolean,String>oldTag =f ->f ?"<span class=\"editOldInline\">" :"</span>";`
`77`	`77`	`privateFunction<Boolean,String>newTag =f ->f ?"<span class=\"editNewInline\">" :"</span>";`
`78`	`78`
`79`		`-privateintcolumnWidth =80;`
	`79`	`+privateintcolumnWidth =0;`
`80`	`80`	`privatebooleanmergeOriginalRevised =false;`
`81`	`81`	`privatebooleaninlineDiffByWord =false;`
`82`	`82`	`privatebooleanreportLinesUnchanged =false;`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,11 @@ public static List<String> wrapText(List<String> list, int columnWidth) {`
`58`	`58`	`* @return the wrapped text`
`59`	`59`	`*/`
`60`	`60`	`publicstaticStringwrapText(Stringline,intcolumnWidth) {`
`61`		`-if (columnWidth <=0) {`
`62`		`-thrownewIllegalArgumentException("columnWidth may not be less or equal 0");`
	`61`	`+if (columnWidth <0) {`
	`62`	`+thrownewIllegalArgumentException("columnWidth may not be less 0");`
	`63`	`+ }`
	`64`	`+if (columnWidth ==0) {`
	`65`	`+returnline;`
`63`	`66`	`}`
`64`	`67`	`intlength =line.length();`
`65`	`68`	`intdelimiter ="<br/>".length();`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,7 @@ public void testGeneratorWithMergeByWord5() throws DiffException {`
`173`	`173`	`.showInlineDiffs(true)`
`174`	`174`	`.mergeOriginalRevised(true)`
`175`	`175`	`.inlineDiffByWord(true)`
	`176`	`+ .columnWidth(80)`
`176`	`177`	`.build();`
`177`	`178`	`List<DiffRow>rows =generator.generateDiffRows(Arrays.asList("Test feature"),Arrays.asList("ester feature best"));`
`178`	`179`	`print(rows);`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`*/`
`16`	`16`	`packagecom.github.difflib.text;`
`17`	`17`
`18`		`-importcom.github.difflib.text.StringUtils;`
`19`	`18`	`importjava.util.Collections;`
`20`	`19`	`importorg.junit.Test;`
`21`	`20`	`importstaticorg.junit.Assert.*;`
`@@ -62,7 +61,7 @@ public void testWrapText_String_int() {`
`62`	`61`
`63`	`62`	`@Test(expected =IllegalArgumentException.class)`
`64`	`63`	`publicvoidtestWrapText_String_int_zero() {`
`65`		`-assertEquals("test",StringUtils.wrapText("test",0));`
	`64`	`+assertEquals("test",StringUtils.wrapText("test",-1));`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`}`

Comments

(0)