From 1ccc6ec7303cfcb3fb36a2b7055105ff92e41763 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 28 Feb 2022 23:35:34 +0100 Subject: [PATCH] [New] Added StrolchException overrides for I18nMessage parameter --- .../strolch/agent/api/StrolchLockException.java | 15 ++++++++++----- .../exception/StrolchAccessDeniedException.java | 2 ++ .../StrolchElementNotFoundException.java | 8 ++++++++ .../li/strolch/exception/StrolchException.java | 6 ++++++ .../strolch/exception/StrolchModelException.java | 15 ++++++++------- .../StrolchNotAuthenticatedException.java | 8 ++++++++ .../strolch/exception/StrolchPolicyException.java | 15 ++++++++------- 7 files changed, 50 insertions(+), 19 deletions(-) diff --git a/li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchLockException.java b/li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchLockException.java index 88c73cd8a..cd510164e 100644 --- a/li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchLockException.java +++ b/li.strolch.agent/src/main/java/li/strolch/agent/api/StrolchLockException.java @@ -1,12 +1,12 @@ /* * Copyright 2013 Robert von Burg - * + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,15 +15,16 @@ */ package li.strolch.agent.api; +import java.util.Locale; + import li.strolch.exception.StrolchException; +import li.strolch.utils.I18nMessage; /** * @author Robert von Burg */ public class StrolchLockException extends StrolchException { - - public StrolchLockException(String message, Throwable cause) { super(message, cause); } @@ -31,4 +32,8 @@ public class StrolchLockException extends StrolchException { public StrolchLockException(String message) { super(message); } + + public StrolchLockException(I18nMessage i18n) { + super(i18n.getMessage(Locale.getDefault())); + } } diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchAccessDeniedException.java b/li.strolch.model/src/main/java/li/strolch/exception/StrolchAccessDeniedException.java index dfd965f94..eac704fc6 100644 --- a/li.strolch.model/src/main/java/li/strolch/exception/StrolchAccessDeniedException.java +++ b/li.strolch.model/src/main/java/li/strolch/exception/StrolchAccessDeniedException.java @@ -15,6 +15,8 @@ */ package li.strolch.exception; +import java.util.Locale; + import li.strolch.privilege.model.Certificate; import li.strolch.privilege.model.Restrictable; import li.strolch.utils.I18nMessage; diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchElementNotFoundException.java b/li.strolch.model/src/main/java/li/strolch/exception/StrolchElementNotFoundException.java index e10c77d6d..1a4e84589 100644 --- a/li.strolch.model/src/main/java/li/strolch/exception/StrolchElementNotFoundException.java +++ b/li.strolch.model/src/main/java/li/strolch/exception/StrolchElementNotFoundException.java @@ -1,5 +1,9 @@ package li.strolch.exception; +import java.util.Locale; + +import li.strolch.utils.I18nMessage; + public class StrolchElementNotFoundException extends StrolchModelException { public StrolchElementNotFoundException(String message, Throwable cause) { @@ -9,4 +13,8 @@ public class StrolchElementNotFoundException extends StrolchModelException { public StrolchElementNotFoundException(String message) { super(message); } + + public StrolchElementNotFoundException(I18nMessage i18n) { + super(i18n.getMessage(Locale.getDefault())); + } } diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchException.java b/li.strolch.model/src/main/java/li/strolch/exception/StrolchException.java index ec856dff5..981ccd7fb 100644 --- a/li.strolch.model/src/main/java/li/strolch/exception/StrolchException.java +++ b/li.strolch.model/src/main/java/li/strolch/exception/StrolchException.java @@ -15,6 +15,8 @@ */ package li.strolch.exception; +import java.util.Locale; + import li.strolch.utils.I18nMessage; /** @@ -32,6 +34,10 @@ public class StrolchException extends RuntimeException { super(message); } + public StrolchException(I18nMessage i18n) { + super(i18n.getMessage(Locale.getDefault())); + } + public boolean hasI18n() { return this.i18n != null; } diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchModelException.java b/li.strolch.model/src/main/java/li/strolch/exception/StrolchModelException.java index 6be356102..812b23182 100644 --- a/li.strolch.model/src/main/java/li/strolch/exception/StrolchModelException.java +++ b/li.strolch.model/src/main/java/li/strolch/exception/StrolchModelException.java @@ -15,23 +15,24 @@ */ package li.strolch.exception; +import java.util.Locale; + +import li.strolch.utils.I18nMessage; + /** * @author Robert von Burg */ public class StrolchModelException extends StrolchException { - /** - * @param message - * @param cause - */ public StrolchModelException(String message, Throwable cause) { super(message, cause); } - /** - * @param message - */ public StrolchModelException(String message) { super(message); } + + public StrolchModelException(I18nMessage i18n) { + super(i18n.getMessage(Locale.getDefault())); + } } diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchNotAuthenticatedException.java b/li.strolch.model/src/main/java/li/strolch/exception/StrolchNotAuthenticatedException.java index f303c3941..49bab24a4 100644 --- a/li.strolch.model/src/main/java/li/strolch/exception/StrolchNotAuthenticatedException.java +++ b/li.strolch.model/src/main/java/li/strolch/exception/StrolchNotAuthenticatedException.java @@ -15,6 +15,10 @@ */ package li.strolch.exception; +import java.util.Locale; + +import li.strolch.utils.I18nMessage; + /** * @author Robert von Burg */ @@ -27,4 +31,8 @@ public class StrolchNotAuthenticatedException extends StrolchException { public StrolchNotAuthenticatedException(String message, Throwable cause) { super(message, cause); } + + public StrolchNotAuthenticatedException(I18nMessage i18n) { + super(i18n.getMessage(Locale.getDefault())); + } } diff --git a/li.strolch.model/src/main/java/li/strolch/exception/StrolchPolicyException.java b/li.strolch.model/src/main/java/li/strolch/exception/StrolchPolicyException.java index 8a46efa7d..2c5f1de31 100644 --- a/li.strolch.model/src/main/java/li/strolch/exception/StrolchPolicyException.java +++ b/li.strolch.model/src/main/java/li/strolch/exception/StrolchPolicyException.java @@ -15,23 +15,24 @@ */ package li.strolch.exception; +import java.util.Locale; + +import li.strolch.utils.I18nMessage; + /** * @author Robert von Burg */ public class StrolchPolicyException extends StrolchException { - /** - * @param message - * @param cause - */ public StrolchPolicyException(String message, Throwable cause) { super(message, cause); } - /** - * @param message - */ public StrolchPolicyException(String message) { super(message); } + + public StrolchPolicyException(I18nMessage i18n) { + super(i18n.getMessage(Locale.getDefault())); + } }