From 1c087fae322a1b07bb7bd554ee10ff473c47c727 Mon Sep 17 00:00:00 2001
From: Fin Reinhard <fin.reinhard@icloud.com>
Date: Tue, 22 Jan 2019 20:51:03 +0000
Subject: [PATCH] Merge branch 'master' into feature/15-archive-view-url
---
borgbutler-core/src/main/java/de/micromata/borgbutler/BorgQueueExecutor.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgQueueExecutor.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgQueueExecutor.java
index 86f2743..ac0eb44 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgQueueExecutor.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/BorgQueueExecutor.java
@@ -78,16 +78,17 @@
* For displaying purposes.
*
* @param repoConfig
+ * @param oldJobs If false, the running and queued jobs are returned, otherwise the done ones.
* @return A list of all jobs of the queue (as copies).
*/
- public List<BorgJob<?>> getJobListCopy(BorgRepoConfig repoConfig) {
+ public List<BorgJob<?>> getJobListCopy(BorgRepoConfig repoConfig, boolean oldJobs) {
JobQueue<String> origQueue = getQueue(repoConfig);
List<BorgJob<?>> jobList = new ArrayList<>();
if (origQueue == null) {
return jobList;
}
synchronized (origQueue) {
- Iterator<AbstractJob<String>> it = origQueue.getQueueIterator();
+ Iterator<AbstractJob<String>> it = oldJobs ? origQueue.getOldJobsIterator() : origQueue.getQueueIterator();
while (it.hasNext()) {
AbstractJob<String> origJob = it.next();
if (!(origJob instanceof BorgJob)) {
--
Gitblit v1.10.0