Skip to content

Commit d571ba5

Browse files
wumpzwumpz
committed
changed to JDK 1.8
1 parent 109a74f commit d571ba5

File tree

2 files changed

+30
-49
lines changed

2 files changed

+30
-49
lines changed

‎src/main/java/difflib/DiffRowGenerator.java

Lines changed: 28 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,10 @@ public class DiffRowGenerator {
3838

3939
private final boolean showInlineDiffs;
4040
private final boolean ignoreWhiteSpaces;
41-
private final boolean ignoreBlankLines;
42-
private final String InlineOldTag;
43-
private final String InlineNewTag;
44-
private final String InlineOldCssClass;
45-
private final String InlineNewCssClass;
41+
private final String inlineOldTag;
42+
private final String inlineNewTag;
43+
private final String inlineOldCssClass;
44+
private final String inlineNewCssClass;
4645
private final int columnWidth;
4746
private final Equalizer<String> equalizer;
4847

@@ -56,11 +55,10 @@ public static class Builder {
5655

5756
private boolean showInlineDiffs = false;
5857
private boolean ignoreWhiteSpaces = false;
59-
private boolean ignoreBlankLines = false;
60-
private String InlineOldTag = "span";
61-
private String InlineNewTag = "span";
62-
private String InlineOldCssClass = "editOldInline";
63-
private String InlineNewCssClass = "editNewInline";
58+
private String inlineOldTag = "span";
59+
private String inlineNewTag = "span";
60+
private String inlineOldCssClass = "editOldInline";
61+
private String inlineNewCssClass = "editNewInline";
6462
private int columnWidth = 80;
6563

6664
/**
@@ -85,25 +83,14 @@ public Builder ignoreWhiteSpaces(boolean val) {
8583
return this;
8684
}
8785

88-
/**
89-
* Ignore blank lines in generating diff rows or not.
90-
*
91-
* @param val the value to set. Default: true.
92-
* @return builder with configured ignoreBlankLines parameter
93-
*/
94-
public Builder ignoreBlankLines(boolean val) {
95-
ignoreBlankLines = val;
96-
return this;
97-
}
98-
9986
/**
10087
* Set the tag used for displaying changes in the original text.
10188
*
10289
* @param tag the tag to set. Without angle brackets. Default: span.
10390
* @return builder with configured ignoreBlankLines parameter
10491
*/
105-
public Builder InlineOldTag(String tag) {
106-
InlineOldTag = tag;
92+
public Builder inlineOldTag(String tag) {
93+
inlineOldTag = tag;
10794
return this;
10895
}
10996

@@ -113,8 +100,8 @@ public Builder InlineOldTag(String tag) {
113100
* @param tag the tag to set. Without angle brackets. Default: span.
114101
* @return builder with configured ignoreBlankLines parameter
115102
*/
116-
public Builder InlineNewTag(String tag) {
117-
InlineNewTag = tag;
103+
public Builder inlineNewTag(String tag) {
104+
inlineNewTag = tag;
118105
return this;
119106
}
120107

@@ -124,8 +111,8 @@ public Builder InlineNewTag(String tag) {
124111
* @param cssClass the tag to set. Without any quotes, just word. Default: editOldInline.
125112
* @return builder with configured ignoreBlankLines parameter
126113
*/
127-
public Builder InlineOldCssClass(String cssClass) {
128-
InlineOldCssClass = cssClass;
114+
public Builder inlineOldCssClass(String cssClass) {
115+
inlineOldCssClass = cssClass;
129116
return this;
130117
}
131118

@@ -135,8 +122,8 @@ public Builder InlineOldCssClass(String cssClass) {
135122
* @param cssClass the tag to set. Without any quotes, just word. Default: editNewInline.
136123
* @return builder with configured ignoreBlankLines parameter
137124
*/
138-
public Builder InlineNewCssClass(String cssClass) {
139-
InlineNewCssClass = cssClass;
125+
public Builder inlineNewCssClass(String cssClass) {
126+
inlineNewCssClass = cssClass;
140127
return this;
141128
}
142129

@@ -162,15 +149,18 @@ public DiffRowGenerator build() {
162149
return new DiffRowGenerator(this);
163150
}
164151
}
152+
153+
public static Builder create() {
154+
return new Builder();
155+
}
165156

166157
private DiffRowGenerator(Builder builder) {
167158
showInlineDiffs = builder.showInlineDiffs;
168159
ignoreWhiteSpaces = builder.ignoreWhiteSpaces; //
169-
ignoreBlankLines = builder.ignoreBlankLines; //
170-
InlineOldTag = builder.InlineOldTag;
171-
InlineNewTag = builder.InlineNewTag;
172-
InlineOldCssClass = builder.InlineOldCssClass;
173-
InlineNewCssClass = builder.InlineNewCssClass;
160+
inlineOldTag = builder.inlineOldTag;
161+
inlineNewTag = builder.inlineNewTag;
162+
inlineOldCssClass = builder.inlineOldCssClass;
163+
inlineNewCssClass = builder.inlineNewCssClass;
174164
columnWidth = builder.columnWidth; //
175165
equalizer = new Equalizer<String>() {
176166
public boolean equals(String original, String revised) {
@@ -195,17 +185,6 @@ public List<DiffRow> generateDiffRows(List<String> original, List<String> revise
195185
return generateDiffRows(original, revised, DiffUtils.diff(original, revised, equalizer));
196186
}
197187

198-
private List<String> removeBlankLines(List<String> lines) {
199-
List<String> result = new ArrayList<>();
200-
for (String line : lines) {
201-
if (line.trim().length() == 0) {
202-
result.add("");
203-
}
204-
result.add(line);
205-
}
206-
return result;
207-
}
208-
209188
/**
210189
* Generates the DiffRows describing the difference between original and revised texts using the
211190
* given patch. Useful for displaying side-by-side diff.
@@ -317,16 +296,16 @@ private void addInlineDiffs(Delta<String> delta) {
317296
if (inlineDelta instanceof DeleteDelta) {
318297
origList = wrapInTag(origList, inlineOrig.getPosition(), inlineOrig
319298
.getPosition()
320-
+ inlineOrig.size() + 1, this.InlineOldTag, this.InlineOldCssClass);
299+
+ inlineOrig.size() + 1, this.inlineOldTag, this.inlineOldCssClass);
321300
} else if (inlineDelta instanceof InsertDelta) {
322301
revList = wrapInTag(revList, inlineRev.getPosition(), inlineRev.getPosition()
323-
+ inlineRev.size() + 1, this.InlineNewTag, this.InlineNewCssClass);
302+
+ inlineRev.size() + 1, this.inlineNewTag, this.inlineNewCssClass);
324303
} else if (inlineDelta instanceof ChangeDelta) {
325304
origList = wrapInTag(origList, inlineOrig.getPosition(), inlineOrig
326305
.getPosition()
327-
+ inlineOrig.size() + 1, this.InlineOldTag, this.InlineOldCssClass);
306+
+ inlineOrig.size() + 1, this.inlineOldTag, this.inlineOldCssClass);
328307
revList = wrapInTag(revList, inlineRev.getPosition(), inlineRev.getPosition()
329-
+ inlineRev.size() + 1, this.InlineNewTag, this.InlineNewCssClass);
308+
+ inlineRev.size() + 1, this.inlineNewTag, this.inlineNewCssClass);
330309
}
331310
}
332311
StringBuilder origResult = new StringBuilder(), revResult = new StringBuilder();

‎src/main/java/difflib/DiffUtils.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@
1919
import difflib.myers.MyersDiff;
2020
import java.util.ArrayList;
2121
import java.util.Collections;
22+
import static java.util.Collections.reverseOrder;
2223
import java.util.LinkedList;
2324
import java.util.List;
25+
import java.util.function.Function;
2426
import java.util.regex.Matcher;
2527
import java.util.regex.Pattern;
2628

0 commit comments

Comments
 (0)