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

Change getTokens "mapName" parameter to condition #869

Merged
merged 1 commit into from
Oct 31, 2019
Merged

Change getTokens "mapName" parameter to condition #869

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 32 additions & 24 deletions src/main/java/net/rptools/maptool/client/functions/FindTokenFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ public boolean matchToken(Token t) {
private FindTokenFunctions() {
super(
0,
3,
2,
"findToken",
"currentToken",
"getTokenName",
Expand Down Expand Up @@ -264,7 +264,6 @@ public Object childEvaluate(Parser parser, String functionName, List<Object> par
String delim = ",";
FindType findType;
String findArgs = null;
ZoneRenderer zoneRenderer = MapTool.getFrame().getCurrentZoneRenderer();
if (functionName.equals("currentToken")) {
FunctionUtil.checkNumberParam(functionName, parameters, 0, 0);
findType = FindType.CURRENT;
Expand All @@ -284,10 +283,9 @@ public Object childEvaluate(Parser parser, String functionName, List<Object> par
findType = FindType.NPC;
delim = !parameters.isEmpty() ? parameters.get(0).toString() : delim;
} else if (functionName.startsWith("getToken")) {
FunctionUtil.checkNumberParam(functionName, parameters, 0, 3);
FunctionUtil.checkNumberParam(functionName, parameters, 0, 2);
findType = FindType.ALL;
delim = !parameters.isEmpty() ? parameters.get(0).toString() : delim;
zoneRenderer = FunctionUtil.getZoneRendererFromParam(functionName, parameters, 2);
} else if (functionName.startsWith("getExposedToken")) {
FunctionUtil.checkNumberParam(functionName, parameters, 0, 1);
findType = FindType.EXPOSED;
Expand Down Expand Up @@ -317,9 +315,9 @@ public Object childEvaluate(Parser parser, String functionName, List<Object> par

// Special case of getToken,getTokenNames where a JSON object supplies arguments
if (findType == FindType.ALL && parameters.size() > 1) {
return getTokenList(parser, nameOnly, delim, parameters.get(1).toString(), zoneRenderer);
return getTokenList(parser, nameOnly, delim, parameters.get(1).toString());
}
return getTokens(parser, findType, nameOnly, delim, findArgs, zoneRenderer);
return getTokens(parser, findType, nameOnly, delim, findArgs);
}

/**
Expand All @@ -330,12 +328,10 @@ public Object childEvaluate(Parser parser, String functionName, List<Object> par
* @param nameOnly whether to return only token names (<code>false</code> = token GUIDs)
* @param delim either <code>json</code> or a string delimiter between output entries
* @param jsonString incoming JSON data structure to filter results
* @param zoneRenderer the zone renderer of the map where the tokens are
* @return list of filtered tokens
* @throws ParserException
* @throws ParserException if a condition is incorrect
*/
private Object getTokenList(
Parser parser, boolean nameOnly, String delim, String jsonString, ZoneRenderer zoneRenderer)
private Object getTokenList(Parser parser, boolean nameOnly, String delim, String jsonString)
throws ParserException {
JSONObject jobj = JSONObject.fromObject(jsonString);

Expand All @@ -355,6 +351,22 @@ private Object getTokenList(
layers.add(o.toString());
}
}
ZoneRenderer zoneRenderer;
String mapName;
if (!jobj.containsKey("mapName")) {
mapName = null; // set to null so findToken searches the current map
zoneRenderer = MapTool.getFrame().getCurrentZoneRenderer();
} else {
mapName = jobj.get("mapName").toString();
zoneRenderer = MapTool.getFrame().getZoneRenderer(mapName);
if (zoneRenderer == null) {
throw new ParserException(
I18N.getText(
"macro.function.moveTokenMap.unknownMap",
nameOnly ? "getTokenNames" : "getTokens",
mapName));
}
}
Zone zone = zoneRenderer.getZone();
allTokens = zone.getTokensFiltered(new LayerFilter(layers));
List<Token> tokenList = new ArrayList<Token>(allTokens.size());
Expand Down Expand Up @@ -462,7 +474,7 @@ private Object getTokenList(
TokenLocationFunctions instance = TokenLocationFunctions.getInstance();
Token token;
if (range.containsKey("token")) {
token = findToken(range.getString("token"), null);
token = findToken(range.getString("token"), mapName);
if (token == null) {
throw new ParserException(
I18N.getText(
Expand All @@ -471,7 +483,7 @@ private Object getTokenList(
} else {
GUID guid = MapTool.getFrame().getCommandPanel().getIdentityGUID();
if (guid != null) token = zone.getToken(guid);
else token = findToken(MapTool.getFrame().getCommandPanel().getIdentity(), null);
else token = findToken(MapTool.getFrame().getCommandPanel().getIdentity(), mapName);
if (token == null) {
throw new ParserException(
I18N.getText("macro.function.general.noImpersonated", "getTokens"));
Expand Down Expand Up @@ -510,7 +522,7 @@ private Object getTokenList(
TokenLocationFunctions instance = TokenLocationFunctions.getInstance();
Token token;
if (area.containsKey("token")) {
token = findToken(area.getString("token"), null);
token = findToken(area.getString("token"), mapName);
if (token == null) {
throw new ParserException(
I18N.getText(
Expand All @@ -519,7 +531,7 @@ private Object getTokenList(
} else {
GUID guid = MapTool.getFrame().getCommandPanel().getIdentityGUID();
if (guid != null) token = zone.getToken(guid);
else token = findToken(MapTool.getFrame().getCommandPanel().getIdentity(), null);
else token = findToken(MapTool.getFrame().getCommandPanel().getIdentity(), mapName);
if (token == null) {
throw new ParserException(
I18N.getText("macro.function.general.noImpersonated", "getTokens"));
Expand Down Expand Up @@ -698,19 +710,14 @@ private static List<Token> getTokensFiltered(
* @param nameOnly If a list of names is wanted.
* @param delim The delimiter to use for lists, or "json" for a json array.
* @param findArgs Any arguments for the find function
* @param zoneRenderer the zone renderer of the map
* @return a string list that contains the ids or names of the tokens.
* @throws ParserException if this code adds a new enum but doesn't properly handle it
*/
private String getTokens(
Parser parser,
FindType findType,
boolean nameOnly,
String delim,
String findArgs,
ZoneRenderer zoneRenderer)
Parser parser, FindType findType, boolean nameOnly, String delim, String findArgs)
throws ParserException {
ArrayList<String> values = new ArrayList<String>();
ZoneRenderer zoneRenderer = MapTool.getFrame().getCurrentZoneRenderer();
Zone zone = zoneRenderer.getZone();
List<Token> tokens =
getTokenList(parser, findType, findArgs, true, zone.getAllTokens(), zoneRenderer);
Expand All @@ -732,10 +739,11 @@ private String getTokens(
}

/**
* Finds the specified token.
* Finds the specified token id.
*
* @param identifier the name of the token.
* @return the token.
* @param zoneName the name of the zone.
* @return the token Id, or a blank string if none found.
*/
private String findTokenId(String identifier, String zoneName) {
Token token = findToken(identifier, zoneName);
Expand All @@ -747,7 +755,7 @@ private String findTokenId(String identifier, String zoneName) {
*
* @param identifier the name of the token.
* @param zoneName the name of the zone.
* @return the token.
* @return the token, or null if none found.
*/
public static Token findToken(String identifier, String zoneName) {
if (zoneName == null || zoneName.length() == 0) {
Expand Down