From 50425bf68e5e6b42a6ef55c2ff35ced13e713a9c Mon Sep 17 00:00:00 2001 From: Michael Kamensky Date: Sun, 28 Feb 2021 07:40:21 +0300 Subject: [PATCH] - Rewrite Dev features to use getGui().many correctly. - Revert the ListChooser thing for now. --- .../src/main/java/forge/gui/ListChooser.java | 2 +- .../java/forge/player/PlayerControllerHuman.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java b/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java index 011f2ef2340..b7cf5954534 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java +++ b/forge-gui-desktop/src/main/java/forge/gui/ListChooser.java @@ -287,7 +287,7 @@ public class ListChooser { @Override public void valueChanged(final ListSelectionEvent e) { final int num = ListChooser.this.lstChoices.getSelectedIndices().length; - ListChooser.this.optionPane.setButtonEnabled(0, (num >= ListChooser.this.minChoices) && (num <= ListChooser.this.maxChoices || ListChooser.this.maxChoices == -1)); + ListChooser.this.optionPane.setButtonEnabled(0, (num >= ListChooser.this.minChoices) && (num <= ListChooser.this.maxChoices)); } } diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 38c3dcc87b6..af5eb165785 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -2627,9 +2627,10 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont } Player p = gameCachePlayer.get(pv); - GameEntityViewMap gameCacheExile = GameEntityView.getMap(p.getCardsIn(ZoneType.Hand)); + CardCollectionView inHand = p.getCardsIn(ZoneType.Hand); + GameEntityViewMap gameCacheExile = GameEntityView.getMap(inHand); - List views = getGui().many(localizer.getMessage("lblChooseCardsExile"), localizer.getMessage("lblDiscarded"), 0, -1, + List views = getGui().many(localizer.getMessage("lblChooseCardsExile"), localizer.getMessage("lblDiscarded"), 0, inHand.size(), gameCacheExile.getTrackableKeys(), null); final CardCollection selection = new CardCollection(); @@ -2665,9 +2666,10 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont } Player p = gameCachePlayer.get(pv); - GameEntityViewMap gameCacheExile = GameEntityView.getMap(p.getCardsIn(ZoneType.Battlefield)); + CardCollectionView otb = p.getCardsIn(ZoneType.Battlefield); + GameEntityViewMap gameCacheExile = GameEntityView.getMap(otb); - List views = getGui().many(localizer.getMessage("lblChooseCardsExile"), localizer.getMessage("lblDiscarded"), 0, -1, + List views = getGui().many(localizer.getMessage("lblChooseCardsExile"), localizer.getMessage("lblDiscarded"), 0, otb.size(), gameCacheExile.getTrackableKeys(), null); final CardCollection selection = new CardCollection(); @@ -2708,7 +2710,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont CardCollectionView cards = p.getCardsIn(ZoneType.smartValueOf(zone)); GameEntityViewMap gameCacheExile = GameEntityView.getMap(cards); - List views = getGui().many(localizer.getMessage("lblChooseCardsRemoveFromGame"), localizer.getMessage("lblRemoved"), 0, -1, + List views = getGui().many(localizer.getMessage("lblChooseCardsRemoveFromGame"), localizer.getMessage("lblRemoved"), 0, cards.size(), gameCacheExile.getTrackableKeys(), null); final CardCollection selection = new CardCollection();