From 10f6cbc2d55f25714d6aa0c53a45dba11fe5796a Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Fri, 20 Jun 2014 19:26:27 +0200 Subject: [PATCH] Some formatting. --- Mage/src/mage/abilities/costs/common/ExileFromHandCost.java | 5 ++--- Mage/src/mage/game/GameCommanderImpl.java | 4 ++-- Mage/src/mage/watchers/common/ProwlWatcher.java | 6 +++--- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java b/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java index 81f709b539..f5957652b5 100644 --- a/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java +++ b/Mage/src/mage/abilities/costs/common/ExileFromHandCost.java @@ -31,7 +31,6 @@ package mage.abilities.costs.common; import java.util.ArrayList; import java.util.List; import java.util.UUID; - import mage.abilities.Ability; import mage.abilities.costs.CostImpl; import mage.cards.Card; @@ -40,14 +39,14 @@ import mage.constants.Zone; import mage.game.Game; import mage.players.Player; import mage.target.common.TargetCardInHand; - + /** * * @author LevelX2 */ public class ExileFromHandCost extends CostImpl { - List cards = new ArrayList(); + List cards = new ArrayList<>(); public ExileFromHandCost(TargetCardInHand target) { this.addTarget(target); diff --git a/Mage/src/mage/game/GameCommanderImpl.java b/Mage/src/mage/game/GameCommanderImpl.java index 3fc18e5704..1c04b0535a 100644 --- a/Mage/src/mage/game/GameCommanderImpl.java +++ b/Mage/src/mage/game/GameCommanderImpl.java @@ -55,8 +55,8 @@ import mage.watchers.common.CommanderCombatDamageWatcher; public abstract class GameCommanderImpl extends GameImpl { - private final Map mulliganedCards = new HashMap(); - private final Set commanderCombatWatcher = new HashSet(); + private final Map mulliganedCards = new HashMap<>(); + private final Set commanderCombatWatcher = new HashSet<>(); public GameCommanderImpl(MultiplayerAttackOption attackOption, RangeOfInfluence range, int freeMulligans) { super(attackOption, range, freeMulligans); diff --git a/Mage/src/mage/watchers/common/ProwlWatcher.java b/Mage/src/mage/watchers/common/ProwlWatcher.java index c10c30082a..6d8fafdd06 100644 --- a/Mage/src/mage/watchers/common/ProwlWatcher.java +++ b/Mage/src/mage/watchers/common/ProwlWatcher.java @@ -51,8 +51,8 @@ import mage.watchers.Watcher; */ public class ProwlWatcher extends Watcher { - private Map> damagingSubtypes = new HashMap>(); - private Set allSubtypes = new HashSet(); + private final Map> damagingSubtypes = new HashMap<>(); + private final Set allSubtypes = new HashSet<>(); public ProwlWatcher() { super("Prowl", WatcherScope.GAME); @@ -82,7 +82,7 @@ public class ProwlWatcher extends Watcher { } else { Set subtypes = damagingSubtypes.get(creature.getControllerId()); if (subtypes == null) { - subtypes = new LinkedHashSet(); + subtypes = new LinkedHashSet<>(); } subtypes.addAll(creature.getSubtype()); damagingSubtypes.put(creature.getControllerId(), subtypes);