Merge pull request #5619 from kwvanderlinde/bugfix/5607-cast-exception

1.18 - Avoid potential for cast exceptions for token property table

Author: bubblobill

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

@@ -51,7 +51,6 @@
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 import javax.swing.table.AbstractTableModel;
-import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellRenderer;
 import javax.swing.text.Position.Bias;
 import javax.swing.text.html.HTMLDocument;
@@ -138,6 +137,10 @@ public EditTokenDialog() {
     this(new TokenPropertiesDialog());
   }
 
+  public void initPropertyTable() {
+    getPropertyTable().setModel(new TokenPropertyTableModel());
+  }
+
   public void initGMNotesEditorPane() {
     setGmNotesEnabled(MapTool.getPlayer().isGM());
   }
@@ -677,15 +680,9 @@ private void updatePropertiesTable(@Nullable Token token, final String propertyT
     EventQueue.invokeLater(
         () -> {
           PropertyTable pp = getPropertyTable();
-          if (token != null) {
-            var propertyList = MapTool.getCampaign().getTokenPropertyList(propertyType);
-
-            pp.setModel(
-                new TokenPropertyTableModel(
-                    token, propertyType, propertyList, propertyCellRenderer));
-          } else {
-            pp.setModel(new DefaultTableModel());
-          }
+          var propertyList = MapTool.getCampaign().getTokenPropertyList(propertyType);
+          pp.setModel(
+              new TokenPropertyTableModel(token, propertyType, propertyList, propertyCellRenderer));
           pp.expandAll();
         });
   }
@@ -925,7 +922,15 @@ public boolean commit() {
     token.setSpeechMap(((KeyValueTableModel) getSpeechTable().getModel()).getMap());
 
     /* Properties */
-    ((TokenPropertyTableModel) getPropertyTable().getModel()).applyTo(token);
+    var tableModel = getPropertyTable().getModel();
+    if (getPropertyTable().getModel() instanceof TokenPropertyTableModel tokenPropertyTableModel) {
+      tokenPropertyTableModel.applyTo(token);
+    } else {
+      log.warn(
+          "Property table model is not of the expected type; expected {} but got {}",
+          TokenPropertyTableModel.class,
+          tableModel.getClass());
+    }
 
     /* Charsheet */
     if (getCharSheetPanel().getImageId() != null) {
@@ -2165,16 +2170,21 @@ private static class TokenPropertyTableModel
     private final List<TokenProperty> propertyList;
     private final Map<String, String> propertyMap;
 
+    public TokenPropertyTableModel() {
+      propertyList = List.of();
+      propertyMap = Map.of();
+    }
+
     public TokenPropertyTableModel(
-        Token model,
+        @Nullable Token model,
         String propertyType,
         List<TokenProperty> propertyList,
         TableCellRenderer propertyCellRenderer) {
       this.propertyList = propertyList;
 
       this.propertyMap = new HashMap<>();
       for (TokenProperty property : propertyList) {
-        String value = (String) model.getProperty(property.getName());
+        String value = model == null ? null : (String) model.getProperty(property.getName());
         if (value == null) {
           value = property.getDefaultValue();
         }