Sort battles cleanup #12814
Merged
Sort battles cleanup #12814
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
TripleAFrame.java - rename variable territoryDetails to territoryDetailsPanel - rename variable actionButtons to actionButtonsPanel - rename variable datacopy to gameDataCopy - fix typos e.g. savegame or gamedata Rename class ActionButtons to ActionButtonsPanel: - ForumPosterComponent.java - ActionPanel.java BattleCalculatorDialog.java - renamed Getter TripleAFrame.java.TerritoryPanel TripleAPlayer.java - fix typos savegame and gamedata - rename variable battlesite to battleTerritory Replace typos 'savegame' with 'save game' - ActionButtonsPanel.java - GameSequence.java - HeadlessGameServer.java - IEmailSender.java - NodeBbForumPoster.java - ServerLauncher.java - TripleAFrame.java - TripleAPlayer.java - UpdateChecks.java
BattleTracker.java - rename variables (e.g. territory collections) with same name as member attribute - replace Map loop over keys with over entrySet - rework methods getPendingBattles to consistently use CollectionUtils.getMatches instead of stream() - rework methods getPendingBattle to consistently use stream() instead of loops - make method getPendingBattleSites(bombing) private and usages more clear with new methods getPendingBattleSitesWithBombing() and getPendingBattleSitesWithoutBombing() - replace lambdas with method - typo 's instead of s replace with new method BattleTracker.getPendingBattleSitesWithoutBombing() - BattleDelegate.java - MoveDelegateTest.java - MustFightBattleTest.java - RevisedTest.java - WW2V3Year41Test.java - WW2V3Year42Test.java
Keep BattleListing for passing to other methods and let method/variable names indicate BattleListing ActionButtonsPanel.java - let method changeToBattle use BattleListing instead of battles map BattleTracker.java - rename method getPendingBattleSites to getBattleListingFromPendingBattles BattlePanel.java - rename attribute battles to battleListing - remove isBomb variable in method addBattleActions and subsequent methods as value can be determined by other parameter (BattleType) IBattleDelegate.java - rename method getBattles to getBattleListing TripleAFrame.java - let method getBattle use BattleListing instead of battles map Affected by renaming method (getBattles to getBattleListing; getPendingBattleSites to getBattleListingFromPendingBattles) - AbstractAi.java - AirThatCantLandUtilTest.java - BattleDelegate.java - ProSimulateTurnUtils.java - TripleAPlayer.java - WW2V3Year41Test.java
Move BattleListing map building from BattleTracker into BattleListing BattleTracker - move logic of method getBattleListingFromPendingBattles() to constructor of BattleListing BattleListing.java - rename attribute battles to battlesMap - change constructor to include logic of method BattleTracker.getBattleListingFromPendingBattles() - extract new method getBattlesWith(predicate) Subsequent changes for Getter on BattleListing.battlesMap - AbstractAi.java - AirThatCantLandUtilTest.java - ProSimulateTurnUtils.java - WW2V3Year41Test.java
fix RemoteActionCodeTest due to renaming IBattleDelegate.getBattles to getBattleListing - required-op-codes.csv
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.
Panel "Actions" has no sorting order for battles. @DanVanAtta mentioned also that the order might change after saving and reloading a game.
This PR is cleaning up the files in order to allow a sorting. The strategy is that
BattleListingis used and passed around instead of the contained map.Also the map is now an
EnumMapbuild inBattleListing.