You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/01/27 16:10:56 UTC

[isis] 01/02: ISIS-2502: move TranslatableException

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 22cb1aed20815adec63a3d91605ff3a28c05b6f1
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed Jan 27 17:06:50 2021 +0100

    ISIS-2502: move TranslatableException
---
 .../main/java/org/apache/isis/applib/NonRecoverableException.java   | 2 +-
 .../src/main/java/org/apache/isis/applib/RecoverableException.java  | 6 ++++--
 .../{services/exceprecog => exceptions}/TranslatableException.java  | 2 +-
 .../applib/services/exceprecog/ExceptionRecognizerAbstract.java     | 1 +
 .../org/apache/isis/applib/services/i18n/TranslatableString.java    | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java b/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
index 6d1f6cf..54084f6 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/NonRecoverableException.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.applib;
 
-import org.apache.isis.applib.services.exceprecog.TranslatableException;
+import org.apache.isis.applib.exceptions.TranslatableException;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.commons.internal.functions._Functions;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java b/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
index 2f1deff..bda290e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/RecoverableException.java
@@ -19,7 +19,7 @@
 
 package org.apache.isis.applib;
 
-import org.apache.isis.applib.services.exceprecog.TranslatableException;
+import org.apache.isis.applib.exceptions.TranslatableException;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.commons.internal.base._Strings;
 import org.apache.isis.commons.internal.exceptions._Exceptions;
@@ -49,7 +49,9 @@ import org.apache.isis.commons.internal.exceptions._Exceptions;
  * @see FatalException
  * @since 1.x {@index}
  */
-public class RecoverableException extends RuntimeException implements TranslatableException {
+public class RecoverableException 
+extends RuntimeException 
+implements TranslatableException {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/TranslatableException.java b/api/applib/src/main/java/org/apache/isis/applib/exceptions/TranslatableException.java
similarity index 97%
rename from api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/TranslatableException.java
rename to api/applib/src/main/java/org/apache/isis/applib/exceptions/TranslatableException.java
index 0cff16a..df24fb5 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/TranslatableException.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/exceptions/TranslatableException.java
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.applib.services.exceprecog;
+package org.apache.isis.applib.exceptions;
 
 import org.apache.isis.applib.services.i18n.TranslatableString;
 
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
index 6d5140e..2377012 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/exceprecog/ExceptionRecognizerAbstract.java
@@ -26,6 +26,7 @@ import java.util.function.UnaryOperator;
 
 import javax.inject.Inject;
 
+import org.apache.isis.applib.exceptions.TranslatableException;
 import org.apache.isis.applib.services.i18n.TranslatableString;
 import org.apache.isis.applib.services.i18n.TranslationService;
 import org.apache.isis.commons.internal.base._NullSafe;
diff --git a/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
index a6f560e..50f4a80 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/services/i18n/TranslatableString.java
@@ -208,7 +208,7 @@ public final class TranslatableString {
      *
      * <p>
      *     NB: this method is exposed only so that implementations of
-     *     {@link org.apache.isis.applib.services.exceprecog.TranslatableException} can return a non-null
+     *     {@link org.apache.isis.applib.exceptions.TranslatableException} can return a non-null
      *     {@link Exception#getMessage() message} when only a translatable message has been provided.
      * </p>
      */