Fix #22765: IAE when sending a null license

Signed-off-by: Taylor Smock <[email protected]>
JOSM · Feb 23, 2023 · 1ce9aa9 · 1ce9aa9
1 parent f1f69da
commit 1ce9aa9
Showing 1 changed file with 1 addition and 14 deletions.
diff --git a/...enstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIProvidersPanel.java b/...enstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIProvidersPanel.java
@@ -187,19 +187,6 @@ private static class MapWithAITableCellRenderer<T> extends DefaultTableCellRende
         @SuppressWarnings("unchecked")
         public final Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
                 boolean hasFocus, int row, int column) {
-            // See #22740
-            if (value == null) {
-                final StringBuilder message = new StringBuilder();
-                for (int tableRow = 0; tableRow < table.getRowCount(); tableRow++) {
-                    message.append('|');
-                    for (int tableCol = 0; tableCol < table.getColumnCount(); tableCol++) {
-                        final Object tableVal = table.getValueAt(tableRow, tableCol);
-                        message.append(tableVal).append('|');
-                    }
-                    message.append(System.lineSeparator());
-                }
-                throw new IllegalArgumentException("value was null:" + System.lineSeparator() + message);
-            }
             T obj = (T) value;
             JLabel label = (JLabel) super.getTableCellRendererComponent(table, mapper.apply(obj), isSelected, hasFocus,
                     row, column);
@@ -208,7 +195,7 @@ public final Component getTableCellRendererComponent(JTable table, Object value,
             GuiHelper.setBackgroundReadable(label, defaultColor);
 
             GuiHelper.setBackgroundReadable(label, isSelected ? selectedColor : defaultColor);
-            if (this.highlightIfActive) {
+            if (this.highlightIfActive && obj != null) {
                 MapWithAIInfo info = obj instanceof MapWithAIInfo ? (MapWithAIInfo) obj : reverseMapper.apply(obj);
                 if (info == null) {
                     GuiHelper.setBackgroundReadable(label, defaultColor);