Merge pull request #3916 from emmebi/issue-3833-bad-function-name

RPTools · Apr 12, 2023 · cb24645 · cb24645
2 parents 3dbb1fb + da4258f
commit cb24645
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/src/main/java/net/rptools/maptool/client/functions/Topology_Functions.java b/src/main/java/net/rptools/maptool/client/functions/Topology_Functions.java
@@ -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();
@@ -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();
@@ -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;