diff --git a/Mage.Common/src/mage/view/AbilityPickerView.java b/Mage.Common/src/mage/view/AbilityPickerView.java index 2ba4644e46..f5cbdfdaf1 100644 --- a/Mage.Common/src/mage/view/AbilityPickerView.java +++ b/Mage.Common/src/mage/view/AbilityPickerView.java @@ -40,6 +40,7 @@ import mage.abilities.Ability; * @author BetaSteward_at_googlemail.com */ public class AbilityPickerView implements Serializable { + private static final long serialVersionUID = 1L; private Map choices = new HashMap(); diff --git a/Mage.Common/src/mage/view/AbilityView.java b/Mage.Common/src/mage/view/AbilityView.java index a3c536515f..5fd0f09fba 100644 --- a/Mage.Common/src/mage/view/AbilityView.java +++ b/Mage.Common/src/mage/view/AbilityView.java @@ -38,6 +38,7 @@ import mage.abilities.Ability; * @author BetaSteward_at_googlemail.com */ public class AbilityView extends CardView { + private static final long serialVersionUID = 1L; private String sourceName; private CardView sourceCard; diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java index 4c733d5cdb..79489a61b5 100644 --- a/Mage.Common/src/mage/view/CardView.java +++ b/Mage.Common/src/mage/view/CardView.java @@ -36,13 +36,12 @@ import java.util.UUID; import mage.ObjectColor; import mage.Constants.CardType; import mage.Constants.Rarity; -import mage.abilities.Ability; import mage.cards.Card; +import mage.counters.Counters; import mage.game.permanent.Permanent; import mage.game.permanent.PermanentToken; import mage.game.permanent.token.Token; import mage.game.stack.Spell; -import mage.game.stack.StackObject; import mage.target.Target; import mage.target.Targets; @@ -51,6 +50,7 @@ import mage.target.Targets; * @author BetaSteward_at_googlemail.com */ public class CardView implements Serializable { + private static final long serialVersionUID = 1L; protected UUID id; protected UUID parentId; @@ -70,6 +70,7 @@ public class CardView implements Serializable { protected int cardNumber; protected boolean isAbility; protected CardView ability; + protected Counters counters; public List targets; @@ -81,6 +82,7 @@ public class CardView implements Serializable { this.power = Integer.toString(card.getPower().getValue()); this.toughness = Integer.toString(card.getToughness().getValue()); this.loyalty = Integer.toString(card.getLoyalty().getValue()); + this.counters = ((Permanent) card).getCounters().copy(); } else { this.power = card.getPower().toString(); this.toughness = card.getToughness().toString(); diff --git a/Mage.Common/src/mage/view/ChatMessage.java b/Mage.Common/src/mage/view/ChatMessage.java index 6645072aa5..dde62bf341 100644 --- a/Mage.Common/src/mage/view/ChatMessage.java +++ b/Mage.Common/src/mage/view/ChatMessage.java @@ -36,6 +36,7 @@ import java.util.UUID; * @author BetaSteward_at_googlemail.com */ public class ChatMessage implements Serializable { + private static final long serialVersionUID = 1L; private UUID chatId; private String message; diff --git a/Mage.Common/src/mage/view/CombatGroupView.java b/Mage.Common/src/mage/view/CombatGroupView.java index 2a4c1b698f..f6923e3610 100644 --- a/Mage.Common/src/mage/view/CombatGroupView.java +++ b/Mage.Common/src/mage/view/CombatGroupView.java @@ -40,6 +40,7 @@ import mage.players.Player; * @author BetaSteward_at_googlemail.com */ public class CombatGroupView implements Serializable { + private static final long serialVersionUID = 1L; private CardsView attackers = new CardsView(); private CardsView blockers = new CardsView(); diff --git a/Mage.Common/src/mage/view/CounterView.java b/Mage.Common/src/mage/view/CounterView.java index 10d2674a34..240ec1fea5 100644 --- a/Mage.Common/src/mage/view/CounterView.java +++ b/Mage.Common/src/mage/view/CounterView.java @@ -36,6 +36,8 @@ import mage.counters.Counter; * @author BetaSteward_at_googlemail.com */ public class CounterView implements Serializable { + private static final long serialVersionUID = 1L; + private String name; private int count; diff --git a/Mage.Common/src/mage/view/DraftClientMessage.java b/Mage.Common/src/mage/view/DraftClientMessage.java index 5e4c6feb32..fb2fa9ec6a 100644 --- a/Mage.Common/src/mage/view/DraftClientMessage.java +++ b/Mage.Common/src/mage/view/DraftClientMessage.java @@ -35,6 +35,7 @@ import java.io.Serializable; * @author BetaSteward_at_googlemail.com */ public class DraftClientMessage implements Serializable { + private static final long serialVersionUID = 1L; private DraftView draftView; private DraftPickView draftPickView; diff --git a/Mage.Common/src/mage/view/DraftPickView.java b/Mage.Common/src/mage/view/DraftPickView.java index 3b37e761dc..34d8e1090d 100644 --- a/Mage.Common/src/mage/view/DraftPickView.java +++ b/Mage.Common/src/mage/view/DraftPickView.java @@ -36,6 +36,7 @@ import mage.game.draft.DraftPlayer; * @author BetaSteward_at_googlemail.com */ public class DraftPickView implements Serializable { + private static final long serialVersionUID = 1L; protected CardsView booster; protected CardsView picks; diff --git a/Mage.Common/src/mage/view/DraftView.java b/Mage.Common/src/mage/view/DraftView.java index adfbac3619..79856a852c 100644 --- a/Mage.Common/src/mage/view/DraftView.java +++ b/Mage.Common/src/mage/view/DraftView.java @@ -39,6 +39,7 @@ import mage.game.draft.Draft; * @author BetaSteward_at_googlemail.com */ public class DraftView implements Serializable { + private static final long serialVersionUID = 1L; private List sets = new ArrayList(); private int boosterNum; diff --git a/Mage.Common/src/mage/view/ExileView.java b/Mage.Common/src/mage/view/ExileView.java index be0ca1e660..99ec608046 100644 --- a/Mage.Common/src/mage/view/ExileView.java +++ b/Mage.Common/src/mage/view/ExileView.java @@ -38,6 +38,7 @@ import mage.game.Game; * @author BetaSteward_at_googlemail.com */ public class ExileView extends CardsView { + private static final long serialVersionUID = 1L; private String name; private UUID id; diff --git a/Mage.Common/src/mage/view/GameClientMessage.java b/Mage.Common/src/mage/view/GameClientMessage.java index 25899ce935..bc41630dec 100644 --- a/Mage.Common/src/mage/view/GameClientMessage.java +++ b/Mage.Common/src/mage/view/GameClientMessage.java @@ -37,6 +37,7 @@ import java.util.UUID; * @author BetaSteward_at_googlemail.com */ public class GameClientMessage implements Serializable { + private static final long serialVersionUID = 1L; private GameView gameView; private CardsView cardsView; diff --git a/Mage.Common/src/mage/view/GameTypeView.java b/Mage.Common/src/mage/view/GameTypeView.java index 310e405727..754cbc6953 100644 --- a/Mage.Common/src/mage/view/GameTypeView.java +++ b/Mage.Common/src/mage/view/GameTypeView.java @@ -36,6 +36,7 @@ import mage.game.match.MatchType; * @author BetaSteward_at_googlemail.com */ public class GameTypeView implements Serializable { + private static final long serialVersionUID = 1L; private String name; private int minPlayers; diff --git a/Mage.Common/src/mage/view/GameView.java b/Mage.Common/src/mage/view/GameView.java index 91ab585195..6f43af86b9 100644 --- a/Mage.Common/src/mage/view/GameView.java +++ b/Mage.Common/src/mage/view/GameView.java @@ -50,6 +50,7 @@ import mage.players.Player; * @author BetaSteward_at_googlemail.com */ public class GameView implements Serializable { + private static final long serialVersionUID = 1L; private List players = new ArrayList(); private CardsView hand; diff --git a/Mage.Common/src/mage/view/ManaPoolView.java b/Mage.Common/src/mage/view/ManaPoolView.java index cc3b0ef718..1c75873872 100644 --- a/Mage.Common/src/mage/view/ManaPoolView.java +++ b/Mage.Common/src/mage/view/ManaPoolView.java @@ -36,6 +36,7 @@ import mage.players.ManaPool; * @author BetaSteward_at_googlemail.com */ public class ManaPoolView implements Serializable { + private static final long serialVersionUID = 1L; private int red; private int green; diff --git a/Mage.Common/src/mage/view/PermanentView.java b/Mage.Common/src/mage/view/PermanentView.java index 9dc1e35054..bba7b8acdb 100644 --- a/Mage.Common/src/mage/view/PermanentView.java +++ b/Mage.Common/src/mage/view/PermanentView.java @@ -41,6 +41,7 @@ import mage.game.permanent.PermanentToken; * @author BetaSteward_at_googlemail.com */ public class PermanentView extends CardView { + private static final long serialVersionUID = 1L; private boolean tapped; private boolean flipped; diff --git a/Mage.Common/src/mage/view/PlayerView.java b/Mage.Common/src/mage/view/PlayerView.java index 6dc55fca13..8107a94841 100644 --- a/Mage.Common/src/mage/view/PlayerView.java +++ b/Mage.Common/src/mage/view/PlayerView.java @@ -43,6 +43,7 @@ import mage.players.Player; * @author BetaSteward_at_googlemail.com */ public class PlayerView implements Serializable { + private static final long serialVersionUID = 1L; private UUID playerId; private String name; diff --git a/Mage.Common/src/mage/view/RoundView.java b/Mage.Common/src/mage/view/RoundView.java index 20d35e3eb1..8a147a7b3d 100644 --- a/Mage.Common/src/mage/view/RoundView.java +++ b/Mage.Common/src/mage/view/RoundView.java @@ -36,6 +36,7 @@ import mage.game.tournament.Round; * @author BetaSteward_at_googlemail.com */ public class RoundView implements Serializable { + private static final long serialVersionUID = 1L; public RoundView(Round round) { diff --git a/Mage.Common/src/mage/view/SeatView.java b/Mage.Common/src/mage/view/SeatView.java index ce92d4574b..5538eb7f5a 100644 --- a/Mage.Common/src/mage/view/SeatView.java +++ b/Mage.Common/src/mage/view/SeatView.java @@ -37,6 +37,7 @@ import mage.game.Seat; * @author BetaSteward_at_googlemail.com */ public class SeatView implements Serializable { + private static final long serialVersionUID = 1L; private UUID playerId; private String playerName; diff --git a/Mage.Common/src/mage/view/StackAbilityView.java b/Mage.Common/src/mage/view/StackAbilityView.java index d795daa7fc..c6ae2b0f3b 100644 --- a/Mage.Common/src/mage/view/StackAbilityView.java +++ b/Mage.Common/src/mage/view/StackAbilityView.java @@ -37,6 +37,7 @@ import mage.game.stack.StackAbility; * @author BetaSteward_at_googlemail.com */ public class StackAbilityView extends CardView { + private static final long serialVersionUID = 1L; private String sourceName; private CardView sourceCard; diff --git a/Mage.Common/src/mage/view/TableClientMessage.java b/Mage.Common/src/mage/view/TableClientMessage.java index 8bad71470b..8b27bfb987 100644 --- a/Mage.Common/src/mage/view/TableClientMessage.java +++ b/Mage.Common/src/mage/view/TableClientMessage.java @@ -37,6 +37,7 @@ import mage.cards.decks.Deck; * @author BetaSteward_at_googlemail.com */ public class TableClientMessage implements Serializable { + private static final long serialVersionUID = 1L; private Deck deck; private UUID tableId; diff --git a/Mage.Common/src/mage/view/TableView.java b/Mage.Common/src/mage/view/TableView.java index 8d95df3ae5..006f3d6b99 100644 --- a/Mage.Common/src/mage/view/TableView.java +++ b/Mage.Common/src/mage/view/TableView.java @@ -41,6 +41,7 @@ import mage.game.Table; * @author BetaSteward_at_googlemail.com */ public class TableView implements Serializable { + private static final long serialVersionUID = 1L; private UUID tableId; private String gameType; diff --git a/Mage.Common/src/mage/view/TournamentPlayerView.java b/Mage.Common/src/mage/view/TournamentPlayerView.java index 2e8fdb0915..3a7d628a9a 100644 --- a/Mage.Common/src/mage/view/TournamentPlayerView.java +++ b/Mage.Common/src/mage/view/TournamentPlayerView.java @@ -35,5 +35,6 @@ import java.io.Serializable; * @author BetaSteward_at_googlemail.com */ public class TournamentPlayerView implements Serializable { + private static final long serialVersionUID = 1L; } diff --git a/Mage.Common/src/mage/view/TournamentView.java b/Mage.Common/src/mage/view/TournamentView.java index a783896593..5adf653498 100644 --- a/Mage.Common/src/mage/view/TournamentView.java +++ b/Mage.Common/src/mage/view/TournamentView.java @@ -38,6 +38,7 @@ import mage.game.tournament.Tournament; * @author BetaSteward_at_googlemail.com */ public class TournamentView implements Serializable { + private static final long serialVersionUID = 1L; List rounds = new ArrayList();