romanov73/git-extractor
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

#26-Removing null from lineChange

Browse Source
This commit is contained in:
BarminaA 2021-04-24 19:23:44 +04:00
parent 4629562e0f
commit fb04c3bb1d
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/ru/ulstu/extractor/service/GitRepositoryService.java
View File

@ -250,22 +250,32 @@ public class GitRepositoryService {
while ((i < stringsLength) && strings[i].startsWith("-")) { while ((i < stringsLength) && strings[i].startsWith("-")) {
if (strings[i].startsWith("---")) { if (strings[i].startsWith("---")) {
i++; i++;
} else {
if (lineChange.getLineFrom() == null) {
lineChange.setLineFrom(strings[i]);
i++;
} else { } else {
lineChange.setLineFrom(lineChange.getLineFrom() + "\n" + strings[i]); lineChange.setLineFrom(lineChange.getLineFrom() + "\n" + strings[i]);
i++; i++;
} }
} }
} }
}
if (strings[i].startsWith("+")) { if (strings[i].startsWith("+")) {
while ((i < stringsLength) && strings[i].startsWith("+")) { while ((i < stringsLength) && strings[i].startsWith("+")) {
if (strings[i].startsWith("+++")) { if (strings[i].startsWith("+++")) {
i++; i++;
} else {
if (lineChange.getLineTo() == null) {
lineChange.setLineTo(strings[i]);
i++;
} else { } else {
lineChange.setLineTo(lineChange.getLineTo() + "\n" + strings[i]); lineChange.setLineTo(lineChange.getLineTo() + "\n" + strings[i]);
i++; i++;
} }
} }
} }
}
if ((lineChange.getLineTo() != null) || (lineChange.getLineFrom() != null) if ((lineChange.getLineTo() != null) || (lineChange.getLineFrom() != null)
|| ((lineChange.getLineTo() != null) && (lineChange.getLineFrom() != null))) { || ((lineChange.getLineTo() != null) && (lineChange.getLineFrom() != null))) {
fileChange.getLineChanges().add(lineChange); fileChange.getLineChanges().add(lineChange);