8000 Fix: Minor Fix to Profession Categorization by IllianiBird · Pull Request #6925 · MegaMek/mekhq · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix: Minor Fix to Profession Categorization #6925

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
May 9, 2025
Merged

Fix: Minor Fix to Profession Categorization #6925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28f85e7
Fix: Minor Fix to Profession Categorization
IllianiBird May 8, 2025
b83b56d
Updated to include use of utility methods
IllianiBird May 8, 2025
b5fe746
Added alphabetical sorting to professions
IllianiBird May 9, 2025
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
18 changes: 18 additions & 0 deletions MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@

import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down Expand Up @@ -810,4 +812,20 @@ public static PersonnelRole fromString(String text) {
public String toString() {
return getLabel(false);
}

/**
* Returns an array of all {@link PersonnelRole} values sorted alphabetically by their enum name.
*
* <p>This is useful for displaying or processing personnel roles in a consistent, user-friendly order.</p>
*
* @return a {@code PersonnelRole[]} containing all enum values sorted by name in ascending order
*
* @author Illiani
* @since 0.50.06
*/
public static PersonnelRole[] getValuesSortedAlphabetically() {
return Arrays.stream(PersonnelRole.values())
.sorted(Comparator.comparing(Enum::name))
.toArray(PersonnelRole[]::new);
}
}
4 changes: 3 additions & 1 deletion MekHQ/src/mekhq/gui/CampaignGUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,9 @@ private void initMenu() {

JMenu menuHire = new JMenu(resourceMap.getString("menuHire.text"));
menuHire.setMnemonic(KeyEvent.VK_H);
for (PersonnelRole role : PersonnelRole.getPrimaryRoles()) {

PersonnelRole[] roles = PersonnelRole.getValuesSortedAlphabetically();
for (PersonnelRole role : roles) {
JMenuItem miHire = new JMenuItem(role.getLabel(getCampaign().getFaction().isClan()));
if (role.getMnemonic() != KeyEvent.VK_UNDEFINED) {
miHire.setMnemonic(role.getMnemonic());
Expand Down
30 changes: 18 additions & 12 deletions MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,15 @@
import mekhq.campaign.personnel.education.Academy;
import mekhq.campaign.personnel.education.AcademyFactory;
import mekhq.campaign.personnel.education.EducationController;
import mekhq.campaign.personnel.enums.*;
import mekhq.campaign.personnel.enums.FamilialRelationshipType;
import mekhq.campaign.personnel.enums.ManeiDominiClass;
import mekhq.campaign.personnel.enums.ManeiDominiRank;
import mekhq.campaign.personnel.enums.MergingSurnameStyle;
import mekhq.campaign.personnel.enums.PersonnelRole;
import mekhq.campaign.personnel.enums.PersonnelStatus;
import mekhq.campaign.personnel.enums.Profession;
import mekhq.campaign.personnel.enums.ROMDesignation;
import mekhq.campaign.personnel.enums.SplittingSurnameStyle;
import mekhq.campaign.personnel.enums.education.EducationLevel;
import mekhq.campaign.personnel.enums.education.EducationStage;
import mekhq.campaign.personnel.familyTree.Genealogy;
Expand Down Expand Up @@ -2051,9 +2059,9 @@ protected Optional<JPopupMenu> createPopupMenu() {
cbMenuItem.setSelected(true);
}

if (role.isSubType(PersonnelRoleSubType.COMBAT)) {
if (role.isCombat()) {
menuCombatPrimary.add(cbMenuItem);
} else if (role.isSubType(PersonnelRoleSubType.SUPPORT)) {
} else if (role.isSupport(true)) {
menuSupportPrimary.add(cbMenuItem);
} else {
menuCivilianPrimary.add(cbMenuItem);
Expand All @@ -2073,7 +2081,6 @@ protected Optional<JPopupMenu> createPopupMenu() {
JMenuHelpers.addMenuIfNonEmpty(popup, menu);

menu = new JMenu(resources.getString("changeSecondaryRole.text"));

JMenu menuCombatSecondary = new JMenu(resources.getString("changeRole.combat"));
JMenu menuSupportSecondary = new JMenu(resources.getString("changeRole.support"));
JMenu menuCivilianSecondary = new JMenu(resources.getString("changeRole.civilian"));
Expand All @@ -2094,15 +2101,14 @@ protected Optional<JPopupMenu> createPopupMenu() {
if (oneSelected && role == person.getSecondaryRole()) {
cbMenuItem.setSelected(true);
}
menu.add(cbMenuItem);
}

if (role.isSubType(PersonnelRoleSubType.COMBAT)) {
menuCombatSecondary.add(cbMenuItem);
} else if (role.isSubType(PersonnelRoleSubType.SUPPORT)) {
menuSupportSecondary.add(cbMenuItem);
} else {
menuCivilianSecondary.add(cbMenuItem);
if (role.isCombat()) {
menuCombatSecondary.add(cbMenuItem);
} else if (role.isSupport(true)) {
menuSupportSecondary.add(cbMenuItem);
} else {
menuCivilianSecondary.add(cbMenuItem);
}
}
}

Expand Down
Loading
0