(ofbiz-framework) 01/03: Improved: Don't need to show files names in UI messages (OFBIZ-12884)

[jleroux]

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

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit b1cf4ef3e18fb31ec3c7326036817bb6305bbc02
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Jan 30 16:36:05 2024 +0100

    Improved: Don't need to show files names in UI messages (OFBIZ-12884)
    
    We don't need to show files names in UI messages. it's already in log.
    It does not help users and rather confuse them.
    
    Conflict handled by hand
---
 .../src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git 
a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java 
b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
index 57a565c280..c5a9d53c24 100644
--- 
a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
+++ 
b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java
@@ -457,7 +457,13 @@ public final class SimpleMethod extends MiniLangElement {
             finished = runSubOps(methodOperations, methodContext);
         } catch (Throwable t) {
             // make SURE nothing gets thrown through
-            String errMsg = 
UtilProperties.getMessage(SimpleMethod.err_resource, 
"simpleMethod.error_running", locale) + ": " + t.getMessage();
+            String errorMessage = t.getMessage();
+            if (errorMessage.contains("File = file") && 
errorMessage.contains("Events.xml")) {
+                String noFile = 
errorMessage.substring(errorMessage.indexOf("File = file"),
+                        errorMessage.indexOf("Events.xml") + 
"Events.xml".length());
+                errorMessage = errorMessage.replace(noFile, "");
+            }
+            String errMsg = 
UtilProperties.getMessage(SimpleMethod.err_resource, 
"simpleMethod.error_running", locale) + ": " + errorMessage;
             if (methodContext.isTraceOn()) {
                 outputTraceMessage(methodContext, "An exception was thrown 
while running sub-elements, error message was:", errMsg);
             }