Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temporarily Removed CAM_OPS from Contract Market Method ComboBox #5176

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion MekHQ/src/mekhq/gui/panes/CampaignOptionsPane.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@
import mekhq.campaign.market.enums.UnitMarketMethod;
import mekhq.campaign.mission.AtBContract;
import mekhq.campaign.mission.enums.AtBLanceRole;
import mekhq.campaign.parts.Part;
import mekhq.campaign.parts.enums.PartQuality;
import mekhq.campaign.personnel.PersonnelOptions;
import mekhq.campaign.personnel.SkillType;
Expand Down Expand Up @@ -99,6 +98,7 @@
import java.util.stream.IntStream;

import static megamek.client.ui.WrapLayout.wordWrap;
import static mekhq.campaign.market.enums.ContractMarketMethod.CAM_OPS;

/**
* @author Justin 'Windchild' Bowen
Expand Down Expand Up @@ -7998,6 +7998,7 @@ private JPanel createContractMarketPanel() {

comboContractMarketMethod = new MMComboBox<>("comboContractMarketMethod",
ContractMarketMethod.values());
comboContractMarketMethod.removeItem(CAM_OPS);
comboContractMarketMethod.setToolTipText(resources.getString("lblContractMarketMethod.toolTipText"));
comboContractMarketMethod.setRenderer(new DefaultListCellRenderer() {
@Override
Expand Down