mirrors
/
freecol
mirror of https://github.com/FreeCol/freecol.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Defend against NPE in ColorCellRenderer.

This commit is contained in:
Mike Pope 2019-05-13 11:41:05 +09:30
parent 040edb610b
commit 5ba6bf7fdb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/sf/freecol/client/gui/panel/ColorCellRenderer.java
View File

@ -54,12 +54,14 @@ public class ColorCellRenderer extends JLabel implements TableCellRenderer {
public Component getTableCellRendererComponent(JTable table, Object color,
boolean isSelected, boolean hasFocus, int row, int column) {
final Color myColor = (Color)color;
setBackground(myColor);
Utility.localizeToolTip(this, StringTemplate
.template("info.rgb")
.addAmount("%red%", myColor.getRed())
.addAmount("%green%", myColor.getGreen())
.addAmount("%blue%", myColor.getBlue()));
if (myColor != null) {
setBackground(myColor);
Utility.localizeToolTip(this, StringTemplate
.template("info.rgb")
.addAmount("%red%", myColor.getRed())
.addAmount("%green%", myColor.getGreen())
.addAmount("%blue%", myColor.getBlue()));
}
return this;
}
}