From 04657c4589a32b5ec62becbbc7bbee9b28348baa Mon Sep 17 00:00:00 2001
From: Thomas Mortagne <thomas.mortagne@gmail.com>
Date: Fri, 8 Mar 2019 16:54:53 +0100
Subject: [PATCH] [misc] Improve codestyle
---
.../listener/BackLinkUpdaterListener.java | 24 +++++++++----------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/src/main/java/org/xwiki/refactoring/internal/listener/BackLinkUpdaterListener.java b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/src/main/java/org/xwiki/refactoring/internal/listener/BackLinkUpdaterListener.java
index 4996e06bb0f..26b1cf345b2 100644
--- a/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/src/main/java/org/xwiki/refactoring/internal/listener/BackLinkUpdaterListener.java
+++ b/xwiki-platform-core/xwiki-platform-refactoring/xwiki-platform-refactoring-api/src/main/java/org/xwiki/refactoring/internal/listener/BackLinkUpdaterListener.java
@@ -122,19 +122,16 @@ private void updateBackLinks(DocumentRenamedEvent event, Predicate<EntityReferen
}
}
- boolean popLevelProgress = false;
- try {
- if (wikiIds.size() > 0) {
- this.progressManager.pushLevelProgress(wikiIds.size(), this);
- popLevelProgress = true;
- }
- for (String wikiId : wikiIds) {
- this.progressManager.startStep(this);
- updateBackLinks(event, canEdit, wikiId);
- this.progressManager.endStep(this);
- }
- } finally {
- if (popLevelProgress) {
+ if (!wikiIds.isEmpty()) {
+ this.progressManager.pushLevelProgress(wikiIds.size(), this);
+
+ try {
+ for (String wikiId : wikiIds) {
+ this.progressManager.startStep(this);
+ updateBackLinks(event, canEdit, wikiId);
+ this.progressManager.endStep(this);
+ }
+ } finally {
this.progressManager.popLevelProgress(this);
}
}
@@ -145,6 +142,7 @@ private void updateBackLinks(DocumentRenamedEvent event, Predicate<EntityReferen
this.logger.info("Updating the back-links for document [{}] in wiki [{}].", event.getSourceReference(), wikiId);
List<DocumentReference> backlinkDocumentReferences =
this.modelBridge.getBackLinkedReferences(event.getSourceReference(), wikiId);
+
this.progressManager.pushLevelProgress(backlinkDocumentReferences.size(), this);
try {
--
GitLab