From 58c2df4336f9f69d7d4fe0d0e0eb3b2acd2aa269 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Thu, 21 Jul 2022 01:12:57 +0200 Subject: [PATCH] [#1516] Reselect preset row after favorite change --- .../sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java | 2 ++ .../gui/dialogs/preset/ComponentPresetTableColumn.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java index c361baebf..62c1bb31b 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTable.java @@ -77,9 +77,11 @@ public class ComponentPresetTable extends JTable { if ( columnIndex != 0 ) { return; } + int selectedRow = ComponentPresetTable.this.getSelectedRow(); ComponentPreset preset = ComponentPresetTable.this.presets.get(rowIndex); Application.getComponentPresetDao().setFavorite(preset, presetType, (Boolean) aValue); ComponentPresetTable.this.updateFavorites(); + ComponentPresetTable.this.setRowSelectionInterval(selectedRow, selectedRow); } @Override diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java index 6bf137b28..04821f75d 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetTableColumn.java @@ -33,7 +33,7 @@ public abstract class ComponentPresetTableColumn extends TableColumn { @Override public Object getValueFromPreset( Set favorites, ComponentPreset preset ) { - return Boolean.valueOf(favorites.contains(preset.preferenceKey())); + return favorites.contains(preset.preferenceKey()); } }