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

Merge pull request #182 from enderw88/master

Browse Source 
Prevent NPE when an uninitialized table cell is rendered.
This commit is contained in:
kruland2607 2014-02-25 17:26:05 -06:00
commit bb0be8da6f
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);
switch (column) {
case 0: {
label.setText(descriptor.format(rocket, (String) value));
regular(label);
setSelected(label, table, isSelected, hasFocus);
return label;
}
default: {
Pair<String, T> v = (Pair<String, T>) value;
String id = v.getU();
T component = v.getV();
label = format(component, id, label );
setSelected(label, table, isSelected, hasFocus);
return label;
}
}
case 0: {
label.setText(descriptor.format(rocket, (String) value));
regular(label);
setSelected(label, table, isSelected, hasFocus);
return label;
}
default: {
Pair<String, T> v = (Pair<String, T>) value;
if(v!=null){
String id = v.getU();
T component = v.getV();
label = format(component, id, label );
}
setSelected(label, table, isSelected, hasFocus);
return label;
}
}
}
private final void setSelected( JComponent c, JTable table, boolean isSelected, boolean hasFocus ) {