From 0bf694706083b057c27841a437f1ecbe8ee94748 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Fri, 12 Mar 2021 10:49:46 +0400 Subject: [PATCH] getting data output right --- .../java/ru/ulstu/extractor/GitRepositoryService.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/ru/ulstu/extractor/GitRepositoryService.java b/src/main/java/ru/ulstu/extractor/GitRepositoryService.java index f948bb2..18043da 100644 --- a/src/main/java/ru/ulstu/extractor/GitRepositoryService.java +++ b/src/main/java/ru/ulstu/extractor/GitRepositoryService.java @@ -106,7 +106,7 @@ public class GitRepositoryService { Changes changes = new Changes(); String[] strings = output.split("\n"); FileChange fileChange = new FileChange(); - int stringsLength = strings.length; + int stringsLength = strings.length - 1; for (int i = 0; i < strings.length; i++) { while (i < stringsLength) { Optional maybeFileName = getFileName(strings[i]); @@ -129,11 +129,12 @@ public class GitRepositoryService { i++; } } - if ((lineChange.getLineTo() != null && lineChange.getLineTo().isEmpty()) - || (lineChange.getLineFrom() != null && lineChange.getLineFrom().isEmpty())) { + if ((lineChange.getLineTo() != null) || (lineChange.getLineFrom() != null) + || ((lineChange.getLineTo() != null) && (lineChange.getLineFrom() != null))) { fileChange.getLineChanges().add(lineChange); + } else { + i++; } - i++; } } return changes;