Skip to content

Refactored PrisonerStatus Enum and Reorganized Related Code#5963

Merged
HammerGS merged 4 commits intoMegaMek:masterfrom
IllianiBird:prisonerStatusEnum
Feb 6, 2025
Merged

Refactored PrisonerStatus Enum and Reorganized Related Code#5963
HammerGS merged 4 commits intoMegaMek:masterfrom
IllianiBird:prisonerStatusEnum

Conversation

@IllianiBird
Copy link
Collaborator

  • Moved PrisonerStatus enum to a new package for randomEvents as this is where the prisoner code will be living once the upcoming prisoner rework is merged.
  • Adjusted all references accordingly
  • Added new test cases and updating resource bundles.

- Moved `PrisonerStatus` enum to a new package for `randomEvents` as this is where the prisoner code will be living once the upcoming prisoner rework is merged.
- Adjusted all references accordingly
- Added new test cases and updating resource bundles.
Updated all relevant files to extend copyright years to 2025 for the MegaMek Team. This ensures compliance with the project's legal and licensing requirements.
@IllianiBird IllianiBird added Tests Issues or Pull Requests related to the project tests Refactoring labels Feb 3, 2025
@IllianiBird IllianiBird self-assigned this Feb 3, 2025
@codecov-commenter
Copy link

codecov-commenter commented Feb 3, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 10.29%. Comparing base (882c802) to head (bffc2b3).
Report is 11 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff            @@
##             master    #5963   +/-   ##
=========================================
  Coverage     10.29%   10.29%           
- Complexity     6106     6108    +2     
=========================================
  Files          1038     1038           
  Lines        139308   139302    -6     
  Branches      20665    20664    -1     
=========================================
  Hits          14337    14337           
+ Misses       123543   123533   -10     
- Partials       1428     1432    +4     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@HammerGS
Copy link
Member

HammerGS commented Feb 6, 2025

@IllianiCBT Conflicts

# Conflicts:
#	MekHQ/unittests/mekhq/campaign/personnel/death/AbstractDeathTest.java
# Conflicts:
#	MekHQ/src/mekhq/campaign/Campaign.java
@HammerGS HammerGS merged commit 24daef2 into MegaMek:master Feb 6, 2025
4 checks passed
@IllianiBird IllianiBird deleted the prisonerStatusEnum branch March 23, 2025 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Refactoring Tests Issues or Pull Requests related to the project tests

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants