External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 12:31:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sonar fixes 19022019

Browse source
This commit is contained in:
Ingmar Goudt 2019-02-19 21:51:45 +01:00
parent 872eea7326
commit 056226d83c
385 changed files with 472 additions and 475 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java
View file

@ -22,6 +22,7 @@ import mage.target.common.TargetCardInLibrary;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
/**
*
@ -51,16 +52,12 @@ public class FetchLandActivatedAbility extends ActivatedAbilityImpl {
addEffect(new SearchLibraryPutInPlayEffect(target, false, true, Outcome.PutLandInPlay));
}
public FetchLandActivatedAbility(FetchLandActivatedAbility ability) {
private FetchLandActivatedAbility(FetchLandActivatedAbility ability) {
super(ability);
}
private String subTypeNames(Set<SubType> subTypes) {
StringBuilder sb = new StringBuilder();
for (SubType subType: subTypes) {
sb.append(subType.getDescription()).append(" or ");
}
return sb.substring(0, sb.length() - 4);
return subTypes.stream().map(SubType::getDescription).collect(Collectors.joining(" or "));
}
@Override

2
Mage/src/main/java/mage/abilities/common/LeavesBattlefieldAllTriggeredAbility.java
View file

@ -40,7 +40,7 @@ public class LeavesBattlefieldAllTriggeredAbility extends TriggeredAbilityImpl {
this.setTargetPointer = setTargetPointer;
}
public LeavesBattlefieldAllTriggeredAbility(final LeavesBattlefieldAllTriggeredAbility ability) {
private LeavesBattlefieldAllTriggeredAbility(final LeavesBattlefieldAllTriggeredAbility ability) {
super(ability);
filter = ability.filter;
setTargetPointer = ability.setTargetPointer;

4
Mage/src/main/java/mage/abilities/costs/mana/ManaSymbols.java
View file

@ -17,7 +17,7 @@ import java.util.Map;
*/
public class ManaSymbols extends ArrayList<ManaSymbol> {
private final static Map<ColoredManaSymbol, ManaSymbol> coloredManaMap = new EnumMap<ColoredManaSymbol, ManaSymbol>(ColoredManaSymbol.class) {{
private static final Map<ColoredManaSymbol, ManaSymbol> coloredManaMap = new EnumMap<ColoredManaSymbol, ManaSymbol>(ColoredManaSymbol.class) {{
put(ColoredManaSymbol.W, ManaSymbol.W);
put(ColoredManaSymbol.U, ManaSymbol.U);
put(ColoredManaSymbol.B, ManaSymbol.B);
@ -29,7 +29,7 @@ public class ManaSymbols extends ArrayList<ManaSymbol> {
* Contains all possible hybrid mana costs (each represents different hybrid mana symbol)
* We'll use it for converting from hybrid mana cost to hybrid mana symbol.
*/
private final static Map<ManaSymbol, HybridManaCost> hybridManaMap = new EnumMap<ManaSymbol, HybridManaCost>(ManaSymbol.class) {{
private static final Map<ManaSymbol, HybridManaCost> hybridManaMap = new EnumMap<ManaSymbol, HybridManaCost>(ManaSymbol.class) {{
/**
* Build map of all possible hybrid mana symbols assigning corresponding instance of hybrid mana cost.

2
Mage/src/main/java/mage/abilities/keyword/AdaptAbility.java
View file

@ -16,7 +16,7 @@ public class AdaptAbility extends ActivatedAbilityImpl {
super(Zone.BATTLEFIELD, new AdaptEffect(adaptNumber), new ManaCostsImpl(manaCost));
}
public AdaptAbility(final AdaptAbility ability) {
private AdaptAbility(final AdaptAbility ability) {
super(ability);
}

2
Mage/src/main/java/mage/abilities/keyword/CascadeAbility.java
View file

@ -20,7 +20,7 @@ import mage.players.Player;
public class CascadeAbility extends TriggeredAbilityImpl {
//20091005 - 702.82
private final static String REMINDERTEXT = " <i>(When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less."
private static final String REMINDERTEXT = " <i>(When you cast this spell, exile cards from the top of your library until you exile a nonland card that costs less."
+ " You may cast it without paying its mana cost. Put the exiled cards on the bottom in a random order.)</i>";
private boolean withReminder;

4
Mage/src/main/java/mage/abilities/keyword/HauntAbility.java
View file

@ -110,8 +110,8 @@ public class HauntAbility extends TriggeredAbilityImpl {
class HauntExileAbility extends ZoneChangeTriggeredAbility {
private final static String RULE_TEXT_CREATURE = "Haunt <i>(When this creature dies, exile it haunting target creature.)</i>";
private final static String RULE_TEXT_SPELL = "Haunt <i>(When this spell card is put into a graveyard after resolving, exile it haunting target creature.)</i>";
private static final String RULE_TEXT_CREATURE = "Haunt <i>(When this creature dies, exile it haunting target creature.)</i>";
private static final String RULE_TEXT_SPELL = "Haunt <i>(When this spell card is put into a graveyard after resolving, exile it haunting target creature.)</i>";
private boolean creatureHaunt;

2
Mage/src/main/java/mage/abilities/keyword/SoulbondAbility.java
View file

@ -168,7 +168,7 @@ class SoulboundEntersSelfEffect extends OneShotEffect {
*/
class SoulbondEntersOtherAbility extends EntersBattlefieldAllTriggeredAbility {
private final static FilterCreaturePermanent soulbondFilter = new FilterCreaturePermanent();
private static final FilterCreaturePermanent soulbondFilter = new FilterCreaturePermanent();
static {
soulbondFilter.add(Predicates.not(new PairedPredicate()));

4
Mage/src/main/java/mage/abilities/keyword/SunburstAbility.java
View file

@ -22,8 +22,8 @@ import mage.players.Player;
*/
public class SunburstAbility extends EntersBattlefieldAbility {
private final static String ruleCreature = "Sunburst <i>(This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.)</i>";
private final static String ruleNonCreature = "Sunburst <i>(This enters the battlefield with a charge counter on it for each color of mana spent to cast it.)</i>";
private static final String ruleCreature = "Sunburst <i>(This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it.)</i>";
private static final String ruleNonCreature = "Sunburst <i>(This enters the battlefield with a charge counter on it for each color of mana spent to cast it.)</i>";
private boolean isCreature;
public SunburstAbility(Card card) {

4
Mage/src/main/java/mage/cards/ExpansionSet.java
View file

@ -23,8 +23,8 @@ import java.util.stream.Collectors;
public abstract class ExpansionSet implements Serializable {
private static final Logger logger = Logger.getLogger(ExpansionSet.class);
public final static CardGraphicInfo NON_FULL_USE_VARIOUS = new CardGraphicInfo(null, true);
public final static CardGraphicInfo FULL_ART_BFZ_VARIOUS = new CardGraphicInfo(FrameStyle.BFZ_FULL_ART_BASIC, true);
public static final CardGraphicInfo NON_FULL_USE_VARIOUS = new CardGraphicInfo(null, true);
public static final CardGraphicInfo FULL_ART_BFZ_VARIOUS = new CardGraphicInfo(FrameStyle.BFZ_FULL_ART_BASIC, true);
public class SetCardInfo implements Serializable {

2
Mage/src/main/java/mage/game/command/planes/FieldsOfSummerPlane.java
View file

@ -32,7 +32,7 @@ import mage.watchers.common.PlanarRollWatcher;
*/
public class FieldsOfSummerPlane extends Plane {
private final static FilterSpell filter = new FilterSpell("a spell");
private static final FilterSpell filter = new FilterSpell("a spell");
public FieldsOfSummerPlane() {
this.setName("Plane - Fields of Summer");

2
Mage/src/main/java/mage/game/permanent/token/AngelToken.java
View file

@ -10,7 +10,7 @@ import mage.constants.SubType;
public final class AngelToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CFX", "GTC", "ISD", "M14", "ORI", "SOI", "ZEN", "C15", "MM3"));

2
Mage/src/main/java/mage/game/permanent/token/BatToken.java
View file

@ -10,7 +10,7 @@ import mage.constants.SubType;
public final class BatToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("MMA", "C17"));

2
Mage/src/main/java/mage/game/permanent/token/BeastToken.java
View file

@ -14,7 +14,7 @@ import mage.constants.SubType;
*/
public final class BeastToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C14", "LRW", "M15", "M14", "DDL", "M13", "M12", "DD3GVL", "NPH", "M11", "M10", "EVE", "MM3", "CMA", "E01"));

2
Mage/src/main/java/mage/game/permanent/token/BeastToken2.java
View file

@ -14,7 +14,7 @@ import mage.constants.SubType;
*/
public final class BeastToken2 extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("ZEN", "C14", "DDD", "C15", "DD3GVL", "MM3", "CMA", "E01"));

2
Mage/src/main/java/mage/game/permanent/token/BelzenlokClericToken.java
View file

@ -14,7 +14,7 @@ import mage.constants.SubType;
*/
public final class BelzenlokClericToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("DOM"));
}

2
Mage/src/main/java/mage/game/permanent/token/BelzenlokDemonToken.java
View file

@ -29,7 +29,7 @@ import mage.players.Player;
*/
public final class BelzenlokDemonToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("DOM"));
}

2
Mage/src/main/java/mage/game/permanent/token/BrudicladTelchorMyrToken.java
View file

@ -10,7 +10,7 @@ import mage.constants.SubType;
public final class BrudicladTelchorMyrToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C18"));

2
Mage/src/main/java/mage/game/permanent/token/CatToken.java
View file

@ -15,7 +15,7 @@ import mage.constants.SubType;
*/
public final class CatToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("SOM", "M13", "M14", "C14", "C15", "C17"));

2
Mage/src/main/java/mage/game/permanent/token/CatWarriorToken.java
View file

@ -14,7 +14,7 @@ import mage.constants.SubType;
*/
public final class CatWarriorToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("PLC", "C17"));

2
Mage/src/main/java/mage/game/permanent/token/CentaurToken.java
View file

@ -14,7 +14,7 @@ import java.util.List;
*/
public final class CentaurToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("RTR", "MM3", "RNA"));

2
Mage/src/main/java/mage/game/permanent/token/ChainersTormentNightmareToken.java
View file

@ -14,7 +14,7 @@ import mage.MageInt;
*/
public final class ChainersTormentNightmareToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("DOM"));
}

2
Mage/src/main/java/mage/game/permanent/token/ClueArtifactToken.java
View file

@ -20,7 +20,7 @@ import java.util.List;
*/
public final class ClueArtifactToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("SOI", "EDM"));

2
Mage/src/main/java/mage/game/permanent/token/DeathtouchRatToken.java
View file

@ -15,7 +15,7 @@ import mage.constants.SubType;
*/
public final class DeathtouchRatToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C17"));
}

2
Mage/src/main/java/mage/game/permanent/token/DokaiWeaverofLifeToken.java
View file

@ -19,7 +19,7 @@ import mage.filter.common.FilterControlledPermanent;
*/
public final class DokaiWeaverofLifeToken extends TokenImpl {
final static FilterControlledPermanent filterLands = new FilterControlledLandPermanent("lands you control");
static final FilterControlledPermanent filterLands = new FilterControlledLandPermanent("lands you control");
public DokaiWeaverofLifeToken() {
super("Elemental", "X/X green Elemental creature token, where X is the number of lands you control");

2
Mage/src/main/java/mage/game/permanent/token/DragonToken.java
View file

@ -16,7 +16,7 @@ import mage.constants.SubType;
*/
public final class DragonToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("DTK", "MMA", "ALA", "MM3", "C17"));

2
Mage/src/main/java/mage/game/permanent/token/DragonToken2.java
View file

@ -15,7 +15,7 @@ import mage.constants.SubType;
*/
public final class DragonToken2 extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("WWK", "10E", "BFZ", "C15", "CN2", "CMA"));

2
Mage/src/main/java/mage/game/permanent/token/DragonTokenGold.java
View file

@ -16,7 +16,7 @@ import mage.constants.SubType;
*/
public final class DragonTokenGold extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("UST","H17"));

2
Mage/src/main/java/mage/game/permanent/token/EdgarMarkovToken.java
View file

@ -14,7 +14,7 @@ import mage.MageInt;
*/
public final class EdgarMarkovToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C17"));
}

2
Mage/src/main/java/mage/game/permanent/token/EldraziHorrorToken.java
View file

@ -14,7 +14,7 @@ import mage.constants.SubType;
*/
public final class EldraziHorrorToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Collections.singletonList("EMN"));

2
Mage/src/main/java/mage/game/permanent/token/EldraziScionToken.java
View file

@ -20,7 +20,7 @@ import mage.util.RandomUtil;
*/
public final class EldraziScionToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("BFZ", "OGW"));

2
Mage/src/main/java/mage/game/permanent/token/EldraziSpawnToken.java
View file

@ -20,7 +20,7 @@ import mage.util.RandomUtil;
*/
public final class EldraziSpawnToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("ROE", "MM2", "DDP", "C17"));

2
Mage/src/main/java/mage/game/permanent/token/ElementalShamanToken.java
View file

@ -15,7 +15,7 @@ import mage.constants.SubType;
*/
public final class ElementalShamanToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C15", "DD3JVC", "DD2", "LRW"));

2
Mage/src/main/java/mage/game/permanent/token/ElementalToken.java
View file

@ -16,7 +16,7 @@ import mage.constants.SubType;
*/
public final class ElementalToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("OGW", "CON", "DIS"));

2
Mage/src/main/java/mage/game/permanent/token/ElephantToken.java
View file

@ -15,7 +15,7 @@ import mage.constants.SubType;
*/
public final class ElephantToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C14", "CNS", "DDD", "MM2", "WWK", "OGW", "C15", "DD3GVL", "MM3", "CMA"));

2
Mage/src/main/java/mage/game/permanent/token/ElfToken.java
View file

@ -14,7 +14,7 @@ import mage.constants.SubType;
*/
public final class ElfToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C14", "SHM", "EVG", "LRW", "ORI"));

2
Mage/src/main/java/mage/game/permanent/token/FaerieRogueToken.java
View file

@ -17,7 +17,7 @@ import mage.abilities.keyword.FlyingAbility;
*/
public final class FaerieRogueToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("SHM", "MOR", "MMA", "MM2"));

2
Mage/src/main/java/mage/game/permanent/token/FreyaliseLlanowarsFuryToken.java
View file

@ -16,7 +16,7 @@ import mage.abilities.mana.GreenManaAbility;
*/
public final class FreyaliseLlanowarsFuryToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C14", "CMA"));

2
Mage/src/main/java/mage/game/permanent/token/GermToken.java
View file

@ -13,7 +13,7 @@ import mage.constants.SubType;
*/
public final class GermToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("NPH", "MBS", "SOM", "EMA", "C16"));

2
Mage/src/main/java/mage/game/permanent/token/GoatToken.java
View file

@ -15,7 +15,7 @@ import mage.constants.SubType;
*/
public final class GoatToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("EVE", "M13", "M14", "C14"));

2
Mage/src/main/java/mage/game/permanent/token/GoblinToken.java
View file

@ -14,7 +14,7 @@ import java.util.List;
*/
public final class GoblinToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("10E", "ALA", "SOM", "M10", "NPH", "M13", "RTR",

2
Mage/src/main/java/mage/game/permanent/token/GoldToken.java
View file

@ -17,7 +17,7 @@ import mage.constants.Zone;
*/
public final class GoldToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("BNG", "C17"));
}

2
Mage/src/main/java/mage/game/permanent/token/GolemToken.java
View file

@ -15,7 +15,7 @@ import mage.MageInt;
*/
public final class GolemToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("MM2", "NPH", "SOM", "MM3"));

2
Mage/src/main/java/mage/game/permanent/token/HuntedCentaurToken.java
View file

@ -16,7 +16,7 @@ import mage.abilities.keyword.ProtectionAbility;
*/
public final class HuntedCentaurToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("RTR", "MM3"));

2
Mage/src/main/java/mage/game/permanent/token/HuntedDragonKnightToken.java
View file

@ -14,7 +14,7 @@ import mage.constants.SubType;
*/
public final class HuntedDragonKnightToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("ORI", "RTR", "C15"));

2
Mage/src/main/java/mage/game/permanent/token/InsectToken.java
View file

@ -15,7 +15,7 @@ import mage.constants.SubType;
*/
public final class InsectToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("M10", "MM2", "SOI"));

2
Mage/src/main/java/mage/game/permanent/token/KalonianTwingroveTreefolkWarriorToken.java
View file

@ -18,7 +18,7 @@ import mage.filter.predicate.mageobject.SubtypePredicate;
*/
public final class KalonianTwingroveTreefolkWarriorToken extends TokenImpl {
final static FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control");
static final FilterControlledPermanent filterLands = new FilterControlledPermanent("Forests you control");
static {
filterLands.add(new SubtypePredicate(SubType.FOREST));

2
Mage/src/main/java/mage/game/permanent/token/KarnConstructToken.java
View file

@ -29,7 +29,7 @@ public final class KarnConstructToken extends TokenImpl {
filter.add(new CardTypePredicate(CardType.ARTIFACT));
}
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("DOM"));
}

2
Mage/src/main/java/mage/game/permanent/token/KaroxBladewingDragonToken.java
View file

@ -15,7 +15,7 @@ import mage.constants.SuperType;
*/
public final class KaroxBladewingDragonToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("DOM"));
}

2
Mage/src/main/java/mage/game/permanent/token/KnightToken.java
View file

@ -15,7 +15,7 @@ import mage.util.RandomUtil;
*/
public final class KnightToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("ORI", "RTR", "C15", "CMA", "DOM"));

2
Mage/src/main/java/mage/game/permanent/token/LeafdrakeRoostDrakeToken.java
View file

@ -15,7 +15,7 @@ import mage.abilities.keyword.FlyingAbility;
*/
public final class LeafdrakeRoostDrakeToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C13", "CMA"));

2
Mage/src/main/java/mage/game/permanent/token/MyrToken.java
View file

@ -10,7 +10,7 @@ import mage.constants.SubType;
public final class MyrToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C14", "MM2", "NPH", "SOM"));

2
Mage/src/main/java/mage/game/permanent/token/OviyaPashiriSageLifecrafterToken.java
View file

@ -13,7 +13,7 @@ import mage.util.RandomUtil;
*/
public final class OviyaPashiriSageLifecrafterToken extends TokenImpl {
final static FilterControlledCreaturePermanent filterCreature = new FilterControlledCreaturePermanent("creatures you control");
static final FilterControlledCreaturePermanent filterCreature = new FilterControlledCreaturePermanent("creatures you control");
public OviyaPashiriSageLifecrafterToken() {
this(1);

2
Mage/src/main/java/mage/game/permanent/token/PlantToken.java
View file

@ -11,7 +11,7 @@ import mage.constants.SubType;
public final class PlantToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("WWK", "DDP", "OGW"));

2
Mage/src/main/java/mage/game/permanent/token/PrismToken.java
View file

@ -14,7 +14,7 @@ import mage.constants.SubType;
*/
public final class PrismToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Collections.singletonList("VIS"));

2
Mage/src/main/java/mage/game/permanent/token/SaprolingToken.java
View file

@ -16,7 +16,7 @@ import mage.util.RandomUtil;
*/
public final class SaprolingToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList(

2
Mage/src/main/java/mage/game/permanent/token/ServoToken.java
View file

@ -15,7 +15,7 @@ import mage.util.RandomUtil;
*/
public final class ServoToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Collections.singletonList("KLD"));

2
Mage/src/main/java/mage/game/permanent/token/SnakeToken.java
View file

@ -15,7 +15,7 @@ import mage.constants.SubType;
*/
public final class SnakeToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("ZEN", "KTK", "MM2", "C15"));

2
Mage/src/main/java/mage/game/permanent/token/SoldierToken.java
View file

@ -15,7 +15,7 @@ import mage.util.RandomUtil;
*/
public final class SoldierToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("10E", "M15", "C14", "ORI", "ALA", "DDF", "THS", "M12", "M13", "MM2", "MMA", "RTR",

2
Mage/src/main/java/mage/game/permanent/token/SoldierTokenWithHaste.java
View file

@ -16,7 +16,7 @@ import mage.abilities.keyword.HasteAbility;
*/
public final class SoldierTokenWithHaste extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("GTC", "MM3"));

2
Mage/src/main/java/mage/game/permanent/token/SpiderToken.java
View file

@ -19,7 +19,7 @@ import mage.constants.SubType;
*/
public final class SpiderToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("ISD", "EMN", "C15", "SHM"));

2
Mage/src/main/java/mage/game/permanent/token/SpiritToken.java
View file

@ -13,7 +13,7 @@ import mage.constants.SubType;
*/
public final class SpiritToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("CHK", "EMA", "C16"));

2
Mage/src/main/java/mage/game/permanent/token/SpiritWhiteToken.java
View file

@ -14,7 +14,7 @@ import java.util.List;
*/
public final class SpiritWhiteToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("AVR", "C14", "CNS", "DDC", "DDK", "FRF", "ISD", "KTK", "M15", "MM2", "SHM",

2
Mage/src/main/java/mage/game/permanent/token/SquirrelToken.java
View file

@ -14,7 +14,7 @@ import mage.constants.SubType;
*/
public final class SquirrelToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Collections.singletonList("CNS"));

2
Mage/src/main/java/mage/game/permanent/token/ThopterColorlessToken.java
View file

@ -16,7 +16,7 @@ import mage.util.RandomUtil;
*/
public final class ThopterColorlessToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("MBS", "ORI", "KLD"));

2
Mage/src/main/java/mage/game/permanent/token/ThrullToken.java
View file

