From da4cb7c71680fbc307eb3b1e779341f16e05edab Mon Sep 17 00:00:00 2001 From: Hanmac Date: Tue, 19 Jul 2016 06:32:47 +0000 Subject: [PATCH] ItemListView: return empty string instead of null to prevent the Tooltip from crashing --- .../java/forge/itemmanager/views/ItemListView.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java index ad5251d56dc..5e83c87bab5 100644 --- a/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java +++ b/forge-gui-desktop/src/main/java/forge/itemmanager/views/ItemListView.java @@ -493,9 +493,9 @@ public final class ItemListView extends ItemView { // if we're conditionally showing the tooltip, check to see // if we shouldn't show it - if (val == null) { return null; } + if (val == null) { return ""; } final String text = val.toString(); - if (text.isEmpty()) { return null; } + if (text.isEmpty()) { return ""; } if (!(renderer instanceof ItemCellRenderer) || !((ItemCellRenderer)renderer).alwaysShowTooltip()) { // if there's enough room (or there's no value), no tooltip @@ -505,7 +505,7 @@ public final class ItemListView extends ItemView { final int requiredWidth = cell.getPreferredSize().width; final TableColumn tableColumn = this.getColumnModel().getColumn(col); if (tableColumn.getWidth() > requiredWidth) { - return null; + return ""; } } @@ -520,12 +520,12 @@ public final class ItemListView extends ItemView { final int col = columnAtPoint(p); if (col >= getColumnCount() || row >= getRowCount()) { - return null; + return ""; } final Object val = getValueAt(row, col); if (val == null) { - return null; + return ""; } return getCellTooltip(getCellRenderer(row, col), row, col, val);