From 9e05a3d45c658ed77c65efa144c6003c6d76903e Mon Sep 17 00:00:00 2001
From: stoopipoopy <anotherguywithabeanie@gmail.com>
Date: Thu, 17 Oct 2024 00:03:16 -0700
Subject: [PATCH 1/2] [#2576] Fix Sorting Problem With Sides and Line Count on
 parachute

---
 .../gui/dialogs/preset/ComponentPresetTable.java   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java
index 6a6a639f1..de756704c 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java
@@ -6,11 +6,7 @@ import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 import javax.swing.ButtonGroup;
 import javax.swing.JCheckBoxMenuItem;
@@ -58,7 +54,6 @@ public class ComponentPresetTable extends JTable {
 		this.favorites = Application.getPreferences().getComponentFavorites(presetType);
 		this.columns = new ComponentPresetTableColumn[ComponentPreset.ORDERED_KEY_LIST.size() + 1];
 
-
 		this.tableModel = new AbstractTableModel() {
 			final ComponentPresetTableColumn[] myColumns = columns;
 
@@ -135,6 +130,13 @@ public class ComponentPresetTable extends JTable {
 						}
 
 					});
+				} else if (key.getType() == Integer.class){
+					sorter.setComparator(index, new Comparator<Integer>() {
+						@Override
+						public int compare(Integer o1, Integer o2) {
+							return Integer.compare(o1.intValue(), o2.intValue());
+						}
+					});
 				} else if (key.getType() == Boolean.class) {
 					sorter.setComparator(index, new Comparator<Boolean>() {
 

From 4b4f3bff825505813f7eb46727de6e187414c175 Mon Sep 17 00:00:00 2001
From: stoopipoopy <91173164+stoopipoopy@users.noreply.github.com>
Date: Thu, 17 Oct 2024 15:40:44 +0000
Subject: [PATCH 2/2] Fixed imports

---
 .../swing/gui/dialogs/preset/ComponentPresetTable.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java
index de756704c..e02f36eba 100644
--- a/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java
+++ b/swing/src/main/java/info/openrocket/swing/gui/dialogs/preset/ComponentPresetTable.java
@@ -6,7 +6,11 @@ import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
 
 import javax.swing.ButtonGroup;
 import javax.swing.JCheckBoxMenuItem;