hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add LOC/Precision to Manufacturer list so it will appear as LOC/Precison no matter what order the parts databases are loaded.

Browse Source 
Replace string equals with Manufacturer match method when searching for parts in the database
This commit is contained in:
JoePfeiffer 2024-05-09 07:02:19 -06:00
parent 434a612d77
commit 013579faa9
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/info/openrocket/core/database/ComponentPresetDatabase.java
View File

@ -107,7 +107,7 @@ public class ComponentPresetDatabase extends Database<ComponentPreset> implement
public List<ComponentPreset> find(String manufacturer, String partNo) { public List<ComponentPreset> find(String manufacturer, String partNo) {
List<ComponentPreset> presets = new ArrayList<ComponentPreset>(); List<ComponentPreset> presets = new ArrayList<ComponentPreset>();
for (ComponentPreset preset : list) { 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); presets.add(preset);
} }
} }

3
core/src/main/java/info/openrocket/core/motor/Manufacturer.java
View File

@ -90,6 +90,9 @@ public class Manufacturer implements Serializable {
manufacturers.add(new Manufacturer("Kosdon by AeroTech", "Kosdon by AeroTech", Motor.Type.RELOAD, manufacturers.add(new Manufacturer("Kosdon by AeroTech", "Kosdon by AeroTech", Motor.Type.RELOAD,
"K", "KBA", "K-AT", "KOS", "KOSDON", "KOSDON/AT", "KOSDON/AEROTECH")); "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, manufacturers.add(new Manufacturer("Loki Research", "Loki Research", Motor.Type.RELOAD,
"LOKI", "LR")); "LOKI", "LR"));