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

Add debugging for NPE in GeneralOptimizationDialog

Browse Source
This commit is contained in:
Sampo Niskanen 2012-04-09 08:20:34 +00:00
parent 898c024cb7
commit 2ade1f3ac7
2 changed files with 91 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/ChangeLog
View File

@ -1,6 +1,7 @@
2012-04-09 Sampo Niskanen
* [BUG] Cancelling simulation causes later simulations to fail
* Add debugging for NPE in GeneralOptimizationDialog
2012-03-27 Sampo Niskanen

14
core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java
View File

@ -1014,7 +1014,7 @@ public class GeneralOptimizationDialog extends JDialog {
simulationSelectionCombo.setModel(new DefaultComboBoxModel(simulations.toArray()));
simulationSelectionCombo.setSelectedIndex(0);
if (current != null) {
for (int i = 0; i < simulations.size(); i++) {
if (simulations.get(i).toString().equals(current)) {
@ -1334,7 +1334,17 @@ public class GeneralOptimizationDialog extends JDialog {
*/
@SuppressWarnings("unchecked")
private Simulation getSelectedSimulation() {
return ((Named<Simulation>) simulationSelectionCombo.getSelectedItem()).get();
/* This is to debug a NPE where the returned selected item is null. */
Object item = simulationSelectionCombo.getSelectedItem();
if (item == null) {
String s = "Selected simulation is null:";
s = s + " item count=" + simulationSelectionCombo.getItemCount();
for (int i = 0; i < simulationSelectionCombo.getItemCount(); i++) {
s = s + " [" + i + "]=" + simulationSelectionCombo.getItemAt(i);
}
throw new BugException(s);
}
return ((Named<Simulation>) item).get();
}