From 58c2df4336f9f69d7d4fe0d0e0eb3b2acd2aa269 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Thu, 21 Jul 2022 01:12:57 +0200
Subject: [PATCH 1/2] [#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<String> favorites, ComponentPreset preset ) {
-			return Boolean.valueOf(favorites.contains(preset.preferenceKey()));
+			return favorites.contains(preset.preferenceKey());
 		}
 
 	}

From a9ede4b9728043e32f185ea350989505de644729 Mon Sep 17 00:00:00 2001
From: SiboVG <sibo.vangool@hotmail.com>
Date: Thu, 21 Jul 2022 01:20:57 +0200
Subject: [PATCH 2/2] Add clarifying text for applying preset selection

---
 core/resources/l10n/messages.properties                        | 2 +-
 .../gui/dialogs/preset/ComponentPresetChooserDialog.java       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index e70342af9..93872611c 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -2099,7 +2099,7 @@ ComponentPresetChooserDialog.menu.sortDesc = Sort Descending
 ComponentPresetChooserDialog.menu.units = Units
 ComponentPresetChooserDialog.checkbox.showAllCompatible = Show all compatible
 ComponentPresetChooserDialog.checkbox.showLegacyCheckBox = Show Legacy Database
-ComponentPresetChooserDialog.lbl.favorites = Check to add preset to the preset drop-down menu in the component edit dialog
+ComponentPresetChooserDialog.lbl.favorites = Check to add preset to the preset drop-down menu in the component edit dialog<br>Directly apply a preset by double-clicking it or by selecting it and closing this window.
 table.column.Favorite = Favorite
 table.column.Legacy = Legacy
 table.column.Manufacturer = Manufacturer
diff --git a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
index 3061d6d62..6a1c417ad 100644
--- a/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
+++ b/swing/src/net/sf/openrocket/gui/dialogs/preset/ComponentPresetChooserDialog.java
@@ -25,6 +25,7 @@ import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;
 
 import net.miginfocom.swing.MigLayout;
+import net.sf.openrocket.gui.components.StyledLabel;
 import net.sf.openrocket.gui.util.GUIUtil;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.preset.ComponentPreset;
@@ -149,7 +150,7 @@ public class ComponentPresetChooserDialog extends JDialog {
 		scrollpane.setViewportView(componentSelectionTable);
 		panel.add(scrollpane, "grow, width 700lp, height 300lp, pushy, spanx, wrap rel");
 		
-		panel.add(new JLabel(Chars.UP_ARROW + " " + trans.get("lbl.favorites")), "spanx, gapleft 5px, wrap para");
+		panel.add(new StyledLabel(String.format("<html>%s %s</html>", Chars.UP_ARROW, trans.get("lbl.favorites")), -1), "spanx, gapleft 5px, wrap para");
 		
 		
 		// Close buttons