From 08a2cca06da588fedee9815f0aac0987cff7c06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 12 Nov 2020 13:55:01 +0100 Subject: [PATCH] Heed review comments --- .../src/main/java/sonia/scm/ExceptionWithContext.java | 8 ++++---- scm-ui/ui-components/src/BackendErrorNotification.tsx | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java b/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java index a972c4e794..16c0f0218c 100644 --- a/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java +++ b/scm-core/src/main/java/sonia/scm/ExceptionWithContext.java @@ -37,21 +37,21 @@ public abstract class ExceptionWithContext extends RuntimeException { private final List context; private final List additionalMessages; - public ExceptionWithContext(List context, String message) { + protected ExceptionWithContext(List context, String message) { this(context, null, message); } - public ExceptionWithContext(List context, List additionalMessages, String message) { + protected ExceptionWithContext(List context, List additionalMessages, String message) { super(message); this.context = context; this.additionalMessages = additionalMessages; } - public ExceptionWithContext(List context, String message, Exception cause) { + protected ExceptionWithContext(List context, String message, Exception cause) { this(context, null, message, cause); } - public ExceptionWithContext(List context, List additionalMessages, String message, Exception cause) { + protected ExceptionWithContext(List context, List additionalMessages, String message, Exception cause) { super(message, cause); this.context = context; this.additionalMessages = additionalMessages; diff --git a/scm-ui/ui-components/src/BackendErrorNotification.tsx b/scm-ui/ui-components/src/BackendErrorNotification.tsx index 5b0aac0d9b..a680304e73 100644 --- a/scm-ui/ui-components/src/BackendErrorNotification.tsx +++ b/scm-ui/ui-components/src/BackendErrorNotification.tsx @@ -75,9 +75,11 @@ class BackendErrorNotification extends React.Component { <>
{error.additionalMessages - .map(a => (a.key ? t(`errors.${a.key}.description`) : a.message)) - .map(m => ( -

{m}

+ .map(additionalMessage => + additionalMessage.key ? t(`errors.${additionalMessage.key}.description`) : additionalMessage.message + ) + .map(message => ( +

{message}

))}