You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2024/07/06 17:32:51 UTC
(empire-db) branch master updated: EMPIREDB-432 Custom Exception message formatting improvment
This is an automated email from the ASF dual-hosted git repository.
doebele pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git
The following commit(s) were added to refs/heads/master by this push:
new 08c9edab EMPIREDB-432 Custom Exception message formatting improvment
08c9edab is described below
commit 08c9edab29e9a9a0266afe6ba83870c47af17c3a
Author: Rainer Döbele <rd...@users.noreply.github.com>
AuthorDate: Sat Jul 6 16:43:01 2024 +0200
EMPIREDB-432
Custom Exception message formatting improvment
---
.../java/org/apache/empire/jakarta/impl/ResourceTextResolver.java | 4 ++--
.../main/java/org/apache/empire/jsf2/impl/ResourceTextResolver.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/ResourceTextResolver.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/ResourceTextResolver.java
index 284be3ed..c243aba3 100644
--- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/ResourceTextResolver.java
+++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/impl/ResourceTextResolver.java
@@ -108,7 +108,7 @@ public class ResourceTextResolver implements TextResolver
String[] params = ee.getErrorParams();
if (params!=null)
{ for (int i=0; i<params.length; i++)
- params[i] = resolveExceptionParam(params[i]);
+ params[i] = resolveExceptionParam(ee, i, params[i]);
}
// Format message
return EmpireException.formatErrorMessage(ee.getErrorType(), pattern, params);
@@ -123,7 +123,7 @@ public class ResourceTextResolver implements TextResolver
}
}
- protected String resolveExceptionParam(String param)
+ protected String resolveExceptionParam(EmpireException ee, int index, String param)
{
if (param==null || param.length()==0)
return param;
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/ResourceTextResolver.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/ResourceTextResolver.java
index 0a0ba465..4d77dbf4 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/ResourceTextResolver.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/impl/ResourceTextResolver.java
@@ -108,7 +108,7 @@ public class ResourceTextResolver implements TextResolver
String[] params = ee.getErrorParams();
if (params!=null)
{ for (int i=0; i<params.length; i++)
- params[i] = resolveExceptionParam(params[i]);
+ params[i] = resolveExceptionParam(ee, i, params[i]);
}
// Format message
return EmpireException.formatErrorMessage(ee.getErrorType(), pattern, params);
@@ -123,7 +123,7 @@ public class ResourceTextResolver implements TextResolver
}
}
- protected String resolveExceptionParam(String param)
+ protected String resolveExceptionParam(EmpireException ee, int index, String param)
{
if (param==null || param.length()==0)
return param;