From 9584ff38cebcdc3c07b997b281fb475c096889a7 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Wed, 16 Jan 2019 20:22:18 +0000
Subject: [PATCH] DemoRepos...
---
borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java | 11 ++++++++++-
borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java | 9 ++-------
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
index 69629b8..5ba55a6 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
@@ -89,13 +89,8 @@
}
public List<BorgRepoConfig> getRepoConfigs() {
- if (!ConfigurationHandler.getConfiguration().isShowDemoRepos()) {
- return repoConfigs;
- }
- List<BorgRepoConfig> result = new ArrayList<>();
- result.addAll(repoConfigs);
- DemoRepos.addDemoRepos(result);
- return result;
+ DemoRepos.handleDemoRepos(repoConfigs);
+ return repoConfigs;
}
List<BorgRepoConfig> _getRepoConfigs() {
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java
index e0d6484..7ba4fa5 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/demo/DemoRepos.java
@@ -34,8 +34,17 @@
*
* @param repositoryList
*/
- public static void addDemoRepos(List<BorgRepoConfig> repositoryList) {
+ public static void handleDemoRepos(List<BorgRepoConfig> repositoryList) {
if (!ConfigurationHandler.getConfiguration().isShowDemoRepos()) {
+ // Remove any demo repository if exist due to former settings:
+ Iterator<BorgRepoConfig> it = repositoryList.iterator();
+ while(it.hasNext()) {
+ BorgRepoConfig repoConfig = it.next();
+ if (!StringUtils.startsWith(repoConfig.getRepo(), DEMO_IDENTIFIER)) {
+ continue;
+ }
+ it.remove();
+ }
return;
}
init();
--
Gitblit v1.10.0