diff --git a/forge-core/src/main/java/forge/util/CollectionSuppliers.java b/forge-core/src/main/java/forge/util/CollectionSuppliers.java deleted file mode 100644 index f4ac83515e7..00000000000 --- a/forge-core/src/main/java/forge/util/CollectionSuppliers.java +++ /dev/null @@ -1,30 +0,0 @@ -package forge.util; - -import java.util.List; -import java.util.Set; -import java.util.SortedSet; -import java.util.function.Supplier; - -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; - -public final class CollectionSuppliers { - - /** - * Private constructor to prevent instantiation. - */ - private CollectionSuppliers() { - } - - public static Supplier> arrayLists() { - return Lists::newArrayList; - } - - public static Supplier> hashSets() { - return Sets::newHashSet; - } - - public static > Supplier> treeSets() { - return Sets::newTreeSet; - } -} diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java index 7c73f8e3ae0..6e8b31f405d 100644 --- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java +++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java @@ -40,7 +40,6 @@ import forge.game.trigger.Trigger; import forge.game.trigger.TriggerType; import forge.game.zone.Zone; import forge.game.zone.ZoneType; -import forge.util.CollectionSuppliers; import forge.util.TextUtil; import forge.util.maps.HashMapOfLists; import forge.util.maps.MapOfLists; @@ -716,7 +715,7 @@ public class PhaseHandler implements java.io.Serializable { // map: defender => (many) attacker => (many) blocker Map> blockers = Maps.newHashMap(); for (GameEntity ge : combat.getDefendersControlledBy(p)) { - MapOfLists protectThisDefender = new HashMapOfLists<>(CollectionSuppliers.arrayLists()); + MapOfLists protectThisDefender = new HashMapOfLists<>(ArrayList::new); for (Card att : combat.getAttackersOf(ge)) { protectThisDefender.addAll(att, combat.getBlockers(att)); } diff --git a/forge-game/src/main/java/forge/game/zone/Zone.java b/forge-game/src/main/java/forge/game/zone/Zone.java index 404b9db5b47..41bddba1170 100644 --- a/forge-game/src/main/java/forge/game/zone/Zone.java +++ b/forge-game/src/main/java/forge/game/zone/Zone.java @@ -17,11 +17,7 @@ */ package forge.game.zone; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; import java.util.function.Predicate; @@ -34,7 +30,6 @@ import forge.game.card.*; import forge.game.event.EventValueChangeType; import forge.game.event.GameEventZone; import forge.game.player.Player; -import forge.util.CollectionSuppliers; import forge.util.MyRandom; import forge.util.maps.EnumMapOfLists; import forge.util.maps.MapOfLists; @@ -54,8 +49,8 @@ public class Zone implements java.io.Serializable, Iterable { protected final ZoneType zoneType; protected final Game game; - protected final transient MapOfLists cardsAddedThisTurn = new EnumMapOfLists<>(ZoneType.class, CollectionSuppliers.arrayLists()); - protected final transient MapOfLists cardsAddedLastTurn = new EnumMapOfLists<>(ZoneType.class, CollectionSuppliers.arrayLists()); + protected final transient MapOfLists cardsAddedThisTurn = new EnumMapOfLists<>(ZoneType.class, ArrayList::new); + protected final transient MapOfLists cardsAddedLastTurn = new EnumMapOfLists<>(ZoneType.class, ArrayList::new); public Zone(final ZoneType zone0, Game game0) { zoneType = zone0; diff --git a/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java b/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java index 47c66958d90..733467c610f 100644 --- a/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java +++ b/forge-gui-desktop/src/main/java/forge/gui/framework/SLayoutIO.java @@ -9,7 +9,6 @@ import forge.localinstance.properties.ForgeConstants; import forge.toolbox.FAbsolutePositioner; import forge.toolbox.SaveOpenDialog; import forge.toolbox.SaveOpenDialog.Filetypes; -import forge.util.CollectionSuppliers; import forge.util.ThreadUtil; import forge.util.maps.HashMapOfLists; import forge.util.maps.MapOfLists; @@ -23,6 +22,7 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; import java.awt.*; import java.io.*; +import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; @@ -513,8 +513,8 @@ public final class SLayoutIO { Attribute attribute; EDocID selectedId = null; double x0 = 0, y0 = 0, w0 = 0, h0 = 0; - - MapOfLists model = new HashMapOfLists<>(CollectionSuppliers.arrayLists()); + + MapOfLists model = new HashMapOfLists<>(ArrayList::new); LayoutInfo currentKey = null; while (null != reader && reader.hasNext()) { diff --git a/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java b/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java index df56faac030..98249ea73f8 100644 --- a/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java +++ b/forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java @@ -1,11 +1,7 @@ package forge.gamemodes.match; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; import forge.ai.AiProfileUtil; import forge.gui.control.PlaybackSpeed; @@ -53,7 +49,6 @@ import forge.player.PlayerControllerHuman; import forge.sound.MusicPlaylist; import forge.sound.SoundSystem; import forge.trackable.TrackableCollection; -import forge.util.CollectionSuppliers; import forge.util.TextUtil; import forge.util.collect.FCollectionView; import forge.util.maps.HashMapOfLists; @@ -189,7 +184,7 @@ public class HostedMatch { final GameView gameView = getGameView(); humanCount = 0; - final MapOfLists playersPerGui = new HashMapOfLists<>(CollectionSuppliers.arrayLists()); + final MapOfLists playersPerGui = new HashMapOfLists<>(ArrayList::new); for (int iPlayer = 0; iPlayer < players.size(); iPlayer++) { final RegisteredPlayer rp = match.getPlayers().get(iPlayer); final Player p = players.get(iPlayer); diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/MainWorldEventDuelManager.java b/forge-gui/src/main/java/forge/gamemodes/quest/MainWorldEventDuelManager.java index d7ac90f1454..41d025ea457 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/MainWorldEventDuelManager.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/MainWorldEventDuelManager.java @@ -11,7 +11,6 @@ import forge.gamemodes.quest.data.QuestPreferences.DifficultyPrefs; import forge.gamemodes.quest.data.QuestPreferences.QPref; import forge.gamemodes.quest.io.MainWorldDuelReader; import forge.model.FModel; -import forge.util.CollectionSuppliers; import forge.util.MyRandom; import forge.util.maps.EnumMapOfLists; import forge.util.maps.MapOfLists; @@ -20,7 +19,7 @@ import forge.util.storage.StorageBase; public class MainWorldEventDuelManager implements QuestEventDuelManagerInterface { - protected final MapOfLists sortedDuels = new EnumMapOfLists<>(QuestEventDifficulty.class, CollectionSuppliers.arrayLists()); + protected final MapOfLists sortedDuels = new EnumMapOfLists<>(QuestEventDifficulty.class, ArrayList::new); protected final IStorage allDuels; /** diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDuelManager.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDuelManager.java index 9f147e80cbc..a6f90917700 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDuelManager.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventDuelManager.java @@ -28,7 +28,6 @@ import forge.gamemodes.quest.data.QuestPreferences.DifficultyPrefs; import forge.gamemodes.quest.data.QuestPreferences.QPref; import forge.gamemodes.quest.io.QuestDuelReader; import forge.model.FModel; -import forge.util.CollectionSuppliers; import forge.util.MyRandom; import forge.util.maps.EnumMapOfLists; import forge.util.maps.MapOfLists; @@ -43,7 +42,7 @@ import forge.util.storage.StorageBase; */ public class QuestEventDuelManager implements QuestEventDuelManagerInterface { - private final MapOfLists sortedDuels = new EnumMapOfLists<>(QuestEventDifficulty.class, CollectionSuppliers.arrayLists()); + private final MapOfLists sortedDuels = new EnumMapOfLists<>(QuestEventDifficulty.class, ArrayList::new); private final IStorage allDuels; /** diff --git a/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventLDADuelManager.java b/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventLDADuelManager.java index e85d3a2f391..adfa0ad1fb7 100644 --- a/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventLDADuelManager.java +++ b/forge-gui/src/main/java/forge/gamemodes/quest/QuestEventLDADuelManager.java @@ -29,7 +29,6 @@ import forge.gamemodes.quest.data.QuestPreferences; import forge.gamemodes.quest.data.QuestPreferences.DifficultyPrefs; import forge.gamemodes.quest.data.QuestPreferences.QPref; import forge.model.FModel; -import forge.util.CollectionSuppliers; import forge.util.MyRandom; import forge.util.maps.EnumMapOfLists; import forge.util.maps.MapOfLists; @@ -43,7 +42,7 @@ import forge.util.maps.MapOfLists; public class QuestEventLDADuelManager implements QuestEventDuelManagerInterface { private List archetypes; - private final MapOfLists sortedDuels = new EnumMapOfLists<>(QuestEventDifficulty.class, CollectionSuppliers.arrayLists()); + private final MapOfLists sortedDuels = new EnumMapOfLists<>(QuestEventDifficulty.class, ArrayList::new); private GameFormat baseFormat; public QuestEventLDADuelManager(GameFormat baseFormat){