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

Commit553ef27

Browse files
committed
Merge origin/master
2 parentsd1c22e7 +0d15097 commit553ef27

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

‎src/main/java/com/github/difflib/UnifiedDiffUtils.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,21 +130,21 @@ public static Patch<String> parseUnifiedDiff(List<String> diff) {
130130
* generateUnifiedDiff takes a Patch and some other arguments, returning the Unified Diff format text representing
131131
* the Patch.
132132
*
133-
* @paramoriginal - Filename of the original (unrevised file)
134-
* @paramrevised - Filename of the revised file
133+
* @paramoriginalFileName - Filename of the original (unrevised file)
134+
* @paramrevisedFileName - Filename of the revised file
135135
* @param originalLines - Lines of the original file
136136
* @param patch - Patch created by the diff() function
137137
* @param contextSize - number of lines of context output around each difference in the file.
138138
* @return List of strings representing the Unified Diff representation of the Patch argument.
139139
* @author Bill James (tankerbay@gmail.com)
140140
*/
141-
publicstaticList<String>generateUnifiedDiff(Stringoriginal,
142-
Stringrevised,List<String>originalLines,Patch<String>patch,
141+
publicstaticList<String>generateUnifiedDiff(StringoriginalFileName,
142+
StringrevisedFileName,List<String>originalLines,Patch<String>patch,
143143
intcontextSize) {
144144
if (!patch.getDeltas().isEmpty()) {
145145
List<String>ret =newArrayList<>();
146-
ret.add("--- " +original);
147-
ret.add("+++ " +revised);
146+
ret.add("--- " +originalFileName);
147+
ret.add("+++ " +revisedFileName);
148148

149149
List<Delta<String>>patchDeltas =newArrayList<>(
150150
patch.getDeltas());

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp