Skip to content

Commit

Permalink
Ran spotlessApply
Browse files Browse the repository at this point in the history
  • Loading branch information
@Azhrei
Azhrei committed May 26, 2024
1 parent 2efe7fc commit 5eb4b75
Show file tree
Hide file tree
Showing 6 changed files with 249 additions and 239 deletions.
130 changes: 72 additions & 58 deletions src/main/java/net/rptools/maptool/client/functions/LookupTableFunction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonPrimitive;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import net.rptools.lib.MD5Key;
import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.client.functions.json.JSONMacroFunctions;
Expand All @@ -33,12 +38,6 @@
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

import java.io.Serializable;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;

public class LookupTableFunction extends AbstractFunction {

public LookupTableFunction() {
Expand All @@ -53,7 +52,7 @@ public LookupTableFunction() {
"getTableRoll",
"setTableRoll",
"clearTable",
"loadTable", // bulk table import
"loadTable", // bulk table import
"addTableEntry",
"deleteTableEntry",
"createTable",
Expand Down Expand Up @@ -139,7 +138,8 @@ public Object childEvaluate(
}
}

private @Nullable Serializable tbl_and_table(String function, List<Object> params) throws ParserException {
private @Nullable Serializable tbl_and_table(String function, List<Object> params)
throws ParserException {
FunctionUtil.checkNumberParam(function, params, 1, 3);
String name = params.get(0).toString();

Expand All @@ -166,7 +166,9 @@ public Object childEvaluate(
} catch (NumberFormatException nfe) {
return val;
}
} else if (function.equalsIgnoreCase("tableImage") || function.equalsIgnoreCase("tblImage")) { // We want the image URI through tblImage or tableImage
} else if (function.equalsIgnoreCase("tableImage")
|| function.equalsIgnoreCase(
"tblImage")) { // We want the image URI through tblImage or tableImage
if (result.getImageId() == null) {
return "";
}
Expand All @@ -191,12 +193,14 @@ public Object childEvaluate(
}

/**
* Returns the lookupTable object identified by <code>name</code> if
* it exists in the campaign. Otherwise, throws <code>ParserException</code>.
* Returns the lookupTable object identified by <code>name</code> if it exists in the campaign.
* Otherwise, throws <code>ParserException</code>.
*
* @param function name of MTscript function (for error message)
* @param name name of table
* @return table identified by <code>name</code>
* @throws ParserException Thrown for any access errors to the named table (unknown, access prohibited, or table doesn't exist)
* @throws ParserException Thrown for any access errors to the named table (unknown, access
* prohibited, or table doesn't exist)
*/
private LookupTable checkTableAccess(String name, String function) throws ParserException {
LookupTable lookupTable = MapTool.getCampaign().getLookupTableMap().get(name);
Expand Down Expand Up @@ -224,15 +228,17 @@ private int getTablePicksLeft(String function, List<Object> params) throws Parse
return lookupTable.getPicksLeft();
}

private @NotNull BigDecimal getTablePickOnce(String function, List<Object> params) throws ParserException {
private @NotNull BigDecimal getTablePickOnce(String function, List<Object> params)
throws ParserException {
checkTrusted(function);
FunctionUtil.checkNumberParam("getTablePickOnce", params, 1, 1);
String name = params.getFirst().toString();
LookupTable lookupTable = checkTableAccess(name, function);
return lookupTable.getPickOnce() ? BigDecimal.ONE : BigDecimal.ZERO;
}

private @NotNull BigDecimal setTablePickOnce(String function, List<Object> params) throws ParserException {
private @NotNull BigDecimal setTablePickOnce(String function, List<Object> params)
throws ParserException {
checkTrusted(function);
FunctionUtil.checkNumberParam("setTablePickOnce", params, 2, 2);
String name = params.get(0).toString();
Expand All @@ -244,24 +250,23 @@ private int getTablePicksLeft(String function, List<Object> params) throws Parse
}

/**
* Resets the entries on a table with regard to whether such entries have been
* selected already. This is used in the PickOnce family of tables.
* Resets the entries on a table with regard to whether such entries have been selected already.
* This is used in the PickOnce family of tables.
*
* <ul>
* <li>
* {@code resetTablePicks(tblName)} - reset all entries on a table
* <li>
* {@code resetTablePicks(tblName, entriesToReset)} - reset specific entries from a String List with "," delim
* <li>
* {@code resetTablePicks(tblName, entriesToReset, delim)} - use custom delimiter
* <li>
* {@code resetTablePicks(tblName, entriesToReset, "json")} - entriesToReset is a JsonArray
* <li>{@code resetTablePicks(tblName)} - reset all entries on a table
* <li>{@code resetTablePicks(tblName, entriesToReset)} - reset specific entries from a String
* List with "," delim
* <li>{@code resetTablePicks(tblName, entriesToReset, delim)} - use custom delimiter
* <li>{@code resetTablePicks(tblName, entriesToReset, "json")} - entriesToReset is a JsonArray
* </ul>
*
* @param function name of the MTscript function (used for error messages)
* @param params list of function parameters
* @throws ParserException Thrown when an invalid or missing parameter is supplied
*/
private @NotNull String resetTablePicks(String function, List<Object> params) throws ParserException {
private @NotNull String resetTablePicks(String function, List<Object> params)
throws ParserException {
checkTrusted(function);
FunctionUtil.checkNumberParam(function, params, 1, 3);
String tblName = params.get(0).toString();
Expand All @@ -286,7 +291,8 @@ private int getTablePicksLeft(String function, List<Object> params) throws Parse
return "";
}

private @NotNull Object getTableEntry(String function, List<Object> params) throws ParserException {
private @NotNull Object getTableEntry(String function, List<Object> params)
throws ParserException {
FunctionUtil.checkNumberParam(function, params, 2, 2);
String name = params.get(0).toString();
LookupTable lookupTable = checkTableAccess(name, function);
Expand All @@ -295,8 +301,7 @@ private int getTablePicksLeft(String function, List<Object> params) throws Parse
if (entry == null) return "";

int rollInt = Integer.parseInt(roll);
if (rollInt < entry.getMin() || rollInt > entry.getMax())
return "";
if (rollInt < entry.getMin() || rollInt > entry.getMax()) return "";

JsonObject entryDetails = new JsonObject();
entryDetails.addProperty("min", entry.getMin());
Expand Down Expand Up @@ -327,8 +332,7 @@ private int setTableEntry(String function, List<Object> params) throws ParserExc
LookupEntry entry = lookupTable.getLookup(roll);
if (entry == null) return 0;
int rollInt = Integer.parseInt(roll);
if (rollInt < entry.getMin() || rollInt > entry.getMax())
return 0;
if (rollInt < entry.getMin() || rollInt > entry.getMax()) return 0;
List<LookupEntry> oldlist = new ArrayList<>(lookupTable.getEntryList());
lookupTable.clearEntries();
for (LookupEntry e : oldlist) {
Expand Down Expand Up @@ -357,7 +361,8 @@ private int setTableEntry(String function, List<Object> params) throws ParserExc
return "";
}

private @NotNull String setTableImage(String function, List<Object> params) throws ParserException {
private @NotNull String setTableImage(String function, List<Object> params)
throws ParserException {
checkTrusted(function);
FunctionUtil.checkNumberParam("setTableImage", params, 2, 2);
String name = params.get(0).toString();
Expand All @@ -368,7 +373,8 @@ private int setTableEntry(String function, List<Object> params) throws ParserExc
return "";
}

private @NotNull Serializable getTableImage(String function, List<Object> params) throws ParserException {
private @NotNull Serializable getTableImage(String function, List<Object> params)
throws ParserException {
checkTrusted(function);
FunctionUtil.checkNumberParam("getTableImage", params, 1, 1);
String name = params.getFirst().toString();
Expand Down Expand Up @@ -408,7 +414,8 @@ private int setTableEntry(String function, List<Object> params) throws ParserExc
return "";
}

private @NotNull String deleteTableEntry(String function, List<Object> params) throws ParserException {
private @NotNull String deleteTableEntry(String function, List<Object> params)
throws ParserException {
checkTrusted(function);
FunctionUtil.checkNumberParam("deleteTableEntry", params, 2, 2);
String name = params.get(0).toString();
Expand All @@ -427,7 +434,8 @@ private int setTableEntry(String function, List<Object> params) throws ParserExc
return "";
}

private @NotNull String addTableEntry(String function, List<Object> params) throws ParserException {
private @NotNull String addTableEntry(String function, List<Object> params)
throws ParserException {
checkTrusted(function);
FunctionUtil.checkNumberParam("addTableEntry", params, 4, 5);
String name = params.get(0).toString();
Expand Down Expand Up @@ -455,30 +463,32 @@ private int setTableEntry(String function, List<Object> params) throws ParserExc
}

/**
* Loads bulk data into a table. The table must already exist. Usage:
* <p>
* {@code [h: loadTable(name, jsondata)]}
* </p>
* <p>
* The {@code jsondata} must be a JSON Array containing table entries, and
* each table entry must be a JSON Array containing:
* Loads bulk data into a table. The table must already exist. Usage:
*
* <p>{@code [h: loadTable(name, jsondata)]}
*
* <p>The {@code jsondata} must be a JSON Array containing table entries, and each table entry
* must be a JSON Array containing:
*
* <ol>
* <li>an integer representing the lower range of the die roll (decimals are truncated),</li>
* <li>an integer representing the upper range of the die roll (decimals are truncated),</li>
* <li>a String acting as the content of the row, and</li>
* <li>a String acting as an image reference (as {@code asset://}, {@code image:}, or {@code MD5Key})</li>
* <li>an integer representing the lower range of the die roll (decimals are truncated),
* <li>an integer representing the upper range of the die roll (decimals are truncated),
* <li>a String acting as the content of the row, and
* <li>a String acting as an image reference (as {@code asset://}, {@code image:}, or {@code
* MD5Key})
* </ol>
* </p>
*
* @param function name of this MTscript function, "{@code loadTable}"
* @param params parameters of the MTscript function
* @return a number indicating the successful record count, or
* a {@link JsonArray} of all elements that failed to load
* @throws ParserException Thrown when syntax errors are detected in the input data.
* This includes negative numbers in either of the numeric fields of a table entry,
* a lower die roll that is greater than the upper die roll of a table entry and vice versa,
* missing fields, too many fields, and potentially many more.
* @return a number indicating the successful record count, or a {@link JsonArray} of all elements
* that failed to load
* @throws ParserException Thrown when syntax errors are detected in the input data. This includes
* negative numbers in either of the numeric fields of a table entry, a lower die roll that is
* greater than the upper die roll of a table entry and vice versa, missing fields, too many
* fields, and potentially many more.
*/
private @NotNull JsonElement loadTable(String function, List<Object> params) throws ParserException {
private @NotNull JsonElement loadTable(String function, List<Object> params)
throws ParserException {
checkTrusted(function);
FunctionUtil.checkNumberParam(function, params, 3, 3);
String name = params.get(0).toString();
Expand Down Expand Up @@ -510,7 +520,7 @@ private int setTableEntry(String function, List<Object> params) throws ParserExc
counter++;
}
}
} catch (UnsupportedOperationException|NumberFormatException|IllegalStateException e) {
} catch (UnsupportedOperationException | NumberFormatException | IllegalStateException e) {
// Make a list of all failing rows to return to the user.
errorRows.add(rowindex);
}
Expand Down Expand Up @@ -541,7 +551,8 @@ private String getTableRoll(String function, List<Object> params) throws ParserE
return lookupTable.getDefaultRoll();
}

private @NotNull BigDecimal setTableAccess(String function, List<Object> params) throws ParserException {
private @NotNull BigDecimal setTableAccess(String function, List<Object> params)
throws ParserException {
checkTrusted(function);
FunctionUtil.checkNumberParam("setTableAccess", params, 2, 2);
String name = params.get(0).toString();
Expand All @@ -552,15 +563,17 @@ private String getTableRoll(String function, List<Object> params) throws ParserE
return lookupTable.getAllowLookup() ? BigDecimal.ONE : BigDecimal.ZERO;
}

private @NotNull BigDecimal getTableAccess(String function, List<Object> params) throws ParserException {
private @NotNull BigDecimal getTableAccess(String function, List<Object> params)
throws ParserException {
checkTrusted(function);
FunctionUtil.checkNumberParam("getTableAccess", params, 1, 1);
String name = params.getFirst().toString();
LookupTable lookupTable = checkTableAccess(name, function);
return lookupTable.getAllowLookup() ? BigDecimal.ONE : BigDecimal.ZERO;
}

private @NotNull BigDecimal setTableVisible(String function, List<Object> params) throws ParserException {
private @NotNull BigDecimal setTableVisible(String function, List<Object> params)
throws ParserException {
checkTrusted(function);
FunctionUtil.checkNumberParam("setTableVisible", params, 2, 2);
String name = params.get(0).toString();
Expand All @@ -571,7 +584,8 @@ private String getTableRoll(String function, List<Object> params) throws ParserE
return lookupTable.getVisible() ? BigDecimal.ONE : BigDecimal.ZERO;
}

private @NotNull BigDecimal getTableVisible(String function, List<Object> params) throws ParserException {
private @NotNull BigDecimal getTableVisible(String function, List<Object> params)
throws ParserException {
checkTrusted(function);
FunctionUtil.checkNumberParam("getTableVisible", params, 1, 1);
String name = params.getFirst().toString();
Expand Down
19 changes: 9 additions & 10 deletions src/main/java/net/rptools/maptool/client/functions/getInfoFunction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,15 @@
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import java.awt.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.List;
import java.util.concurrent.ConcurrentSkipListSet;
import javax.swing.*;
import net.rptools.maptool.client.AppPreferences;
import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.client.MapToolExpressionParser;
Expand All @@ -38,16 +47,6 @@
import net.rptools.parser.VariableResolver;
import net.rptools.parser.function.AbstractFunction;

import javax.swing.*;
import java.awt.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List;
import java.util.*;
import java.util.concurrent.ConcurrentSkipListSet;

public class getInfoFunction extends AbstractFunction {

/** The singleton instance. */
Expand Down
21 changes: 10 additions & 11 deletions src/main/java/net/rptools/maptool/client/ui/lookuptable/EditLookupTablePanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,16 @@
*/
package net.rptools.maptool.client.ui.lookuptable;

import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import javax.swing.*;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableModel;
import net.rptools.lib.MD5Key;
import net.rptools.maptool.client.MapTool;
import net.rptools.maptool.client.MapToolUtil;
Expand All @@ -26,17 +36,6 @@
import net.rptools.maptool.model.LookupTable;
import net.rptools.maptool.model.LookupTable.LookupEntry;

import javax.swing.*;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableModel;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

public class EditLookupTablePanel extends AbeillePanel<LookupTableTableModel> {
private static final long serialVersionUID = 2341539768448195059L;

Expand Down
Loading

0 comments on commit 5eb4b75

Please sign in to comment.