@ -15,7 +15,7 @@ import mage.constants.SubType;
*/
public final class ThrullToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Collections.singletonList("MM2"));

2
Mage/src/main/java/mage/game/permanent/token/TitaniaProtectorOfArgothElementalToken.java
View file

@ -15,7 +15,7 @@ import mage.ObjectColor;
*/
public final class TitaniaProtectorOfArgothElementalToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C14", "CMA"));

2
Mage/src/main/java/mage/game/permanent/token/TreasureToken.java
View file

@ -18,7 +18,7 @@ import java.util.List;
*/
public final class TreasureToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("XLN", "RNA"));

2
Mage/src/main/java/mage/game/permanent/token/UtvaraHellkiteDragonToken.java
View file

@ -15,7 +15,7 @@ import mage.abilities.keyword.FlyingAbility;
*/
public final class UtvaraHellkiteDragonToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C17"));
}

2
Mage/src/main/java/mage/game/permanent/token/ValdukElementalToken.java
View file

@ -16,7 +16,7 @@ import mage.abilities.keyword.TrampleAbility;
*/
public final class ValdukElementalToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("DOM"));
}

2
Mage/src/main/java/mage/game/permanent/token/WasitoraCatDragonToken.java
View file

@ -15,7 +15,7 @@ import mage.abilities.keyword.FlyingAbility;
*/
public final class WasitoraCatDragonToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("C17"));

2
Mage/src/main/java/mage/game/permanent/token/WolfToken.java
View file

@ -15,7 +15,7 @@ import mage.constants.SubType;
*/
public final class WolfToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("BNG", "C14", "CNS", "FNMP", "ISD", "LRW", "M10", "M14", "MM2", "SHM", "SOM", "ZEN", "SOI", "C15", "M15"));

2
Mage/src/main/java/mage/game/permanent/token/WurmToken2.java
View file

@ -16,7 +16,7 @@ import mage.abilities.keyword.TrampleAbility;
*/
public final class WurmToken2 extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("RTR", "MM3"));

2
Mage/src/main/java/mage/game/permanent/token/WurmToken3.java
View file

@ -15,7 +15,7 @@ import mage.MageInt;
*/
public final class WurmToken3 extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("AKH"));

2
Mage/src/main/java/mage/game/permanent/token/ZombieKnightToken.java
View file

@ -12,7 +12,7 @@ import mage.constants.SubType;
public final class ZombieKnightToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("DOM"));
}

2
Mage/src/main/java/mage/game/permanent/token/ZombieToken.java
View file

@ -14,7 +14,7 @@ import java.util.List;
*/
public final class ZombieToken extends TokenImpl {
final static private List<String> tokenImageSets = new ArrayList<>();
static final private List<String> tokenImageSets = new ArrayList<>();
static {
tokenImageSets.addAll(Arrays.asList("10E", "M10", "M11", "M12", "M13", "M14", "M15", "MBS", "ALA", "ISD", "C14", "C15", "C16", "C17", "CNS",

10
Mage/src/main/java/mage/target/common/TargetPermanentOrPlayerWithCounter.java
View file

@ -17,7 +17,7 @@ import mage.filter.predicate.permanent.CounterPredicate;
*/
public class TargetPermanentOrPlayerWithCounter extends TargetPermanentOrPlayer {
protected final FilterPermanentOrPlayerWithCounter filter;
protected final FilterPermanentOrPlayerWithCounter targetFilter;
public TargetPermanentOrPlayerWithCounter() {
this(1, 1);
@ -33,16 +33,16 @@ public class TargetPermanentOrPlayerWithCounter extends TargetPermanentOrPlayer
public TargetPermanentOrPlayerWithCounter(int minNumTargets, int maxNumTargets, boolean notTarget) {
super(minNumTargets, maxNumTargets, notTarget);
this.filter = new FilterPermanentOrPlayerWithCounter();
this.targetFilter = new FilterPermanentOrPlayerWithCounter();
this.filterPermanent = new FilterPermanent();
this.filterPermanent.add(new CounterPredicate(null));
this.targetName = filter.getMessage();
this.targetName = targetFilter.getMessage();
}
public TargetPermanentOrPlayerWithCounter(final TargetPermanentOrPlayerWithCounter target) {
super(target);
this.filter = target.filter.copy();
super.setFilter(this.filter);
this.targetFilter = target.targetFilter.copy();
super.setFilter(this.targetFilter);
}
@Override