This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch release22.01
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
commit 82ed6e62e9940e1e4054a2c7ac3e567d5ed3add1
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 paths in UI messages. It does not help users,
rather
confuse them. Also in log, we give enough information, ie the file and
method used.
Also removes all useless "this." in SimpleMethod class
Conflicts handled by hand in SimpleMethod.java
---
.../org/apache/ofbiz/minilang/MiniLangRuntimeException.java | 2 +-
.../src/main/java/org/apache/ofbiz/minilang/SimpleMethod.java | 10 ++--------
.../java/org/apache/ofbiz/minilang/ValidationException.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/envops/Break.java | 2 +-
.../java/org/apache/ofbiz/minilang/method/envops/Continue.java | 2 +-
5 files changed, 6 insertions(+), 12 deletions(-)
diff --git
a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangRuntimeException.java
b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangRuntimeException.java
index 1108b350a1..09aa891888 100644
---
a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangRuntimeException.java
+++
b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/MiniLangRuntimeException.java
@@ -41,7 +41,7 @@ public class MiniLangRuntimeException extends
MiniLangException {
StringBuilder sb = new StringBuilder(super.getMessage());
if (this.element != null) {
SimpleMethod method = this.element.getSimpleMethod();
- sb.append(" Method = ").append(method.getMethodName()).append(",
File = ").append(method.getFromLocation());
+ sb.append(", File#Method =
").append(method.getFileName()).append("#").append(method.getMethodName());
sb.append(", Element =
<").append(this.element.getTagName()).append(">");
sb.append(", Line ").append(this.element.getLineNumber());
}
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 11a8be6f77..d4895c25db 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
@@ -631,8 +631,7 @@ public final class SimpleMethod extends MiniLangElement {
}
// rollback here passing beganTransaction to either rollback, or
set rollback only
try {
- TransactionUtil.rollback(beganTransaction, "Error in
simple-method [" + getShortDescription() + "]: "
- + summaryErrorStringBuffer, null);
+ TransactionUtil.rollback(beganTransaction,
summaryErrorStringBuffer.toString(), null);
} catch (GenericTransactionException e) {
String errMsg = "Error trying to rollback transaction, could
not process method: " + e.getMessage();
if (methodContext.isTraceOn()) {
@@ -754,14 +753,9 @@ public final class SimpleMethod extends MiniLangElement {
}
public String getShortDescription() {
- if (fromLocation.contains("file:") &&
fromLocation.contains("Events.xml")) {
- return getFileName() + "#" + getMethodName();
- } else {
- return shortDescription + " [" + fromLocation + "#" + methodName +
"]";
- }
+ return shortDescription + " [" + getFileName() + "#" + methodName +
"]";
}
-
@Override
public SimpleMethod getSimpleMethod() {
return this;
diff --git
a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/ValidationException.java
b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/ValidationException.java
index 17b8aeba67..278496990b 100644
---
a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/ValidationException.java
+++
b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/ValidationException.java
@@ -39,7 +39,7 @@ public class ValidationException extends MiniLangException {
public String getMessage() {
StringBuilder sb = new StringBuilder(super.getMessage());
if (method != null) {
- sb.append(" Method = ").append(method.getMethodName()).append(",
File = ").append(method.getFromLocation());
+ sb.append(", File#Method =
").append(method.getFileName()).append("#").append(method.getMethodName());
}
if (element != null) {
sb.append(", Element =
<").append(element.getTagName()).append(">");
diff --git
a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java
b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java
index 2a07d09ca6..2abe418046 100644
---
a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java
+++
b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Break.java
@@ -55,7 +55,7 @@ public class Break extends MethodOperation {
public String getMessage() {
StringBuilder sb = new StringBuilder(super.getMessage());
SimpleMethod method = getSimpleMethod();
- sb.append(" Method = ").append(method.getMethodName()).append(",
File = ").append(method.getFromLocation());
+ sb.append(", File#Method =
").append(method.getFileName()).append("#").append(method.getMethodName());
sb.append(", Element = <break>, Line ").append(getLineNumber());
return sb.toString();
}
diff --git
a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java
b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java
index e0241f2a94..f4297afb26 100644
---
a/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java
+++
b/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/envops/Continue.java
@@ -55,7 +55,7 @@ public class Continue extends MethodOperation {
public String getMessage() {
StringBuilder sb = new StringBuilder(super.getMessage());
SimpleMethod method = getSimpleMethod();
- sb.append(" Method = ").append(method.getMethodName()).append(",
File = ").append(method.getFromLocation());
+ sb.append(", File#Method =
").append(method.getFileName()).append("#").append(method.getMethodName());
sb.append(", Element = <continue>, Line ").append(getLineNumber());
return sb.toString();
}
