hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent NPE when an uninitialized table cell is rendered.

Browse Source
This commit is contained in:
Craig Earls 2014-02-25 14:58:24 -07:00
parent f5d09233e8
commit cc54a98226
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
swing/src/net/sf/openrocket/gui/main/flightconfigpanel/FlightConfigurablePanel.java
View File

@ -169,21 +169,23 @@ public abstract class FlightConfigurablePanel<T extends FlightConfigurableCompon
column = table.convertColumnIndexToModel(column); column = table.convertColumnIndexToModel(column);
switch (column) { switch (column) {
case 0: { case 0: {
label.setText(descriptor.format(rocket, (String) value)); label.setText(descriptor.format(rocket, (String) value));
regular(label); regular(label);
setSelected(label, table, isSelected, hasFocus); setSelected(label, table, isSelected, hasFocus);
return label; return label;
} }
default: { default: {
Pair<String, T> v = (Pair<String, T>) value; Pair<String, T> v = (Pair<String, T>) value;
String id = v.getU(); if(v!=null){
T component = v.getV(); String id = v.getU();
label = format(component, id, label ); T component = v.getV();
setSelected(label, table, isSelected, hasFocus); label = format(component, id, label );
return label; }
} setSelected(label, table, isSelected, hasFocus);
} return label;
}
}
} }
private final void setSelected( JComponent c, JTable table, boolean isSelected, boolean hasFocus ) { private final void setSelected( JComponent c, JTable table, boolean isSelected, boolean hasFocus ) {