From 7a453829ac63778e366be6ff55c7d4d3a4702136 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Tue, 13 Aug 2024 22:20:09 +0200 Subject: [PATCH] Remove FlightDataComboBox --- .../gui/simulation/FlightDataComboBox.java | 18 ------------------ .../gui/simulation/SimulationPlotPanel.java | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 swing/src/main/java/info/openrocket/swing/gui/simulation/FlightDataComboBox.java diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/FlightDataComboBox.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/FlightDataComboBox.java deleted file mode 100644 index b1e0932e9..000000000 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/FlightDataComboBox.java +++ /dev/null @@ -1,18 +0,0 @@ -package info.openrocket.swing.gui.simulation; - -import info.openrocket.swing.gui.widgets.GroupableAndSearchableComboBox; -import info.openrocket.core.l10n.Translator; -import info.openrocket.core.simulation.FlightDataType; -import info.openrocket.core.simulation.FlightDataTypeGroup; -import info.openrocket.core.startup.Application; - -import javax.swing.JComboBox; -import java.util.List; - -public class FlightDataComboBox extends JComboBox { - private static final Translator trans = Application.getTranslator(); - - public static GroupableAndSearchableComboBox createComboBox(List types) { - return new GroupableAndSearchableComboBox<>(types, trans.get("FlightDataComboBox.placeholder")); - } -} diff --git a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java index b30e28996..8c58b130f 100644 --- a/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java +++ b/swing/src/main/java/info/openrocket/swing/gui/simulation/SimulationPlotPanel.java @@ -173,7 +173,7 @@ public class SimulationPlotPanel extends JPanel { //// X axis type: this.add(new JLabel(trans.get("simplotpanel.lbl.Xaxistype")), "spanx, split"); - domainTypeSelector = FlightDataComboBox.createComboBox(Arrays.asList(types)); + domainTypeSelector = new GroupableAndSearchableComboBox<>(Arrays.asList(types), trans.get("FlightDataComboBox.placeholder")); domainTypeSelector.setSelectedItem(configuration.getDomainAxisType()); domainTypeSelector.addItemListener(new ItemListener() { @Override