Merge pull request #5894 from kwvanderlinde/bugfix/5643-null-stat-sheet-location

Fix null stat sheet location

Author: cwisniew

src/main/java/net/rptools/maptool/client/ui/campaignproperties/TokenPropertiesManagementPanel.java

@@ -487,9 +487,8 @@ private void populateStatSheetComboBoxes(String propertyType) {
     var statSheetProperty = tokenTypeStatSheetMap.get(propertyType);
     String id;
     if (statSheetProperty == null) {
-      id = ssManager.getDefaultStatSheetId();
-      tokenTypeStatSheetMap.put(
-          propertyType, new StatSheetProperties(ssManager.getDefaultStatSheetId(), null));
+      id = StatSheetManager.LEGACY_STATSHEET.id();
+      tokenTypeStatSheetMap.put(propertyType, new StatSheetProperties(id, null));
     } else {
       id = statSheetProperty.id();
     }
@@ -522,7 +521,7 @@ public void initStatSheetDetails() {
           if (getStatSheetComboBox().hasFocus()) { // Only if user has made change
             var tokenType = (String) getTokenTypeList().getSelectedValue();
             if (ss != null && tokenType != null) {
-              var id = new StatSheetManager().getId(ss);
+              var id = ss.id();
               var location = tokenTypeStatSheetMap.get(tokenType).location();
               tokenTypeStatSheetMap.put(tokenType, new StatSheetProperties(id, location));
               getStatSheetLocationComboBox().setSelectedItem(location);

src/main/java/net/rptools/maptool/client/ui/token/dialog/create/NewTokenDialog.java

@@ -166,14 +166,10 @@ public boolean commit() {
 
     var statSheet = (StatSheet) getStatSheetComboBox().getSelectedItem();
     var location = (StatSheetLocation) getStatSheetLocationComboBox().getSelectedItem();
-    var ssManager = new StatSheetManager();
     if (statSheet == null || (statSheet.name() == null && statSheet.namespace() == null)) {
       token.useDefaultStatSheet();
     } else {
-      if (location == null) {
-        location = StatSheetLocation.BOTTOM_LEFT;
-      }
-      token.setStatSheet(new StatSheetProperties(ssManager.getId(statSheet), location));
+      token.setStatSheet(new StatSheetProperties(statSheet.id(), location));
     }
 
     return true;

src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/EditTokenDialog.java

@@ -908,12 +908,8 @@ public boolean commit() {
     if (ss == null || (ss.name() == null && ss.namespace() == null)) {
       token.useDefaultStatSheet();
     } else {
-      var ssManager = new StatSheetManager();
       var location = (StatSheetLocation) getStatSheetLocationCombo().getSelectedItem();
-      if (location == null) {
-        location = StatSheetLocation.BOTTOM_LEFT;
-      }
-      token.setStatSheet(new StatSheetProperties(ssManager.getId(ss), location));
+      token.setStatSheet(new StatSheetProperties(ss.id(), location));
     }
 
     /* Macros */

src/main/java/net/rptools/maptool/model/CampaignProperties.java

@@ -50,7 +50,6 @@
 import net.rptools.maptool.client.ui.token.YieldTokenOverlay;
 import net.rptools.maptool.language.I18N;
 import net.rptools.maptool.model.drawing.DrawableColorPaint;
-import net.rptools.maptool.model.sheet.stats.StatSheetLocation;
 import net.rptools.maptool.model.sheet.stats.StatSheetManager;
 import net.rptools.maptool.model.sheet.stats.StatSheetProperties;
 import net.rptools.maptool.server.proto.CampaignPropertiesDto;
@@ -212,9 +211,7 @@ public Map<String, List<TokenProperty>> getTokenTypeMap() {
    */
   public StatSheetProperties getTokenTypeDefaultStatSheet(String propertyType) {
     return tokenTypeStatSheetMap.getOrDefault(
-        propertyType,
-        new StatSheetProperties(
-            StatSheetManager.LEGACY_STATSHEET_ID, StatSheetLocation.BOTTOM_LEFT));
+        propertyType, new StatSheetProperties(StatSheetManager.LEGACY_STATSHEET_ID, null));
   }
 
   /**

src/main/java/net/rptools/maptool/model/sheet/stats/StatSheet.java

@@ -30,6 +30,10 @@
  */
 public record StatSheet(
     String name, String description, URL entry, Set<String> propertyTypes, String namespace) {
+  public String id() {
+    return namespace + "." + name;
+  }
+
   @Override
   public boolean equals(Object obj) {
     if (!(obj instanceof StatSheet other)) {

src/main/java/net/rptools/maptool/model/sheet/stats/StatSheetManager.java

@@ -76,42 +76,6 @@ public class StatSheetManager {
     statSheets.put(NO_STATSHEET, "");
   }
 
-  /**
-   * Returns the default stat sheet.
-   *
-   * @return the default stat sheet.
-   */
-  public StatSheet getDefaultStatSheet() {
-    return LEGACY_STATSHEET;
-  }
-
-  /**
-   * Returns the id of the default stat sheet.
-   *
-   * @return the id of the default stat sheet.
-   */
-  public String getDefaultStatSheetId() {
-    return getId(LEGACY_STATSHEET);
-  }
-
-  /**
-   * Returns the "no" stat sheet.
-   *
-   * @return the "no" stat sheet.
-   */
-  public StatSheet getNoStatSheet() {
-    return NO_STATSHEET;
-  }
-
-  /**
-   * Returns the id of the "no" stat sheet.
-   *
-   * @return the id of the "no" stat sheet.
-   */
-  public String getNoStatSheetId() {
-    return getId(NO_STATSHEET);
-  }
-
   /**
    * Returns the name and namespace of the stat sheet with the given id.
    *
@@ -201,17 +165,6 @@ public StatSheet getStatSheet(String id) {
     return getStatSheet(name[0], name[1]);
   }
 
-  /**
-   * Returns the id of the stat sheet with the given namespace and name.
-   *
-   * @param namespace the namespace of the stat sheet.
-   * @param name the name of the stat sheet.
-   * @return the id of the stat sheet with the given namespace and name.
-   */
-  public String getId(String namespace, String name) {
-    return namespace + "." + name;
-  }
-
   /**
    * Returns the id of the stat sheet.
    *
@@ -302,16 +255,6 @@ public String getStatSheetContent(String id) {
     return getStatSheetContent(name[0], name[1]);
   }
 
-  /**
-   * Returns the id of the stat sheet.
-   *
-   * @param ss the stat sheet.
-   * @return the id of the stat sheet.
-   */
-  public String getId(StatSheet ss) {
-    return getId(ss.namespace(), ss.name());
-  }
-
   /**
    * Compares two stat sheets. Internal stat sheets (null, legacy, and no stat sheet) come before
    * non-internal stat sheets. Among internal stat sheets, null (default) comes first, then legacy,

src/main/java/net/rptools/maptool/model/sheet/stats/StatSheetProperties.java

@@ -15,6 +15,7 @@
 package net.rptools.maptool.model.sheet.stats;
 
 import java.util.Objects;
+import javax.annotation.Nullable;
 import net.rptools.maptool.server.proto.StatSheetPropertiesDto;
 
 /**
@@ -33,11 +34,12 @@ public final class StatSheetProperties {
    * Creates a new instance of the class.
    *
    * @param id The id of the stat sheet.
-   * @param location The location of the stat sheet.
+   * @param location The location of the stat sheet, or {@code null} to use the default of {@link
+   *     StatSheetLocation#BOTTOM_LEFT}.
    */
-  public StatSheetProperties(String id, StatSheetLocation location) {
+  public StatSheetProperties(String id, @Nullable StatSheetLocation location) {
     this.id = id;
-    this.location = location;
+    this.location = Objects.requireNonNullElse(location, StatSheetLocation.BOTTOM_LEFT);
   }
 
   /**