From 88146c6afbc15cb404d4e8f8310dd2ea4a4628c0 Mon Sep 17 00:00:00 2001
From: wumpz <t.warneke@gmx.net>
Date: Thu, 28 Sep 2017 13:25:54 +0200
Subject: [PATCH] make columnwith 0, meaning no text wrap, the standard

---
 .../java/com/github/difflib/text/DiffRowGenerator.java     | 2 +-
 src/main/java/com/github/difflib/text/StringUtils.java     | 7 +++++--
 .../java/com/github/difflib/text/DiffRowGeneratorTest.java | 1 +
 src/test/java/com/github/difflib/text/StringUtilsTest.java | 3 +--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/src/main/java/com/github/difflib/text/DiffRowGenerator.java
index 16ca767..e25e928 100644
--- a/src/main/java/com/github/difflib/text/DiffRowGenerator.java
+++ b/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -76,7 +76,7 @@ public class DiffRowGenerator {
         private Function<Boolean, String> oldTag = f -> f ? "<span class=\"editOldInline\">" : "</span>";
         private Function<Boolean, String> newTag = f -> f ? "<span class=\"editNewInline\">" : "</span>";
 
-        private int columnWidth = 80;
+        private int columnWidth = 0;
         private boolean mergeOriginalRevised = false;
         private boolean inlineDiffByWord = false;
         private boolean reportLinesUnchanged = false;
diff --git a/src/main/java/com/github/difflib/text/StringUtils.java b/src/main/java/com/github/difflib/text/StringUtils.java
index 1367334..4166b31 100644
--- a/src/main/java/com/github/difflib/text/StringUtils.java
+++ b/src/main/java/com/github/difflib/text/StringUtils.java
@@ -58,8 +58,11 @@ final class StringUtils {
      * @return the wrapped text
      */
     public static String wrapText(String line, int columnWidth) {
-        if (columnWidth <= 0) {
-            throw new IllegalArgumentException("columnWidth may not be less or equal 0");
+        if (columnWidth < 0) {
+            throw new IllegalArgumentException("columnWidth may not be less 0");
+        }
+        if (columnWidth == 0) {
+            return line;
         }
         int length = line.length();
         int delimiter = "<br/>".length();
diff --git a/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java b/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
index 867b8c3..616c189 100644
--- a/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
+++ b/src/test/java/com/github/difflib/text/DiffRowGeneratorTest.java
@@ -173,6 +173,7 @@ public class DiffRowGeneratorTest {
                 .showInlineDiffs(true)
                 .mergeOriginalRevised(true)
                 .inlineDiffByWord(true)
+                .columnWidth(80)
                 .build();
         List<DiffRow> rows = generator.generateDiffRows(Arrays.asList("Test feature"),Arrays.asList("ester feature best"));
         print(rows);
diff --git a/src/test/java/com/github/difflib/text/StringUtilsTest.java b/src/test/java/com/github/difflib/text/StringUtilsTest.java
index 1207436..ad8f1db 100644
--- a/src/test/java/com/github/difflib/text/StringUtilsTest.java
+++ b/src/test/java/com/github/difflib/text/StringUtilsTest.java
@@ -15,7 +15,6 @@
  */
 package com.github.difflib.text;
 
-import com.github.difflib.text.StringUtils;
 import java.util.Collections;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -62,7 +61,7 @@ public class StringUtilsTest {
     
     @Test(expected = IllegalArgumentException.class)
     public void testWrapText_String_int_zero() {
-        assertEquals("test", StringUtils.wrapText("test", 0));
+        assertEquals("test", StringUtils.wrapText("test", -1));
     }
     
 }