From 013579faa927a1c163d435d73b1d976b61a278ea Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Thu, 9 May 2024 07:02:19 -0600 Subject: [PATCH] Add LOC/Precision to Manufacturer list so it will appear as LOC/Precison no matter what order the parts databases are loaded. Replace string equals with Manufacturer match method when searching for parts in the database --- .../info/openrocket/core/database/ComponentPresetDatabase.java | 2 +- .../src/main/java/info/openrocket/core/motor/Manufacturer.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java b/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java index c1f07b623..ed52ecb67 100644 --- a/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java +++ b/core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java @@ -107,7 +107,7 @@ public class ComponentPresetDatabase extends Database implement public List find(String manufacturer, String partNo) { List presets = new ArrayList(); for (ComponentPreset preset : list) { - if (preset.getManufacturer().getSimpleName().equals(manufacturer) && preset.getPartNo().equals(partNo)) { + if (preset.getManufacturer().matches(manufacturer) && preset.getPartNo().equals(partNo)) { presets.add(preset); } } diff --git a/core/src/main/java/info/openrocket/core/motor/Manufacturer.java b/core/src/main/java/info/openrocket/core/motor/Manufacturer.java index bc1c4903b..4a2856f09 100644 --- a/core/src/main/java/info/openrocket/core/motor/Manufacturer.java +++ b/core/src/main/java/info/openrocket/core/motor/Manufacturer.java @@ -90,6 +90,9 @@ public class Manufacturer implements Serializable { manufacturers.add(new Manufacturer("Kosdon by AeroTech", "Kosdon by AeroTech", Motor.Type.RELOAD, "K", "KBA", "K-AT", "KOS", "KOSDON", "KOSDON/AT", "KOSDON/AEROTECH")); + manufacturers.add(new Manufacturer("LOC/Precision", "LOC/Precision", Motor.Type.UNKNOWN, + "LOC")); + manufacturers.add(new Manufacturer("Loki Research", "Loki Research", Motor.Type.RELOAD, "LOKI", "LR"));