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

Remove CUSTOM material from preference's add new material

Browse Source 
There is just no logic in adding the 'CUSTOM' option from the dropdown, because it is not even a type of density material
This commit is contained in:
SiboVG 2022-05-01 23:34:03 +02:00
parent d481ee8f65
commit 4caba0fcb5
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
swing/src/net/sf/openrocket/gui/dialogs/CustomMaterialDialog.java
View File

@ -4,6 +4,10 @@ import java.awt.Dialog;
import java.awt.Window; import java.awt.Window;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; 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.JButton;
import javax.swing.JCheckBox; import javax.swing.JCheckBox;
@ -78,7 +82,13 @@ public class CustomMaterialDialog extends JDialog {
// Material type (if not known) // Material type (if not known)
panel.add(new JLabel(trans.get("custmatdlg.lbl.Materialtype"))); panel.add(new JLabel(trans.get("custmatdlg.lbl.Materialtype")));
if (material == null) { if (material == null) {
typeBox = new JComboBox<Material.Type>(Material.Type.values()); // Remove the CUSTOM material option from the dropdown box
Material.Type[] values = Material.Type.values();
List<Material.Type> 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.setSelectedItem(Material.Type.BULK);
typeBox.setEditable(false); typeBox.setEditable(false);
typeBox.addActionListener(new ActionListener() { typeBox.addActionListener(new ActionListener() {