From 5216eddb7144e082ce22a63d8273719c798bc953 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 17 Jun 2013 13:59:23 +0200 Subject: [PATCH] In the card info (tooltip) tokens have now the work "Token" written below the expansion symbol. Some code cleaning concering handling of counters. --- .../plugins/card/info/CardInfoPaneImpl.java | 15 +++++++----- Mage.Common/src/mage/view/CardView.java | 7 ++++++ Mage.Common/src/mage/view/GameView.java | 24 ++++++++++--------- Mage.Common/src/mage/view/PermanentView.java | 13 +--------- 4 files changed, 30 insertions(+), 29 deletions(-) diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java index bc47999e41c..16269a07503 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/info/CardInfoPaneImpl.java @@ -154,12 +154,15 @@ public class CardInfoPaneImpl extends JEditorPane implements CardInfoPane { } else if (CardUtil.isPlaneswalker(card)) { pt = card.getLoyalty().toString(); } - if (pt.length() > 0) { - buffer.append("
"); - buffer.append(""); - buffer.append(pt); - buffer.append(""); - buffer.append("
"); + + if (pt.length() > 0 || card.isToken()) { + buffer.append(""); + if (card.isToken()) { + buffer.append(""); + } + + buffer.append("
"); + buffer.append(pt).append("Token
"); } StringBuilder rule = new StringBuilder("
"); diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java index 1c27582361f..24598179aed 100644 --- a/Mage.Common/src/mage/view/CardView.java +++ b/Mage.Common/src/mage/view/CardView.java @@ -82,6 +82,7 @@ public class CardView extends SimpleCardView { protected boolean transformed; protected boolean isSplitCard; + protected boolean isToken; protected String leftSplitName; protected ManaCosts leftSplitCosts; protected List leftSplitRules; @@ -156,8 +157,10 @@ public class CardView extends SimpleCardView { this.expansionSetCode = ((PermanentToken) card).getExpansionSetCode(); this.rules = ((PermanentToken) card).getRules(); this.type = ((PermanentToken)card).getToken().getTokenType(); + this.isToken = true; } else { this.rarity = card.getRarity(); + this.isToken = false; } if (card.getCounters() != null && !card.getCounters().isEmpty()) { counters = new ArrayList(); @@ -453,6 +456,10 @@ public class CardView extends SimpleCardView { return this.secondCardFace; } + public boolean isToken() { + return this.isToken; + } + public void setTransformed(boolean transformed) { this.transformed = transformed; } diff --git a/Mage.Common/src/mage/view/GameView.java b/Mage.Common/src/mage/view/GameView.java index 09d2734ea6b..3913b9f9548 100644 --- a/Mage.Common/src/mage/view/GameView.java +++ b/Mage.Common/src/mage/view/GameView.java @@ -28,11 +28,16 @@ package mage.view; -import mage.constants.PhaseStep; -import mage.constants.TurnPhase; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; import mage.MageObject; import mage.abilities.costs.Cost; import mage.cards.Card; +import mage.constants.PhaseStep; +import mage.constants.TurnPhase; import mage.constants.Zone; import mage.game.ExileZone; import mage.game.Game; @@ -46,11 +51,6 @@ import mage.game.stack.StackAbility; import mage.game.stack.StackObject; import mage.players.Player; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.UUID; /** * @@ -131,14 +131,16 @@ public class GameView implements Serializable { this.phase = state.getTurn().getPhaseType(); this.step = state.getTurn().getStepType(); this.turn = state.getTurnNum(); - if (state.getActivePlayerId() != null) + if (state.getActivePlayerId() != null) { this.activePlayerName = state.getPlayer(state.getActivePlayerId()).getName(); - else + } else { this.activePlayerName = ""; - if (state.getPriorityPlayerId() != null) + } + if (state.getPriorityPlayerId() != null) { this.priorityPlayerName = state.getPlayer(state.getPriorityPlayerId()).getName(); - else + } else { this.priorityPlayerName = ""; + } for (CombatGroup combatGroup: state.getCombat().getGroups()) { combat.add(new CombatGroupView(combatGroup, game)); } diff --git a/Mage.Common/src/mage/view/PermanentView.java b/Mage.Common/src/mage/view/PermanentView.java index a88791d000a..09e00e4e419 100644 --- a/Mage.Common/src/mage/view/PermanentView.java +++ b/Mage.Common/src/mage/view/PermanentView.java @@ -50,7 +50,6 @@ public class PermanentView extends CardView { private boolean summoningSickness; private int damage; private List attachments; - private List counters; private CardView original; public PermanentView(Permanent permanent, Card card) { @@ -66,13 +65,7 @@ public class PermanentView extends CardView { attachments = new ArrayList(); attachments.addAll(permanent.getAttachments()); } - if (permanent.getCounters().size() > 0) { - counters = new ArrayList(); - for (Counter counter: permanent.getCounters().values()) { - counters.add(new CounterView(counter)); - } - } - if (permanent instanceof PermanentToken) { + if (isToken()) { original = new CardView(((PermanentToken)permanent).getToken()); original.expansionSetCode = permanent.getExpansionSetCode(); } @@ -110,10 +103,6 @@ public class PermanentView extends CardView { return attachments; } - public List getCounters() { - return counters; - } - public CardView getOriginal() { return original; }