diff --git a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java index ee1265c90d3..d169f8183fd 100644 --- a/Mage.Client/src/main/java/mage/client/table/TablesPanel.java +++ b/Mage.Client/src/main/java/mage/client/table/TablesPanel.java @@ -245,7 +245,7 @@ public class TablesPanel extends javax.swing.JPanel { setSortKeys(null); } else { // setup sort on first click - ArrayList list = new ArrayList(); + List list = new ArrayList<>(); list.add(new RowSorter.SortKey(TablesTableModel.COLUMN_SEATS, SortOrder.ASCENDING)); list.add(new RowSorter.SortKey(TablesTableModel.COLUMN_CREATED, SortOrder.DESCENDING)); setSortKeys(list); @@ -293,7 +293,7 @@ public class TablesPanel extends javax.swing.JPanel { }); // default sort by created date (last games from above) - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); list.add(new RowSorter.SortKey(TablesTableModel.COLUMN_SEATS, SortOrder.ASCENDING)); list.add(new RowSorter.SortKey(TablesTableModel.COLUMN_CREATED, SortOrder.DESCENDING)); activeTablesSorter.setSortKeys(list); @@ -310,7 +310,7 @@ public class TablesPanel extends javax.swing.JPanel { tableCompleted.getColumnModel().getColumn(MatchesTableModel.COLUMN_START).setCellRenderer(datetimeCellRenderer); tableCompleted.getColumnModel().getColumn(MatchesTableModel.COLUMN_END).setCellRenderer(datetimeCellRenderer); // default sort by ended date (last games from above) - ArrayList list2 = new ArrayList(); + ArrayList list2 = new ArrayList<>(); list2.add(new RowSorter.SortKey(MatchesTableModel.COLUMN_END, SortOrder.DESCENDING)); completedTablesSorter.setSortKeys(list2); diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java index beb8c736bd4..b994ddf4a27 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AusHighlander.java @@ -13,7 +13,7 @@ import java.util.Map; */ public class AusHighlander extends Constructed { - public static final Map pointMap = new HashMap(); + public static final Map pointMap = new HashMap<>(); static { pointMap.put("Ancestral Recall", 4); diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java index 6ee6c916bef..195887cd497 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/CanadianHighlander.java @@ -13,7 +13,7 @@ import java.util.Map; */ public class CanadianHighlander extends Constructed { - public static final Map pointMap = new HashMap(); + public static final Map pointMap = new HashMap<>(); static { pointMap.put("Ancestral Recall", 7); diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java index 5f12cbd0ca0..dd54b019f3e 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Standard.java @@ -28,7 +28,7 @@ public class Standard extends Constructed { } public static List makeLegalSets() { - List codes = new ArrayList(); + List codes = new ArrayList<>(); GregorianCalendar current = new GregorianCalendar(); List sets = new ArrayList(Sets.getInstance().values()); Collections.sort(sets, new Comparator() { diff --git a/Mage.Sets/src/mage/cards/c/CurseOfBounty.java b/Mage.Sets/src/mage/cards/c/CurseOfBounty.java index 8e9695f276b..4c853ed2818 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfBounty.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfBounty.java @@ -75,7 +75,7 @@ class CurseOfBountyEffect extends OneShotEffect { if (enchantment != null) { Player enchantedPlayer = game.getPlayer(enchantment.getAttachedTo()); if (enchantedPlayer != null) { - Set players = new HashSet(); + Set players = new HashSet<>(); for (UUID attacker : game.getCombat().getAttackers()) { UUID defender = game.getCombat().getDefenderId(attacker); if (defender.equals(enchantedPlayer.getId()) diff --git a/Mage.Sets/src/mage/cards/c/CurseOfDisturbance.java b/Mage.Sets/src/mage/cards/c/CurseOfDisturbance.java index 6d5a7254610..27ec1384246 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfDisturbance.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfDisturbance.java @@ -76,7 +76,7 @@ class CurseOfDisturbanceEffect extends OneShotEffect { if (enchantment != null) { Player enchantedPlayer = game.getPlayer(enchantment.getAttachedTo()); if (enchantedPlayer != null) { - Set players = new HashSet(); + Set players = new HashSet<>(); for (UUID attacker : game.getCombat().getAttackers()) { UUID defender = game.getCombat().getDefenderId(attacker); if (defender.equals(enchantedPlayer.getId()) diff --git a/Mage.Sets/src/mage/cards/c/CurseOfVerbosity.java b/Mage.Sets/src/mage/cards/c/CurseOfVerbosity.java index 7363a7eef27..3b073b8073e 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfVerbosity.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfVerbosity.java @@ -74,7 +74,7 @@ class CurseOfVerbosityEffect extends OneShotEffect { if (enchantment != null) { Player enchantedPlayer = game.getPlayer(enchantment.getAttachedTo()); if (enchantedPlayer != null) { - Set players = new HashSet(); + Set players = new HashSet<>(); for (UUID attacker : game.getCombat().getAttackers()) { UUID defender = game.getCombat().getDefenderId(attacker); if (defender.equals(enchantedPlayer.getId()) diff --git a/Mage.Sets/src/mage/cards/c/CurseOfVitality.java b/Mage.Sets/src/mage/cards/c/CurseOfVitality.java index 63768fe867a..2e81c314ace 100644 --- a/Mage.Sets/src/mage/cards/c/CurseOfVitality.java +++ b/Mage.Sets/src/mage/cards/c/CurseOfVitality.java @@ -74,7 +74,7 @@ class CurseOfVitalityEffect extends OneShotEffect { if (enchantment != null) { Player enchantedPlayer = game.getPlayer(enchantment.getAttachedTo()); if (enchantedPlayer != null) { - Set players = new HashSet(); + Set players = new HashSet<>(); for (UUID attacker : game.getCombat().getAttackers()) { UUID defender = game.getCombat().getDefenderId(attacker); if (defender.equals(enchantedPlayer.getId()) diff --git a/Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java b/Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java index 6e57cee6652..6ef69bb7893 100644 --- a/Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java +++ b/Mage.Sets/src/mage/cards/d/DiscoveryDispersal.java @@ -92,7 +92,7 @@ class DispersalEffect extends OneShotEffect { if (player == null) { return false; } - Set permsToReturn = new HashSet(); + Set permsToReturn = new HashSet<>(); for (UUID opponentId : game.getOpponents(player.getId())) { Player opponent = game.getPlayer(opponentId); if (opponent == null) { diff --git a/Mage.Sets/src/mage/cards/e/EndlessAtlas.java b/Mage.Sets/src/mage/cards/e/EndlessAtlas.java index 022cb4b44e3..5702db5e5f8 100644 --- a/Mage.Sets/src/mage/cards/e/EndlessAtlas.java +++ b/Mage.Sets/src/mage/cards/e/EndlessAtlas.java @@ -51,7 +51,7 @@ class EndlessAtlasCondition implements Condition { @Override public boolean apply(Game game, Ability source) { - Map landMap = new HashMap(); + Map landMap = new HashMap<>(); for (Permanent land : game.getBattlefield().getActivePermanents( StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND, source.getControllerId(), game diff --git a/Mage.Sets/src/mage/cards/i/IncubationDruid.java b/Mage.Sets/src/mage/cards/i/IncubationDruid.java index ea6cc5017ac..1dc49717dfe 100644 --- a/Mage.Sets/src/mage/cards/i/IncubationDruid.java +++ b/Mage.Sets/src/mage/cards/i/IncubationDruid.java @@ -153,7 +153,7 @@ class AnyColorLandsProduceManaEffect extends ManaEffect { @Override public List getNetMana(Game game, Ability source) { int manaAmount = getManaAmount(game, source); - List netManas = new ArrayList(); + List netManas = new ArrayList<>(); Mana types = getManaTypes(game, source); if (types.getRed() > 0) { netManas.add(new Mana(manaAmount, 0, 0, 0, 0, 0, 0, 0)); diff --git a/Mage.Sets/src/mage/cards/l/LilianasContract.java b/Mage.Sets/src/mage/cards/l/LilianasContract.java index 68ca8092406..52b275fd317 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasContract.java +++ b/Mage.Sets/src/mage/cards/l/LilianasContract.java @@ -67,7 +67,7 @@ enum LilianasContractCondition implements Condition { @Override public boolean apply(Game game, Ability source) { - Set demonNames = new HashSet(); + Set demonNames = new HashSet<>(); for (Permanent permanent : game.getBattlefield().getActivePermanents(source.getControllerId(), game)) { if (permanent == null || !permanent.isControlledBy(source.getControllerId()) diff --git a/Mage.Sets/src/mage/cards/l/LumberingBattlement.java b/Mage.Sets/src/mage/cards/l/LumberingBattlement.java index 38f3c1022c5..83e2c4925d1 100644 --- a/Mage.Sets/src/mage/cards/l/LumberingBattlement.java +++ b/Mage.Sets/src/mage/cards/l/LumberingBattlement.java @@ -110,7 +110,7 @@ class LumberingBattlementEffect extends OneShotEffect { if (!player.choose(Outcome.Neutral, target, source.getSourceId(), game)) { return false; } - Set cards = new HashSet(); + Set cards = new HashSet<>(); for (UUID targetId : target.getTargets()) { Permanent permanent = game.getPermanent(targetId); if (permanent != null) { diff --git a/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java b/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java index 3de1f5f8022..9112d41cc59 100644 --- a/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java +++ b/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java @@ -177,7 +177,7 @@ class MnemonicBetrayalAnyColorEffect extends AsThoughEffectImpl implements AsTho class MnemonicBetrayalDelayedTriggeredAbility extends DelayedTriggeredAbility { private final Cards cards; - private final Map cardMap = new HashMap(); + private final Map cardMap = new HashMap<>(); public MnemonicBetrayalDelayedTriggeredAbility(Cards cards, Map cardMap) { super(new MnemonicBetrayalReturnEffect(cards, cardMap)); @@ -224,7 +224,7 @@ class MnemonicBetrayalDelayedTriggeredAbility extends DelayedTriggeredAbility { class MnemonicBetrayalReturnEffect extends OneShotEffect { private final Cards cards; - private final Map cardMap = new HashMap(); + private final Map cardMap = new HashMap<>(); public MnemonicBetrayalReturnEffect(Cards cards, Map cardMap) { super(Outcome.Benefit); diff --git a/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java b/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java index 6289cd9a4cb..cafea3387bb 100644 --- a/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java +++ b/Mage.Sets/src/mage/cards/p/PalladiaMorsTheRuiner.java @@ -91,7 +91,7 @@ enum PalladiaMorsTheRuinerCondition implements Condition { class PalladiaMorsTheRuinerWatcher extends Watcher { - private final Set damagers = new HashSet(); + private final Set damagers = new HashSet<>(); public PalladiaMorsTheRuinerWatcher() { super(PalladiaMorsTheRuinerWatcher.class, WatcherScope.GAME); diff --git a/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java b/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java index 233c467b0b9..0f4e213e8ea 100644 --- a/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java +++ b/Mage.Sets/src/mage/cards/t/TuvasaTheSunlit.java @@ -116,7 +116,7 @@ class TuvasaTheSunlitTriggeredAbility extends SpellCastControllerTriggeredAbilit class TuvasaTheSunlitWatcher extends Watcher { - private final Map firstEnchantmentThisTurn = new HashMap(); + private final Map firstEnchantmentThisTurn = new HashMap<>(); public TuvasaTheSunlitWatcher() { super(TuvasaTheSunlitWatcher.class, WatcherScope.GAME); diff --git a/Mage.Sets/src/mage/cards/v/VaevictisAsmadiTheDire.java b/Mage.Sets/src/mage/cards/v/VaevictisAsmadiTheDire.java index 70cdd363794..500691eb9cf 100644 --- a/Mage.Sets/src/mage/cards/v/VaevictisAsmadiTheDire.java +++ b/Mage.Sets/src/mage/cards/v/VaevictisAsmadiTheDire.java @@ -128,7 +128,7 @@ class VaevictisAsmadiTheDireEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - List playersToFlip = new ArrayList(); + List playersToFlip = new ArrayList<>(); for (Target target : source.getTargets()) { for (UUID permId : target.getTargets()) { Permanent permanent = game.getPermanent(permId); diff --git a/Mage.Tests/src/test/java/org/mage/test/load/LoadPhaseManager.java b/Mage.Tests/src/test/java/org/mage/test/load/LoadPhaseManager.java index 7a95f251135..3d44e90ec64 100644 --- a/Mage.Tests/src/test/java/org/mage/test/load/LoadPhaseManager.java +++ b/Mage.Tests/src/test/java/org/mage/test/load/LoadPhaseManager.java @@ -36,7 +36,7 @@ public class LoadPhaseManager { private static Map skipYou; static { - skipYou = new HashMap() {{ + skipYou = new HashMap<>() {{ put(PhaseStep.UPKEEP, true); put(PhaseStep.PRECOMBAT_MAIN, true); put(PhaseStep.BEGIN_COMBAT, true); @@ -50,7 +50,7 @@ public class LoadPhaseManager { private static Map skipOthers; static { - skipYou = new HashMap() {{ + skipYou = new HashMap<>() {{ put(PhaseStep.UPKEEP, true); put(PhaseStep.PRECOMBAT_MAIN, true); put(PhaseStep.BEGIN_COMBAT, true); diff --git a/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java index c58092acb33..5189e93f9ad 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/ChooseModeEffect.java @@ -19,7 +19,7 @@ import mage.players.Player; */ public class ChooseModeEffect extends OneShotEffect { - protected final List modes = new ArrayList(); + protected final List modes = new ArrayList<>(); protected final String choiceMessage; public ChooseModeEffect(String choiceMessage, String... modes) { diff --git a/Mage/src/main/java/mage/designations/Designation.java b/Mage/src/main/java/mage/designations/Designation.java index 943e757e778..3554e68c508 100644 --- a/Mage/src/main/java/mage/designations/Designation.java +++ b/Mage/src/main/java/mage/designations/Designation.java @@ -30,7 +30,7 @@ import java.util.UUID; public abstract class Designation implements MageObject { private static EnumSet emptySet = EnumSet.noneOf(CardType.class); - private static List emptyList = new ArrayList(); + private static List emptyList = new ArrayList<>(); private static ObjectColor emptyColor = new ObjectColor(); private static ManaCostsImpl emptyCost = new ManaCostsImpl();