Refactored Random Company Name Generator to Use CSV #4655
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Deleted the EndWordCorporate, EndWordMercenary, MiddleWordCorporate, and MiddleWordMercenary classes. These classes were redundant and no longer needed for the current functionality of the application.
Added new CSV files for the RandomCompanyNameGenerator, including endWordCorporate, preFab, and middleWordCorporate. These files will be used to generate random corporate and mercenary company names within the MekHQ universe.
Introduced RandomCompanyNameGenerator to generate random company names with configurable word segments. Integrated this generator within the data loading process and associated GUI components in MekHQ.
Added a try-catch block to handle potential NullPointerExceptions in the randomMercenaryCompanyNameGenerator method. Simplified the getCommanderName method by removing an unnecessary try-catch block.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| if (randomCompanyNameGenerator == null) { // First check | ||
| synchronized (RandomCompanyNameGenerator.class) { | ||
| if (randomCompanyNameGenerator == null) { // Double check | ||
| randomCompanyNameGenerator = new RandomCompanyNameGenerator(); |
Check warning
Code scanning / CodeQL
Race condition in double-checked locking object initialization Warning
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #4655 +/- ##
============================================
- Coverage 10.76% 9.86% -0.91%
+ Complexity 5668 5645 -23
============================================
Files 948 944 -4
Lines 132553 131356 -1197
Branches 19048 19055 +7
============================================
- Hits 14272 12956 -1316
- Misses 117041 117163 +122
+ Partials 1240 1237 -3 ☔ View full report in Codecov by Sentry. |
NickAragua
approved these changes
Aug 18, 2024
|
Flipped this to draft, so it can't be accidentally merged into 50.0 |
# Conflicts: # MekHQ/resources/mekhq/resources/RandomMercenaryCompanyNameGenerator.properties # MekHQ/src/mekhq/campaign/personnel/backgrounds/BackgroundsController.java # MekHQ/src/mekhq/campaign/personnel/backgrounds/enums/mercenaryCompanyNameGenerator/PreFabHumorous.java # MekHQ/src/mekhq/gui/dialog/GMToolsDialog.java
Reorganized and removed unused imports to improve code readability and maintainability. Static imports for methods were added for clarity.
|
Updated to account for the recent name change project |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR switches the random company name generator from using enum-based values to using a handful of csv files, similar to how we handle Bloodnames and Callsigns. This means users can edit and customize the available pool of name segments, with full support for the user folder.