external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- A little cleanup in ACEditorBase, made the code a little bit more readable and added some additional crash protection.

Browse Source
This commit is contained in:
Agetian
2017-01-11 18:38:41 +00:00
parent a4b508e1cd
commit 01e402f292
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/ACEditorBase.java
View File

@@ -196,10 +196,23 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
* @return pool of additions allowed to deck * @return pool of additions allowed to deck
*/ */
protected ItemPool<TItem> getAllowedAdditions(final Iterable<Entry<TItem, Integer>> itemsToAdd) { protected ItemPool<TItem> getAllowedAdditions(final Iterable<Entry<TItem, Integer>> itemsToAdd) {
final ItemPool<TItem> additions = new ItemPool<TItem>(getCatalogManager().getGenericType()); final ItemPool<TItem> additions = new ItemPool<>(getCatalogManager().getGenericType());
final CardLimit limit = getCardLimit(); final CardLimit limit = getCardLimit();
final DeckController<TModel> controller = getDeckController(); final DeckController<TModel> controller = getDeckController();
final Deck deck = controller != null && controller.getModel() instanceof Deck ? (Deck)controller.getModel() : controller.getModel() instanceof DeckGroup ? ((DeckGroup)controller.getModel()).getHumanDeck() : null;
Deck deck = null;
if (controller != null) {
if (controller.getModel() instanceof Deck) {
deck = (Deck)controller.getModel(); // constructed deck
} else if (controller.getModel() instanceof DeckGroup) {
deck = ((DeckGroup)controller.getModel()).getHumanDeck(); // limited deck
}
}
if (deck == null) {
System.err.println("Warning: ACEditorBase#getAllowedAdditions could not properly process the deck in controller.getModel(), returning empty item pool.");
return additions; // returning empty additions
}
final CardPool allCards = deck.getAllCardsInASinglePool(deck.has(DeckSection.Commander)); final CardPool allCards = deck.getAllCardsInASinglePool(deck.has(DeckSection.Commander));
Iterable<Entry<String,Integer>> cardsByName = Aggregates.groupSumBy(allCards, PaperCard.FN_GET_NAME); Iterable<Entry<String,Integer>> cardsByName = Aggregates.groupSumBy(allCards, PaperCard.FN_GET_NAME);
@@ -211,7 +224,7 @@ public abstract class ACEditorBase<TItem extends InventoryItem, TModel extends D
int qty = itemEntry.getValue(); int qty = itemEntry.getValue();
int max; int max;
if (deck == null || card == null || card.getRules().getType().isBasic() || if (card == null || card.getRules().getType().isBasic() ||
limit == CardLimit.None || limitExceptions.contains(card.getName())) { limit == CardLimit.None || limitExceptions.contains(card.getName())) {
max = Integer.MAX_VALUE; max = Integer.MAX_VALUE;
} }