Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit286e807

Browse files
committed
Merge origin/master
2 parents4c457b3 +c85296b commit286e807

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

‎java-diff-utils/src/main/java/com/github/difflib/UnifiedDiffUtils.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,14 @@ private static void processLinesInPrevChunk(List<String[]> rawChunk, Patch<Strin
129129

130130
/**
131131
* generateUnifiedDiff takes a Patch and some other arguments, returning the Unified Diff format
132-
* text representing the Patch.
132+
* text representing the Patch. Author: Bill James (tankerbay@gmail.com).
133133
*
134134
* @param originalFileName - Filename of the original (unrevised file)
135135
* @param revisedFileName - Filename of the revised file
136136
* @param originalLines - Lines of the original file
137137
* @param patch - Patch created by the diff() function
138138
* @param contextSize - number of lines of context output around each difference in the file.
139139
* @return List of strings representing the Unified Diff representation of the Patch argument.
140-
* @author Bill James (tankerbay@gmail.com)
141140
*/
142141
publicstaticList<String>generateUnifiedDiff(StringoriginalFileName,
143142
StringrevisedFileName,List<String>originalLines,Patch<String>patch,
@@ -200,13 +199,12 @@ public static List<String> generateUnifiedDiff(String originalFileName,
200199

201200
/**
202201
* processDeltas takes a list of Deltas and outputs them together in a single block of
203-
* Unified-Diff-format text.
202+
* Unified-Diff-format text. Author: Bill James (tankerbay@gmail.com).
204203
*
205204
* @param origLines - the lines of the original file
206205
* @param deltas - the Deltas to be output as a single block
207206
* @param contextSize - the number of lines of context to place around block
208207
* @return
209-
* @author Bill James (tankerbay@gmail.com)
210208
*/
211209
privatestaticList<String>processDeltas(List<String>origLines,
212210
List<AbstractDelta<String>>deltas,intcontextSize,booleannewFile) {
@@ -297,11 +295,10 @@ private static List<String> processDeltas(List<String> origLines,
297295
}
298296

299297
/**
300-
* getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter
298+
* getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter. Author: Bill James (tankerbay@gmail.com).
301299
*
302300
* @param delta - the Delta to output
303301
* @return list of String lines of code.
304-
* @author Bill James (tankerbay@gmail.com)
305302
*/
306303
privatestaticList<String>getDeltaText(AbstractDelta<String>delta) {
307304
List<String>buffer =newArrayList<>();

‎java-diff-utils/src/main/java/com/github/difflib/text/DiffRowGenerator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,8 +554,8 @@ public Builder processDiffs(Function<String, String> processDiffs) {
554554
* Set the column width of generated lines of original and revised
555555
* texts.
556556
*
557-
* @param width the width to set. Making it< 0 doesn't make any sense.
558-
*Default 80.@return builder with config of column width
557+
* @param width the width to set. Making it&lt; 0 doesn't make any sense. Default 80.
558+
* @return builder with config of column width
559559
*/
560560
publicBuildercolumnWidth(intwidth) {
561561
if (width >=0) {

‎java-diff-utils/src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,10 @@ private static void processDeltas(Consumer<String> writer,
189189
}
190190

191191
/**
192-
* getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter
192+
* getDeltaText returns the lines to be added to the Unified Diff text from the Delta parameter.
193193
*
194-
* @paramdelta -theDelta to output
195-
* @return list of String lines of code.
194+
* @paramwriter consumer forthelist of String lines of code
195+
* @param delta the Delta to output
196196
*/
197197
privatestaticvoidgetDeltaText(Consumer<String>writer,AbstractDelta<String>delta) {
198198
for (Stringline :delta.getSource().getLines()) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp