From 79a2b32d632672caa7906ea02409bba285fdf96d Mon Sep 17 00:00:00 2001 From: SiboVG Date: Mon, 28 Nov 2022 23:42:21 +0100 Subject: [PATCH 1/2] [#1813] Update previous selection on sim addition/deletion --- swing/src/net/sf/openrocket/gui/main/SimulationPanel.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java index abc649ddd..cc6466470 100644 --- a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java +++ b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java @@ -275,6 +275,7 @@ public class SimulationPanel extends JPanel { simulationTableModel.fireTableDataChanged(); simulationTable.clearSelection(); simulationTable.addRowSelectionInterval(n, n); + updatePreviousSelection(); openDialog(false, sim); } @@ -347,6 +348,7 @@ public class SimulationPanel extends JPanel { document.removeSimulation(selection[i]); } simulationTableModel.fireTableDataChanged(); + updatePreviousSelection(); takeTheSpotlight(); } From 1fb69f3a1f236602f2d3086ee524af68f0cc366f Mon Sep 17 00:00:00 2001 From: SiboVG Date: Mon, 28 Nov 2022 23:42:38 +0100 Subject: [PATCH 2/2] [#1813] Build in extra safety-check on taking the spotlight --- swing/src/net/sf/openrocket/gui/main/SimulationPanel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java index cc6466470..1716cc016 100644 --- a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java +++ b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java @@ -1009,6 +1009,9 @@ public class SimulationPanel extends JPanel { } else { simulationTable.clearSelection(); for (int row : previousSelection) { + if (row < 0 || row >= simulationTable.getRowCount()) { + continue; + } simulationTable.addRowSelectionInterval(row, row); } }