Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Uses the proper function name in the error messages #3916

Merged
merged 2 commits into from
Apr 12, 2023
Merged

Uses the proper function name in the error messages #3916

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db143a3
Uses the proper function name in the error messages
emmebi Apr 11, 2023
da4258f
Merge branch 'develop' into issue-3833-bad-function-name
cwisniew Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions src/main/java/net/rptools/maptool/client/functions/Topology_Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,20 +354,18 @@ private JsonArray childEvaluateGetTokenTopology(
if (token == null) {
throw new ParserException(
I18N.getText(
"macro.function.general.unknownToken",
"getTokenVBL",
parameters.get(0).toString()));
"macro.function.general.unknownToken", functionName, parameters.get(0).toString()));
}
} else if (parameters.size() == 0) {
MapToolVariableResolver res = (MapToolVariableResolver) resolver;
token = res.getTokenInContext();
if (token == null) {
throw new ParserException(
I18N.getText("macro.function.general.noImpersonated", "getTokenVBL"));
I18N.getText("macro.function.general.noImpersonated", functionName));
}
} else {
throw new ParserException(
I18N.getText("macro.function.general.tooManyParam", "getTokenVBL", 1, parameters.size()));
I18N.getText("macro.function.general.tooManyParam", functionName, 1, parameters.size()));
}

JsonArray allShapes = new JsonArray();
Expand Down Expand Up @@ -437,7 +435,7 @@ private int childEvaluateSetTokenTopology(
}
if (token == null) {
throw new ParserException(
I18N.getText("macro.function.general.noImpersonated", "getTokenVBL"));
I18N.getText("macro.function.general.noImpersonated", functionName));
}

Area tokenTopology = new Area();
Expand Down Expand Up @@ -525,9 +523,7 @@ private void childEvaluateTransferTopology(
if (token == null) {
throw new ParserException(
I18N.getText(
"macro.function.general.unknownToken",
"getTokenVBL",
parameters.get(0).toString()));
"macro.function.general.unknownToken", functionName, parameters.get(0).toString()));
}
} else {
MapToolVariableResolver res = (MapToolVariableResolver) resolver;
Expand Down