From b81e7dfa1b41dc6e1ed3f365af1571399ddd38bd Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Thu, 20 Dec 2018 00:47:48 +0000
Subject: [PATCH] Works now.
---
borgbutler-core/src/main/java/de/micromata/borgbutler/DiffTool.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/DiffTool.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/DiffTool.java
index 7709ba5..a0a16a1 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/DiffTool.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/DiffTool.java
@@ -55,17 +55,13 @@
other = otherIt.hasNext() ? otherIt.next() : null;
}
}
- while (currentIt.hasNext()) {
- if (current == null)
- current = currentIt.next();
+ while (current != null) {
result.add(current.setDiffStatus(BorgFilesystemItem.DiffStatus.NEW));
- current = null;
+ current = currentIt.hasNext() ? currentIt.next() : null;
}
- while (otherIt.hasNext()) {
- if (other == null)
- other = otherIt.next();
+ while (other != null) {
result.add(other.setDiffStatus(BorgFilesystemItem.DiffStatus.REMOVED));
- other = null;
+ other = otherIt.hasNext() ? otherIt.next() : null;
}
return result;
}
--
Gitblit v1.10.0