From 4caba0fcb54e8c2ebd05f35b2bc778cebd0015e9 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Sun, 1 May 2022 23:34:03 +0200 Subject: [PATCH] Remove CUSTOM material from preference's add new material There is just no logic in adding the 'CUSTOM' option from the dropdown, because it is not even a type of density material --- .../openrocket/gui/dialogs/CustomMaterialDialog.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/swing/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java b/swing/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java index 0b9a9e629..83fbe749f 100644 --- a/swing/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java +++ b/swing/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java @@ -4,6 +4,10 @@ import java.awt.Dialog; import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedList; +import java.util.List; import javax.swing.JButton; import javax.swing.JCheckBox; @@ -78,7 +82,13 @@ public class CustomMaterialDialog extends JDialog { // Material type (if not known) panel.add(new JLabel(trans.get("custmatdlg.lbl.Materialtype"))); if (material == null) { - typeBox = new JComboBox(Material.Type.values()); + // Remove the CUSTOM material option from the dropdown box + Material.Type[] values = Material.Type.values(); + List values_list = new LinkedList<>(Arrays.asList(values)); + values_list.remove(Material.Type.CUSTOM); + values = values_list.toArray(new Material.Type[0]); + + typeBox = new JComboBox<>(values); typeBox.setSelectedItem(Material.Type.BULK); typeBox.setEditable(false); typeBox.addActionListener(new ActionListener() {