Merge pull request MegaMek#5866 from IllianiCBT/disableCamOpsMarket

Temporarily Removed CamOps Contract Market
sixlettervariables · Jan 23, 2025 · 01d696a · 01d696a
2 parents 0381893 + 0378fd7
commit 01d696a
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/MekHQ/src/mekhq/gui/campaignOptions/contents/MarketsTab.java b/MekHQ/src/mekhq/gui/campaignOptions/contents/MarketsTab.java
@@ -454,8 +454,7 @@ public JPanel createUnitMarketTab() {
     private void initializeContractMarket() {
         pnlContractMarketGeneralOptions = new JPanel();
         lblContractMarketMethod = new JLabel();
-        comboContractMarketMethod = new MMComboBox<>("comboContractMarketMethod",
-            ContractMarketMethod.values());
+        comboContractMarketMethod = new MMComboBox<>("comboContractMarketMethod");
         lblContractSearchRadius = new JLabel();
         spnContractSearchRadius = new JSpinner();
         chkVariableContractLength = new JCheckBox();
@@ -530,8 +529,10 @@ public JPanel createContractMarketTab() {
     private JPanel createContractMarketGeneralOptionsPanel() {
         // Contents
         lblContractMarketMethod = new CampaignOptionsLabel("ContractMarketMethod");
-        comboContractMarketMethod = new MMComboBox<>("comboContractMarketMethod",
-            ContractMarketMethod.values());
+        comboContractMarketMethod = new MMComboBox<>("comboContractMarketMethod");
+        DefaultComboBoxModel<ContractMarketMethod> model = new DefaultComboBoxModel<>(ContractMarketMethod.values());
+        model.removeElement(ContractMarketMethod.CAM_OPS);
+        comboContractMarketMethod.setModel(model);
 
         lblContractSearchRadius = new CampaignOptionsLabel("ContractSearchRadius");
         spnContractSearchRadius = new CampaignOptionsSpinner("ContractSearchRadius",