From 8f06fd130abae3c5a740e1293186e0102fa90629 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 7 May 2018 00:48:41 +0200
Subject: [PATCH] * Some formatting.

---
 .../mage/game/permanent/token/TokenImpl.java  | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java
index 20a58ded3e3..a15d39ae9a4 100644
--- a/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java
+++ b/Mage/src/main/java/mage/game/permanent/token/TokenImpl.java
@@ -108,49 +108,56 @@ public abstract class TokenImpl extends MageObjectImpl implements Token {
         this.tokenDescriptor = tokenDescriptor();
     }
 
+    @Override
     public String getTokenDescriptor() {
         this.tokenDescriptor = tokenDescriptor();
         return tokenDescriptor;
     }
 
     private String tokenDescriptor() {
-        String name = this.name.replaceAll("[^a-zA-Z0-9]", "");
-        String color = this.color.toString().replaceAll("[^a-zA-Z0-9]", "");
-        String subtype = this.subtype.toString().replaceAll("[^a-zA-Z0-9]", "");
-        String cardType = this.cardType.toString().replaceAll("[^a-zA-Z0-9]", "");
-        String originalset = this.getOriginalExpansionSetCode();
-        String descriptor = name + '.' + color + '.' + subtype + '.' + cardType + '.' + this.power + '.' + this.toughness;
+        String strName = this.name.replaceAll("[^a-zA-Z0-9]", "");
+        String strColor = this.color.toString().replaceAll("[^a-zA-Z0-9]", "");
+        String strSubtype = this.subtype.toString().replaceAll("[^a-zA-Z0-9]", "");
+        String strCardType = this.cardType.toString().replaceAll("[^a-zA-Z0-9]", "");
+        String descriptor = strName + '.' + strColor + '.' + strSubtype + '.' + strCardType + '.' + this.power + '.' + this.toughness;
         descriptor = descriptor.toUpperCase(Locale.ENGLISH);
         return descriptor;
     }
 
+    @Override
     public String getDescription() {
         return description;
     }
 
+    @Override
     public UUID getLastAddedToken() {
         return lastAddedTokenId;
     }
 
+    @Override
     public ArrayList<UUID> getLastAddedTokenIds() {
         ArrayList<UUID> ids = new ArrayList<>();
         ids.addAll(lastAddedTokenIds);
         return ids;
     }
 
+    @Override
     public void addAbility(Ability ability) {
         ability.setSourceId(this.getId());
         abilities.add(ability);
     }
 
+    @Override
     public boolean putOntoBattlefield(int amount, Game game, UUID sourceId, UUID controllerId) {
         return this.putOntoBattlefield(amount, game, sourceId, controllerId, false, false);
     }
 
+    @Override
     public boolean putOntoBattlefield(int amount, Game game, UUID sourceId, UUID controllerId, boolean tapped, boolean attacking) {
         return putOntoBattlefield(amount, game, sourceId, controllerId, tapped, attacking, null);
     }
 
+    @Override
     public boolean putOntoBattlefield(int amount, Game game, UUID sourceId, UUID controllerId, boolean tapped, boolean attacking, UUID attackedPlayer) {
         Player controller = game.getPlayer(controllerId);
         if (controller == null) {
@@ -224,49 +231,60 @@ public abstract class TokenImpl extends MageObjectImpl implements Token {
         return false;
     }
 
+    @Override
     public void setPower(int power) {
         this.power.setValue(power);
     }
 
+    @Override
     public void setToughness(int toughness) {
         this.toughness.setValue(toughness);
     }
 
+    @Override
     public int getTokenType() {
         return tokenType;
     }
 
+    @Override
     public void setTokenType(int tokenType) {
         this.tokenType = tokenType;
     }
 
+    @Override
     public String getOriginalCardNumber() {
         return originalCardNumber;
     }
 
+    @Override
     public void setOriginalCardNumber(String originalCardNumber) {
         this.originalCardNumber = originalCardNumber;
     }
 
+    @Override
     public String getOriginalExpansionSetCode() {
         return originalExpansionSetCode;
     }
 
+    @Override
     public void setOriginalExpansionSetCode(String originalExpansionSetCode) {
         this.originalExpansionSetCode = originalExpansionSetCode;
         setTokenDescriptor();
     }
 
+    @Override
     public Card getCopySourceCard() {
         return copySourceCard;
     }
 
+    @Override
     public void setCopySourceCard(Card copySourceCard) {
         if (copySourceCard != null) {
             this.copySourceCard = copySourceCard.copy();
         }
     }
 
+    @Override
     public void setExpansionSetCodeForImage(String code) {
         if (!availableImageSetCodes.isEmpty()) {
             if (availableImageSetCodes.contains(code)) {
@@ -284,6 +302,7 @@ public abstract class TokenImpl extends MageObjectImpl implements Token {
         setTokenDescriptor();
     }
 
+    @Override
     public boolean updateExpansionSetCode(String setCode) {
         if (setCode == null || setCode.isEmpty()) {
             return false;