Skip to content

Commit

Permalink
Reapply "Issues 12447 (Standardized Sorting of UnitCategory) (triplea…
Browse files Browse the repository at this point in the history 
…-game#12722)" (triplea-game#12762)

This reverts commit e73fdec.
  • Loading branch information
@frigoref
frigoref committed Jul 26, 2024
1 parent f58baae commit 823bceb
Show file tree
Hide file tree
Showing 12 changed files with 257 additions and 144 deletions.
38 changes: 23 additions & 15 deletions ...game-core/src/main/java/games/strategy/triplea/odds/calculator/BattleCalculatorPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,12 +417,17 @@ class BattleCalculatorPanel extends JPanel {
Matches.unitIsOwnedBy(getDefender())
.and(
Matches.unitCanBeInBattle(
true, isLand(), 1, hasMaxRounds(isLand(), data), true, List.of())));
true,
isLandBattle(),
1,
hasMaxRounds(isLandBattle(), data),
true,
List.of())));
final GamePlayer newDefender = getAttacker();
final List<Unit> newDefenders =
CollectionUtils.getMatches(
attackingUnitsPanel.getUnits(),
Matches.unitCanBeInBattle(true, isLand(), 1, true));
Matches.unitCanBeInBattle(true, isLandBattle(), 1, true));
setAttacker(newAttacker);
setDefender(newDefender);
setAttackingUnits(newAttackers);
Expand All @@ -435,8 +440,8 @@ class BattleCalculatorPanel extends JPanel {
new OrderOfLossesInputPanel(
attackerOrderOfLosses,
defenderOrderOfLosses,
attackingUnitsPanel.getCategories(),
defendingUnitsPanel.getCategories(),
attackingUnitsPanel.getUnitCategories(),
defendingUnitsPanel.getUnitCategories(),
landBattleCheckBox.isSelected(),
uiContext,
data);
Expand Down Expand Up @@ -559,12 +564,12 @@ private void updateStats() {
try {
final Territory location = findPotentialBattleSite();
if (location == null) {
throw new IllegalStateException("No territory found that is land:" + isLand());
throw new IllegalStateException("No territory found that is land:" + isLandBattle());
}
final List<Unit> defending = defendingUnitsPanel.getUnits();
final List<Unit> attacking = attackingUnitsPanel.getUnits();
List<Unit> bombarding = new ArrayList<>();
if (isLand()) {
if (isLandBattle()) {
bombarding =
CollectionUtils.getMatches(attacking, Matches.unitCanBombard(getAttacker()));
attacking.removeAll(bombarding);
Expand Down Expand Up @@ -622,7 +627,7 @@ private void updateStats() {
attackerWin.setText(formatPercentage(results.getAttackerWinPercent()));
defenderWin.setText(formatPercentage(results.getDefenderWinPercent()));
draw.setText(formatPercentage(results.getDrawPercent()));
final boolean isLand = isLand();
final boolean isLand = isLandBattle();
final List<Unit> mainCombatAttackers =
CollectionUtils.getMatches(
attackers.get(), Matches.unitCanBeInBattle(true, isLand, 1, true));
Expand Down Expand Up @@ -658,9 +663,9 @@ private void updateStats() {

private Territory findPotentialBattleSite() {
Territory location = null;
if (this.location == null || this.location.isWater() == isLand()) {
if (this.location == null || this.location.isWater() == isLandBattle()) {
for (final Territory t : data.getMap()) {
if (t.isWater() == !isLand()) {
if (t.isWater() == !isLandBattle()) {
location = t;
break;
}
Expand Down Expand Up @@ -693,8 +698,9 @@ private void setAttackingUnits(final List<Unit> initialUnits) {
CollectionUtils.getMatches(
units,
Matches.unitCanBeInBattle(
true, isLand(), 1, hasMaxRounds(isLand(), data), false, List.of())),
isLand());
true, isLandBattle(), 1, hasMaxRounds(isLandBattle(), data), false, List.of())),
isLandBattle(),
location);
}

void addDefendingUnits(final List<Unit> unitsToAdd) {
Expand All @@ -708,8 +714,10 @@ private void setDefendingUnits(final List<Unit> initialUnits) {
final List<Unit> units = Optional.ofNullable(initialUnits).orElseGet(List::of);
defendingUnitsPanel.init(
getDefender(),
CollectionUtils.getMatches(units, Matches.unitCanBeInBattle(false, isLand(), 1, false)),
isLand());
CollectionUtils.getMatches(
units, Matches.unitCanBeInBattle(false, isLandBattle(), 1, false)),
isLandBattle(),
location);
}

public boolean hasAttackingUnitsAdded() {
Expand All @@ -720,7 +728,7 @@ public boolean hasDefendingUnitsAdded() {
return !defendingUnitsPanel.isEmpty();
}

private boolean isLand() {
private boolean isLandBattle() {
return landBattleCheckBox.isSelected();
}

Expand All @@ -742,7 +750,7 @@ private void setResultsToBlank() {
private void setWidgetActivation() {
keepOneAttackingLandUnitCheckBox.setEnabled(landBattleCheckBox.isSelected());
amphibiousCheckBox.setEnabled(landBattleCheckBox.isSelected());
final boolean isLand = isLand();
final boolean isLand = isLandBattle();
try (GameData.Unlocker ignored = data.acquireReadLock()) {
final List<Unit> attackers =
CollectionUtils.getMatches(
Expand Down
8 changes: 5 additions & 3 deletions ...me-core/src/main/java/games/strategy/triplea/odds/calculator/OrderOfLossesInputPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import games.strategy.triplea.image.UnitImageFactory.ImageKey;
import games.strategy.triplea.ui.UiContext;
import games.strategy.triplea.util.UnitCategory;
import games.strategy.triplea.util.UnitSeparator;
import java.awt.Color;
import java.awt.Component;
import java.util.ArrayList;
Expand Down Expand Up @@ -252,12 +253,13 @@ private void layoutComponents() {
}

private JPanel getUnitButtonPanel(
final List<UnitCategory> categories, final JTextField textField) {
final List<UnitCategory> unitCategories, final JTextField textField) {
final JPanel panel = new JPanel();
panel.setLayout(new BoxLayout(panel, BoxLayout.X_AXIS));
if (categories != null) {
if (unitCategories != null) {
UnitSeparator.sortUnitCategories(unitCategories, data);
final Set<UnitType> typesUsed = new HashSet<>();
for (final UnitCategory category : categories) {
for (final UnitCategory category : unitCategories) {
// no duplicates or infrastructure allowed. no sea if land, no land if sea.
if (typesUsed.contains(category.getType())
|| Matches.unitTypeIsInfrastructure().test(category.getType())
Expand Down
89 changes: 28 additions & 61 deletions ...-app/game-core/src/main/java/games/strategy/triplea/odds/calculator/PlayerUnitsPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import games.strategy.engine.data.Territory;
import games.strategy.engine.data.Unit;
import games.strategy.engine.data.UnitType;
import games.strategy.triplea.attachments.UnitAttachment;
import games.strategy.triplea.delegate.Matches;
import games.strategy.triplea.ui.UiContext;
import games.strategy.triplea.util.TuvCostsCalculator;
Expand All @@ -34,8 +33,8 @@ public class PlayerUnitsPanel extends JPanel {
private final GameData data;
private final UiContext uiContext;
private final boolean defender;
private boolean isLand = true;
@Getter private List<UnitCategory> categories = null;
private boolean isLandBattle = true;
@Getter private List<UnitCategory> unitCategories = null;
private final List<Runnable> listeners = new ArrayList<>();
private final List<UnitPanel> unitPanels = new ArrayList<>();

Expand All @@ -59,54 +58,17 @@ public List<Unit> getUnits() {
}

/** Sets up components to an initial state. */
public void init(final GamePlayer gamePlayer, final List<Unit> units, final boolean land) {
isLand = land;
public void init(
final GamePlayer gamePlayer,
final List<Unit> units,
final boolean isLandBattle,
final Territory territory) {
this.isLandBattle = isLandBattle;
unitPanels.clear();
categories = new ArrayList<>(categorize(gamePlayer, units));

categories.sort(
(c1, c2) -> {
if (!c1.isOwnedBy(c2.getOwner())) {
if (c1.isOwnedBy(gamePlayer)) {
return -1;
} else if (c2.isOwnedBy(gamePlayer)) {
return 1;
} else {
return c1.getOwner().getName().compareTo(c2.getOwner().getName());
}
}
final UnitType ut1 = c1.getType();
final UnitType ut2 = c2.getType();
final UnitAttachment u1 = ut1.getUnitAttachment();
final UnitAttachment u2 = ut2.getUnitAttachment();
// For land battles, sort by land, air, can't combat move (AA), bombarding
if (land) {
if (u1.getIsSea() != u2.getIsSea()) {
return u1.getIsSea() ? 1 : -1;
}
final boolean u1CanNotCombatMove =
Matches.unitTypeCanNotMoveDuringCombatMove().test(ut1)
|| !Matches.unitTypeCanMove(gamePlayer).test(ut1);
final boolean u2CanNotCombatMove =
Matches.unitTypeCanNotMoveDuringCombatMove().test(ut2)
|| !Matches.unitTypeCanMove(gamePlayer).test(ut2);
if (u1CanNotCombatMove != u2CanNotCombatMove) {
return u1CanNotCombatMove ? 1 : -1;
}
if (u1.getIsAir() != u2.getIsAir()) {
return u1.getIsAir() ? 1 : -1;
}
} else {
if (u1.getIsSea() != u2.getIsSea()) {
return u1.getIsSea() ? -1 : 1;
}
}
return u1.getName().compareTo(u2.getName());
});

removeAll();
final Predicate<UnitType> predicate;
if (land) {
if (isLandBattle) {
if (defender) {
predicate = Matches.unitTypeIsNotSea();
} else {
Expand All @@ -120,9 +82,11 @@ public void init(final GamePlayer gamePlayer, final List<Unit> units, final bool
costs = new TuvCostsCalculator().getCostsForTuv(gamePlayer);
}

unitCategories = getAllUnitCategories(gamePlayer, units);
UnitSeparator.sortUnitCategories(unitCategories, territory, gamePlayer);
GamePlayer previousPlayer = null;
JPanel panel = null;
for (final UnitCategory category : categories) {
for (final UnitCategory category : unitCategories) {
if (predicate.test(category.getType())) {
if (!category.isOwnedBy(previousPlayer)) {
panel = new JPanel();
Expand All @@ -131,10 +95,12 @@ public void init(final GamePlayer gamePlayer, final List<Unit> units, final bool
add(panel);
previousPlayer = category.getOwner();
}
final var unitPanel = new UnitPanel(uiContext, category, costs);
unitPanel.addChangeListener(this::notifyListeners);
panel.add(unitPanel);
unitPanels.add(unitPanel);
if (panel != null) {
final var unitPanel = new UnitPanel(uiContext, category, costs);
unitPanel.addChangeListener(this::notifyListeners);
panel.add(unitPanel);
unitPanels.add(unitPanel);
}
}
}

Expand All @@ -150,10 +116,11 @@ public void init(final GamePlayer gamePlayer, final List<Unit> units, final bool
* production frontier and then any unit types the player owns on the map. Then populate the list
* of units into the categories.
*/
private Set<UnitCategory> categorize(final GamePlayer gamePlayer, final List<Unit> units) {
private List<UnitCategory> getAllUnitCategories(
final GamePlayer gamePlayer, final List<Unit> units) {

// Get player unit types from production frontier and unit types on the map
final Set<UnitCategory> categories = new LinkedHashSet<>();
final List<UnitCategory> categories = new ArrayList<>();
for (final UnitType t : getUnitTypes(gamePlayer)) {
final UnitCategory category = new UnitCategory(t, gamePlayer);
categories.add(category);
Expand All @@ -172,15 +139,15 @@ private Set<UnitCategory> categorize(final GamePlayer gamePlayer, final List<Uni
}

// Populate units into each category then add any remaining categories (damaged units, etc)
final Set<UnitCategory> unitCategories = UnitSeparator.categorize(units);
final Set<UnitCategory> unitCategoriesWithUnits = UnitSeparator.categorize(units);
for (final UnitCategory category : categories) {
for (final UnitCategory unitCategory : unitCategories) {
if (category.equals(unitCategory)) {
category.getUnits().addAll(unitCategory.getUnits());
for (final UnitCategory unitCategoryWithUnits : unitCategoriesWithUnits) {
if (category.equals(unitCategoryWithUnits)) {
category.getUnits().addAll(unitCategoryWithUnits.getUnits());
}
}
}
categories.addAll(unitCategories);
categories.addAll(unitCategoriesWithUnits);

return categories;
}
Expand Down Expand Up @@ -216,10 +183,10 @@ private Collection<UnitType> getUnitTypes(final GamePlayer player) {
unitTypes,
Matches.unitTypeCanBeInBattle(
!defender,
isLand,
isLandBattle,
player,
1,
BattleCalculatorPanel.hasMaxRounds(isLand, data),
BattleCalculatorPanel.hasMaxRounds(isLandBattle, data),
false,
List.of()));

Expand Down
19 changes: 14 additions & 5 deletions game-app/game-core/src/main/java/games/strategy/triplea/ui/BattleDisplay.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import javax.annotation.Nullable;
import javax.swing.AbstractAction;
import javax.swing.Action;
Expand Down Expand Up @@ -230,10 +232,10 @@ private Collection<Unit> updateKilledUnits(
for (final Collection<Unit> dependentCollection : dependentsMap.values()) {
dependentUnitsReturned.addAll(dependentCollection);
}
for (final UnitCategory category :
UnitSeparator.categorize(
killedUnits,
UnitSeparator.SeparatorCategories.builder().dependents(dependentsMap).build())) {

List<UnitCategory> unitCategories =
UnitSeparator.getSortedUnitCategories(killedUnits, gameData, uiContext.getMapData());
for (final UnitCategory category : unitCategories) {
final JPanel panel = new JPanel();
JLabel unit = uiContext.newUnitImageLabel(category.getType(), category.getOwner());
panel.add(unit);
Expand Down Expand Up @@ -775,7 +777,14 @@ void setNotificationShort(

private void categorizeUnits(
final Iterable<UnitCategory> categoryIter, final boolean damaged, final boolean disabled) {
for (final UnitCategory category : categoryIter) {
final List<UnitCategory> unitCategories =
StreamSupport.stream(categoryIter.spliterator(), false).collect(Collectors.toList());
if (unitCategories.isEmpty()) {
return;
}
final GameData gameData = unitCategories.get(0).getUnitAttachment().getData();
UnitSeparator.sortUnitCategories(unitCategories, gameData);
for (final UnitCategory category : unitCategories) {
final JPanel panel = new JPanel();
final ImageIcon unitImage =
uiContext
Expand Down
3 changes: 2 additions & 1 deletion game-app/game-core/src/main/java/games/strategy/triplea/ui/BattleModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ void refresh() {
}
unitPowerAndRollsMap = PowerStrengthAndRolls.build(units, combatValue);
}
final Collection<UnitCategory> unitCategories = UnitSeparator.categorize(units);
final List<UnitCategory> unitCategories =
UnitSeparator.getSortedUnitCategories(units, gameData, uiContext.getMapData());
for (final UnitCategory category : unitCategories) {
final int[] shift = new int[gameData.getDiceSides() + 1];
for (final Unit current : category.getUnits()) {
Expand Down
12 changes: 11 additions & 1 deletion game-app/game-core/src/main/java/games/strategy/triplea/ui/SimpleUnitPanel.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package games.strategy.triplea.ui;

import com.google.common.collect.Lists;
import games.strategy.engine.data.GameData;
import games.strategy.engine.data.GamePlayer;
import games.strategy.engine.data.GameState;
import games.strategy.engine.data.NamedAttachable;
Expand All @@ -13,7 +15,9 @@
import games.strategy.triplea.delegate.Matches;
import games.strategy.triplea.image.UnitImageFactory;
import games.strategy.triplea.util.UnitCategory;
import games.strategy.triplea.util.UnitSeparator;
import java.awt.Image;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Map;
import java.util.Set;
Expand Down Expand Up @@ -120,7 +124,13 @@ public void setUnitsFromRepairRuleMap(
*/
public void setUnitsFromCategories(final Collection<UnitCategory> categories) {
removeAll();
for (final UnitCategory category : categories) {
if (categories.isEmpty()) {
return;
}
final GameData gameData = categories.iterator().next().getUnitAttachment().getData();
final ArrayList<UnitCategory> unitCategories = Lists.newArrayList(categories);
UnitSeparator.sortUnitCategories(unitCategories, gameData);
for (final UnitCategory category : unitCategories) {
addUnits(
category.getOwner(),
category.getUnits().size(),
Expand Down
Loading

0 comments on commit 823bceb

Please sign in to comment.