diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index d8421cc264..0ece81f2db 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -21,6 +21,7 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW; import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -210,7 +211,7 @@ public class ScarletVanHalisha extends AbstractNpcAI private Creature getRandomTarget(Npc npc, Skill skill) { - final ArrayList result = new ArrayList<>(); + final List result = new ArrayList<>(); { for (PlayerInstance obj : npc.getInstanceWorld().getPlayers()) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java index deb32be644..fea7ac1c79 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java @@ -17,6 +17,7 @@ package ai.areas.AteliaFortress.AteliaManager; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.SpawnTable; @@ -308,7 +309,7 @@ public class AteliaManager extends AbstractNpcAI private static final int SBCANCEL = 3600000; // Time 1 Hour private static final int DDESPAWN = 10800000; // Time 3 Hour - static ArrayList FortessSpawns = new ArrayList<>(); + static List FortessSpawns = new ArrayList<>(); private AteliaManager() { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index d8421cc264..0ece81f2db 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -21,6 +21,7 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW; import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -210,7 +211,7 @@ public class ScarletVanHalisha extends AbstractNpcAI private Creature getRandomTarget(Npc npc, Skill skill) { - final ArrayList result = new ArrayList<>(); + final List result = new ArrayList<>(); { for (PlayerInstance obj : npc.getInstanceWorld().getPlayers()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 57dd5ad702..f26dd18452 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -106,7 +106,7 @@ public class Kelbim extends AbstractNpcAI private static GrandBossInstance _kelbimBoss; private static long _lastAction; private static int _bossStage; - private static ArrayList _minions = new ArrayList<>(); + private static List _minions = new ArrayList<>(); public Kelbim() { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java index deb32be644..fea7ac1c79 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java @@ -17,6 +17,7 @@ package ai.areas.AteliaFortress.AteliaManager; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.SpawnTable; @@ -308,7 +309,7 @@ public class AteliaManager extends AbstractNpcAI private static final int SBCANCEL = 3600000; // Time 1 Hour private static final int DDESPAWN = 10800000; // Time 3 Hour - static ArrayList FortessSpawns = new ArrayList<>(); + static List FortessSpawns = new ArrayList<>(); private AteliaManager() { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index d8421cc264..0ece81f2db 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -21,6 +21,7 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW; import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -210,7 +211,7 @@ public class ScarletVanHalisha extends AbstractNpcAI private Creature getRandomTarget(Npc npc, Skill skill) { - final ArrayList result = new ArrayList<>(); + final List result = new ArrayList<>(); { for (PlayerInstance obj : npc.getInstanceWorld().getPlayers()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 57dd5ad702..f26dd18452 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -106,7 +106,7 @@ public class Kelbim extends AbstractNpcAI private static GrandBossInstance _kelbimBoss; private static long _lastAction; private static int _bossStage; - private static ArrayList _minions = new ArrayList<>(); + private static List _minions = new ArrayList<>(); public Kelbim() { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java index deb32be644..fea7ac1c79 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java @@ -17,6 +17,7 @@ package ai.areas.AteliaFortress.AteliaManager; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.SpawnTable; @@ -308,7 +309,7 @@ public class AteliaManager extends AbstractNpcAI private static final int SBCANCEL = 3600000; // Time 1 Hour private static final int DDESPAWN = 10800000; // Time 3 Hour - static ArrayList FortessSpawns = new ArrayList<>(); + static List FortessSpawns = new ArrayList<>(); private AteliaManager() { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index d8421cc264..0ece81f2db 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -21,6 +21,7 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW; import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -210,7 +211,7 @@ public class ScarletVanHalisha extends AbstractNpcAI private Creature getRandomTarget(Npc npc, Skill skill) { - final ArrayList result = new ArrayList<>(); + final List result = new ArrayList<>(); { for (PlayerInstance obj : npc.getInstanceWorld().getPlayers()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 57dd5ad702..f26dd18452 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -106,7 +106,7 @@ public class Kelbim extends AbstractNpcAI private static GrandBossInstance _kelbimBoss; private static long _lastAction; private static int _bossStage; - private static ArrayList _minions = new ArrayList<>(); + private static List _minions = new ArrayList<>(); public Kelbim() { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java index deb32be644..fea7ac1c79 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java @@ -17,6 +17,7 @@ package ai.areas.AteliaFortress.AteliaManager; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.SpawnTable; @@ -308,7 +309,7 @@ public class AteliaManager extends AbstractNpcAI private static final int SBCANCEL = 3600000; // Time 1 Hour private static final int DDESPAWN = 10800000; // Time 3 Hour - static ArrayList FortessSpawns = new ArrayList<>(); + static List FortessSpawns = new ArrayList<>(); private AteliaManager() { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index d8421cc264..0ece81f2db 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -21,6 +21,7 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW; import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -210,7 +211,7 @@ public class ScarletVanHalisha extends AbstractNpcAI private Creature getRandomTarget(Npc npc, Skill skill) { - final ArrayList result = new ArrayList<>(); + final List result = new ArrayList<>(); { for (PlayerInstance obj : npc.getInstanceWorld().getPlayers()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 57dd5ad702..f26dd18452 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -106,7 +106,7 @@ public class Kelbim extends AbstractNpcAI private static GrandBossInstance _kelbimBoss; private static long _lastAction; private static int _bossStage; - private static ArrayList _minions = new ArrayList<>(); + private static List _minions = new ArrayList<>(); public Kelbim() { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java index deb32be644..fea7ac1c79 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java @@ -17,6 +17,7 @@ package ai.areas.AteliaFortress.AteliaManager; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.SpawnTable; @@ -308,7 +309,7 @@ public class AteliaManager extends AbstractNpcAI private static final int SBCANCEL = 3600000; // Time 1 Hour private static final int DDESPAWN = 10800000; // Time 3 Hour - static ArrayList FortessSpawns = new ArrayList<>(); + static List FortessSpawns = new ArrayList<>(); private AteliaManager() { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index d8421cc264..0ece81f2db 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -21,6 +21,7 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW; import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -210,7 +211,7 @@ public class ScarletVanHalisha extends AbstractNpcAI private Creature getRandomTarget(Npc npc, Skill skill) { - final ArrayList result = new ArrayList<>(); + final List result = new ArrayList<>(); { for (PlayerInstance obj : npc.getInstanceWorld().getPlayers()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 57dd5ad702..f26dd18452 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -106,7 +106,7 @@ public class Kelbim extends AbstractNpcAI private static GrandBossInstance _kelbimBoss; private static long _lastAction; private static int _bossStage; - private static ArrayList _minions = new ArrayList<>(); + private static List _minions = new ArrayList<>(); public Kelbim() { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java index deb32be644..fea7ac1c79 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java @@ -17,6 +17,7 @@ package ai.areas.AteliaFortress.AteliaManager; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.SpawnTable; @@ -308,7 +309,7 @@ public class AteliaManager extends AbstractNpcAI private static final int SBCANCEL = 3600000; // Time 1 Hour private static final int DDESPAWN = 10800000; // Time 3 Hour - static ArrayList FortessSpawns = new ArrayList<>(); + static List FortessSpawns = new ArrayList<>(); private AteliaManager() { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index d8421cc264..0ece81f2db 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -21,6 +21,7 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW; import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -210,7 +211,7 @@ public class ScarletVanHalisha extends AbstractNpcAI private Creature getRandomTarget(Npc npc, Skill skill) { - final ArrayList result = new ArrayList<>(); + final List result = new ArrayList<>(); { for (PlayerInstance obj : npc.getInstanceWorld().getPlayers()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 57dd5ad702..f26dd18452 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -106,7 +106,7 @@ public class Kelbim extends AbstractNpcAI private static GrandBossInstance _kelbimBoss; private static long _lastAction; private static int _bossStage; - private static ArrayList _minions = new ArrayList<>(); + private static List _minions = new ArrayList<>(); public Kelbim() { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java index deb32be644..fea7ac1c79 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/areas/AteliaFortress/AteliaManager/AteliaManager.java @@ -17,6 +17,7 @@ package ai.areas.AteliaFortress.AteliaManager; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.datatables.SpawnTable; @@ -308,7 +309,7 @@ public class AteliaManager extends AbstractNpcAI private static final int SBCANCEL = 3600000; // Time 1 Hour private static final int DDESPAWN = 10800000; // Time 3 Hour - static ArrayList FortessSpawns = new ArrayList<>(); + static List FortessSpawns = new ArrayList<>(); private AteliaManager() { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index d8421cc264..0ece81f2db 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -21,6 +21,7 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW; import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -210,7 +211,7 @@ public class ScarletVanHalisha extends AbstractNpcAI private Creature getRandomTarget(Npc npc, Skill skill) { - final ArrayList result = new ArrayList<>(); + final List result = new ArrayList<>(); { for (PlayerInstance obj : npc.getInstanceWorld().getPlayers()) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java index 57dd5ad702..f26dd18452 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Kelbim/Kelbim.java @@ -106,7 +106,7 @@ public class Kelbim extends AbstractNpcAI private static GrandBossInstance _kelbimBoss; private static long _lastAction; private static int _bossStage; - private static ArrayList _minions = new ArrayList<>(); + private static List _minions = new ArrayList<>(); public Kelbim() { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SymbolSealData.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SymbolSealData.java index 71820cff96..ff99038a6d 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SymbolSealData.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SymbolSealData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.w3c.dom.Document; @@ -33,7 +34,7 @@ import org.l2jmobius.gameserver.model.skills.Skill; */ public class SymbolSealData implements IXmlReader { - private final Map> _data = new HashMap<>(); + private final Map> _data = new HashMap<>(); protected SymbolSealData() { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java index 620723fc0e..3a28c75b58 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java @@ -91,9 +91,8 @@ public class Inventory public ItemInstance findItemByItemId(int itemId) { - for (int i = 0; i < _items.size(); ++i) + for (final ItemInstance temp : _items) { - final ItemInstance temp = _items.get(i); if (temp.getItemId() != itemId) { continue; @@ -235,7 +234,7 @@ public class Inventory public List equipItem(ItemInstance item) { - final ArrayList changedItems = new ArrayList<>(); + final List changedItems = new ArrayList<>(); final int targetSlot = item.getItem().getBodyPart(); switch (targetSlot) { @@ -427,9 +426,8 @@ public class Inventory public ItemInstance getItem(int objectId) { - for (int i = 0; i < _items.size(); ++i) + for (final ItemInstance temp : _items) { - final ItemInstance temp = _items.get(i); if (temp.getObjectId() != objectId) { continue; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListBuy.java index 14e1c7a93f..34c549d68e 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListBuy.java @@ -46,7 +46,7 @@ public class PrivateBuyListBuy extends ServerBasePacket writeD(_seller.getAdena()); final List buyerslist = _buyer.getBuyList(); final Collection sellerItems = _seller.getInventory().getItems(); - final ArrayList sellerslist = new ArrayList<>(); + final List sellerslist = new ArrayList<>(); int count = buyerslist.size(); for (int i = 0; i < count; ++i) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Transform.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Transform.java index 20076a3b5f..caa587ed69 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Transform.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Transform.java @@ -17,6 +17,7 @@ package ai.others; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; @@ -32,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; public class Transform extends Quest { - private final ArrayList _mobs = new ArrayList<>(); + private final List _mobs = new ArrayList<>(); private static class Transformer { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java index d4007ea3da..9a7cb835d6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/Config.java @@ -1068,7 +1068,7 @@ public class Config public static long DEADLOCKCHECK_INTIAL_TIME; public static long DEADLOCKCHECK_DELAY_TIME; - public static ArrayList QUESTION_LIST = new ArrayList<>(); + public static List QUESTION_LIST = new ArrayList<>(); public static int SERVER_ID; public static byte[] HEX_ID; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index ea8d3b8c8a..2be14671bf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -68,7 +68,7 @@ public class SchemeBufferTable final int objectId = rs.getInt("object_id"); final String schemeName = rs.getString("scheme_name"); final String[] skills = rs.getString("skills").split(","); - final ArrayList schemeList = new ArrayList<>(); + final List schemeList = new ArrayList<>(); for (String skill : skills) { // Don't feed the skills list if the list is empty. diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 6bfa5dbdd9..b508e1393d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -627,7 +627,7 @@ public abstract class DocumentBase else if ("class_id_restriction".equalsIgnoreCase(a.getNodeName())) { final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - final ArrayList array = new ArrayList<>(st.countTokens()); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { final String item = st.nextToken().trim(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java index 6b8d78ba0c..c4cd712c54 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java @@ -24,8 +24,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.BankingCmd; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.CTFCmd; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.DMCmd; -import org.l2jmobius.gameserver.handler.voicedcommandhandlers.FarmPvpCmd; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.ExperienceGain; +import org.l2jmobius.gameserver.handler.voicedcommandhandlers.FarmPvpCmd; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.OfflineShop; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.Online; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.StatsCmd; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java index ba80683a0c..4afdfd7af5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java @@ -181,7 +181,7 @@ public class RaidBossPointsManager tmpPoints.put(ownerId, totalPoints); } } - final ArrayList> list = new ArrayList<>(tmpPoints.entrySet()); + final List> list = new ArrayList<>(tmpPoints.entrySet()); Collections.sort(list, _comparator); int ranking = 1; for (Entry entry : list) @@ -209,7 +209,7 @@ public class RaidBossPointsManager tmpPoints.put(ownerId, totalPoints); } } - final ArrayList> list = new ArrayList<>(tmpPoints.entrySet()); + final List> list = new ArrayList<>(tmpPoints.entrySet()); Collections.sort(list, _comparator); int ranking = 1; for (Entry entry : list) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java index 55b7334f91..baba2bbf9e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java @@ -426,7 +426,7 @@ public class BanditStrongholdSiege extends ClanHallSiege public List getRegisteredClans() { - final ArrayList clans = new ArrayList<>(); + final List clans = new ArrayList<>(); for (clanPlayersInfo a : _clansInfo.values()) { clans.add(a._clanName); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/DevastatedCastle.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/DevastatedCastle.java index af3b160daa..a7f4e651fd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/DevastatedCastle.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/DevastatedCastle.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.logging.Logger; @@ -63,8 +64,8 @@ public class DevastatedCastle private NpcInstance _minion1 = null; private NpcInstance _minion2 = null; - private final ArrayList _monsters = new ArrayList<>(); - private ArrayList _spawns = new ArrayList<>(); + private final List _monsters = new ArrayList<>(); + private List _spawns = new ArrayList<>(); private final Calendar _siegetime = Calendar.getInstance(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Calculator.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Calculator.java index aa732e08eb..a3c937d255 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Calculator.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/Calculator.java @@ -145,7 +145,7 @@ public class Calculator return; } - final ArrayList tmp = new ArrayList<>(); + final List tmp = new ArrayList<>(); tmp.addAll(Arrays.asList(_functions)); if (tmp.contains(f)) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/TownZone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/TownZone.java index 0094fc83be..e059a6deab 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/TownZone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/TownZone.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.model.zone.ZoneId; +import org.l2jmobius.gameserver.model.zone.ZoneRespawn; /** * A Town zone diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java index 20076a3b5f..caa587ed69 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java @@ -17,6 +17,7 @@ package ai.others; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; @@ -32,7 +33,7 @@ import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; public class Transform extends Quest { - private final ArrayList _mobs = new ArrayList<>(); + private final List _mobs = new ArrayList<>(); private static class Transformer { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java index c87da672e8..290acacf75 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java @@ -1103,7 +1103,7 @@ public class Config public static long DEADLOCKCHECK_INTIAL_TIME; public static long DEADLOCKCHECK_DELAY_TIME; - public static ArrayList QUESTION_LIST = new ArrayList<>(); + public static List QUESTION_LIST = new ArrayList<>(); public static int SERVER_ID; public static byte[] HEX_ID; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index ea8d3b8c8a..2be14671bf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -68,7 +68,7 @@ public class SchemeBufferTable final int objectId = rs.getInt("object_id"); final String schemeName = rs.getString("scheme_name"); final String[] skills = rs.getString("skills").split(","); - final ArrayList schemeList = new ArrayList<>(); + final List schemeList = new ArrayList<>(); for (String skill : skills) { // Don't feed the skills list if the list is empty. diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java index c9bdb596fa..cd713532dd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java @@ -63,9 +63,9 @@ public class AugmentationData private static final int BASESTAT_MEN = 16344; private static List[] _augmentationStats = null; - private static Map> _blueSkills = null; - private static Map> _purpleSkills = null; - private static Map> _redSkills = null; + private static Map> _blueSkills = null; + private static Map> _purpleSkills = null; + private static Map> _redSkills = null; private AugmentationData() { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 6bfa5dbdd9..b508e1393d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -627,7 +627,7 @@ public abstract class DocumentBase else if ("class_id_restriction".equalsIgnoreCase(a.getNodeName())) { final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - final ArrayList array = new ArrayList<>(st.countTokens()); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { final String item = st.nextToken().trim(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java index 6b8d78ba0c..c4cd712c54 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/VoicedCommandHandler.java @@ -24,8 +24,8 @@ import org.l2jmobius.Config; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.BankingCmd; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.CTFCmd; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.DMCmd; -import org.l2jmobius.gameserver.handler.voicedcommandhandlers.FarmPvpCmd; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.ExperienceGain; +import org.l2jmobius.gameserver.handler.voicedcommandhandlers.FarmPvpCmd; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.OfflineShop; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.Online; import org.l2jmobius.gameserver.handler.voicedcommandhandlers.StatsCmd; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java index ba80683a0c..4afdfd7af5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/RaidBossPointsManager.java @@ -181,7 +181,7 @@ public class RaidBossPointsManager tmpPoints.put(ownerId, totalPoints); } } - final ArrayList> list = new ArrayList<>(tmpPoints.entrySet()); + final List> list = new ArrayList<>(tmpPoints.entrySet()); Collections.sort(list, _comparator); int ranking = 1; for (Entry entry : list) @@ -209,7 +209,7 @@ public class RaidBossPointsManager tmpPoints.put(ownerId, totalPoints); } } - final ArrayList> list = new ArrayList<>(tmpPoints.entrySet()); + final List> list = new ArrayList<>(tmpPoints.entrySet()); Collections.sort(list, _comparator); int ranking = 1; for (Entry entry : list) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java index 55b7334f91..baba2bbf9e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/BanditStrongholdSiege.java @@ -426,7 +426,7 @@ public class BanditStrongholdSiege extends ClanHallSiege public List getRegisteredClans() { - final ArrayList clans = new ArrayList<>(); + final List clans = new ArrayList<>(); for (clanPlayersInfo a : _clansInfo.values()) { clans.add(a._clanName); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/DevastatedCastle.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/DevastatedCastle.java index af3b160daa..a7f4e651fd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/DevastatedCastle.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/siege/clanhalls/DevastatedCastle.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.logging.Logger; @@ -63,8 +64,8 @@ public class DevastatedCastle private NpcInstance _minion1 = null; private NpcInstance _minion2 = null; - private final ArrayList _monsters = new ArrayList<>(); - private ArrayList _spawns = new ArrayList<>(); + private final List _monsters = new ArrayList<>(); + private List _spawns = new ArrayList<>(); private final Calendar _siegetime = Calendar.getInstance(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Calculator.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Calculator.java index aa732e08eb..a3c937d255 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Calculator.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/Calculator.java @@ -145,7 +145,7 @@ public class Calculator return; } - final ArrayList tmp = new ArrayList<>(); + final List tmp = new ArrayList<>(); tmp.addAll(Arrays.asList(_functions)); if (tmp.contains(f)) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java index cdadf9a45e..aae0054654 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/ClanHallZone.java @@ -21,8 +21,8 @@ import org.l2jmobius.gameserver.instancemanager.ClanHallManager; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.entity.ClanHall; -import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.model.zone.ZoneId; +import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.network.serverpackets.ClanHallDecoration; /** diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/TownZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/TownZone.java index 0094fc83be..e059a6deab 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/TownZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/TownZone.java @@ -19,8 +19,8 @@ package org.l2jmobius.gameserver.model.zone.type; import org.l2jmobius.Config; import org.l2jmobius.gameserver.model.actor.Creature; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; -import org.l2jmobius.gameserver.model.zone.ZoneRespawn; import org.l2jmobius.gameserver.model.zone.ZoneId; +import org.l2jmobius.gameserver.model.zone.ZoneRespawn; /** * A Town zone diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/BruteProtector.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/BruteProtector.java index b3dfa254b5..239c232d83 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/BruteProtector.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/BruteProtector.java @@ -18,6 +18,7 @@ package org.l2jmobius.loginserver; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.logging.Logger; @@ -26,7 +27,7 @@ import org.l2jmobius.Config; public class BruteProtector { private static final Logger LOGGER = Logger.getLogger(BruteProtector.class.getName()); - private static final Map> _clients = new HashMap<>(); + private static final Map> _clients = new HashMap<>(); public static boolean canLogin(String ip) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index a987068947..9b27ca49d2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -261,7 +261,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine protected static Map _warDecreesCount = new HashMap<>(); protected static List _acceptedClans = new ArrayList<>(4); - private static Map> _usedTextPassages = new HashMap<>(); + private static Map> _usedTextPassages = new HashMap<>(); private static Map _pendingItemToGet = new HashMap<>(); protected static SiegableHall _rainbow; @@ -545,7 +545,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine if (_usedTextPassages.containsKey(passage)) { - final ArrayList list = _usedTextPassages.get(passage); + final List list = _usedTextPassages.get(passage); if (list.contains(clan)) { html = "yeti_passage_used.htm"; diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java index 0ba9c66689..8fb64fbe4d 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java @@ -781,7 +781,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine { try (Connection con = DatabaseFactory.getConnection()) { - final ArrayList listInstance = _data.get(clanId).players; + final List listInstance = _data.get(clanId).players; if (listInstance == null) { LOGGER.warning(getName() + ": Tried to load unregistered clan with ID " + clanId); @@ -880,8 +880,8 @@ public abstract class FlagWar extends ClanHallSiegeEngine { int flag = 0; int npc = 0; - ArrayList players = new ArrayList<>(18); - ArrayList playersInstance = new ArrayList<>(18); + List players = new ArrayList<>(18); + List playersInstance = new ArrayList<>(18); Spawn warrior = null; Spawn flagInstance = null; } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java index de96097cd1..6c24a116de 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java @@ -111,7 +111,7 @@ public class FishData implements IXmlReader */ public List getFish(int level, int group, int grade) { - final ArrayList result = new ArrayList<>(); + final List result = new ArrayList<>(); Map fish = null; switch (grade) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index ea8d3b8c8a..2be14671bf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -68,7 +68,7 @@ public class SchemeBufferTable final int objectId = rs.getInt("object_id"); final String schemeName = rs.getString("scheme_name"); final String[] skills = rs.getString("skills").split(","); - final ArrayList schemeList = new ArrayList<>(); + final List schemeList = new ArrayList<>(); for (String skill : skills) { // Don't feed the skills list if the list is empty. diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 04fff3ee19..9b54696330 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -666,7 +666,7 @@ public abstract class DocumentBase case "clanhall": { final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - final ArrayList array = new ArrayList<>(st.countTokens()); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { final String item = st.nextToken().trim(); @@ -742,7 +742,7 @@ public abstract class DocumentBase case "class_id_restriction": { final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - final ArrayList array = new ArrayList<>(st.countTokens()); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { final String item = st.nextToken().trim(); @@ -760,7 +760,7 @@ public abstract class DocumentBase case "instanceid": { final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - final ArrayList array = new ArrayList<>(st.countTokens()); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { final String item = st.nextToken().trim(); @@ -784,7 +784,7 @@ public abstract class DocumentBase case "haspet": { final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - final ArrayList array = new ArrayList<>(st.countTokens()); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { final String item = st.nextToken().trim(); @@ -796,7 +796,7 @@ public abstract class DocumentBase case "servitornpcid": { final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - final ArrayList array = new ArrayList<>(st.countTokens()); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { final String item = st.nextToken().trim(); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 26f998e08c..a5bc4f1f71 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index c4d350b8c5..384738cce4 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -70,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -346,7 +346,7 @@ public class ItemAuctionInstance public ItemAuction[] getAuctionsByBidder(int bidderObjId) { final Collection auctions = getAuctions(); - final ArrayList stack = new ArrayList<>(auctions.size()); + final List stack = new ArrayList<>(auctions.size()); for (ItemAuction auction : getAuctions()) { if ((auction.getAuctionState() != ItemAuctionState.CREATED) && (auction.getBidFor(bidderObjId) != null)) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index f3fd38e5e4..98b62c0c60 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -181,7 +181,7 @@ public class MultiSellChoose implements IClientIncomingPacket return; } - final ArrayList ingredientsList = new ArrayList<>(entry.getIngredients().size()); + final List ingredientsList = new ArrayList<>(entry.getIngredients().size()); // Generate a list of distinct ingredients and counts in order to check if the correct item-counts // are possessed by the player boolean newIng; diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 4fcd9944a5..245cf97793 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.WorldObject; @@ -58,7 +59,7 @@ public class StatusUpdate implements IClientOutgoingPacket public static final int MAX_CP = 0x22; private final int _objectId; - private final ArrayList _attributes = new ArrayList<>(); + private final List _attributes = new ArrayList<>(); static class Attribute { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/GameServerTable.java index 97f6c4091e..97b0d7d8dd 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/GameServerTable.java @@ -29,6 +29,7 @@ import java.sql.ResultSet; import java.sql.Statement; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.logging.Logger; @@ -302,7 +303,7 @@ public class GameServerTable implements IXmlReader private GameServerThread _gst; private int _status; // network - private final ArrayList _addrs = new ArrayList<>(5); + private final List _addrs = new ArrayList<>(5); private int _port; // config private static final boolean IS_PVP = true; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Anais/Anais.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Anais/Anais.java index 0932f42434..c16f19145d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Anais/Anais.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/bosses/Anais/Anais.java @@ -17,6 +17,7 @@ package ai.bosses.Anais; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.gameserver.ai.CtrlIntention; import org.l2jmobius.gameserver.model.Location; @@ -41,7 +42,7 @@ public class Anais extends AbstractNpcAI // Skill private static SkillHolder DIVINE_NOVA = new SkillHolder(6326, 1); // Instances - ArrayList _divineBurners = new ArrayList<>(4); + List _divineBurners = new ArrayList<>(4); private PlayerInstance _nextTarget = null; private Npc _current = null; private int _pot = 0; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index a987068947..9b27ca49d2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -261,7 +261,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine protected static Map _warDecreesCount = new HashMap<>(); protected static List _acceptedClans = new ArrayList<>(4); - private static Map> _usedTextPassages = new HashMap<>(); + private static Map> _usedTextPassages = new HashMap<>(); private static Map _pendingItemToGet = new HashMap<>(); protected static SiegableHall _rainbow; @@ -545,7 +545,7 @@ public class RainbowSpringsChateau extends ClanHallSiegeEngine if (_usedTextPassages.containsKey(passage)) { - final ArrayList list = _usedTextPassages.get(passage); + final List list = _usedTextPassages.get(passage); if (list.contains(clan)) { html = "yeti_passage_used.htm"; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java index 0ba9c66689..8fb64fbe4d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java @@ -781,7 +781,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine { try (Connection con = DatabaseFactory.getConnection()) { - final ArrayList listInstance = _data.get(clanId).players; + final List listInstance = _data.get(clanId).players; if (listInstance == null) { LOGGER.warning(getName() + ": Tried to load unregistered clan with ID " + clanId); @@ -880,8 +880,8 @@ public abstract class FlagWar extends ClanHallSiegeEngine { int flag = 0; int npc = 0; - ArrayList players = new ArrayList<>(18); - ArrayList playersInstance = new ArrayList<>(18); + List players = new ArrayList<>(18); + List playersInstance = new ArrayList<>(18); Spawn warrior = null; Spawn flagInstance = null; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java index 1d45f08327..841966c966 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/ScarletVanHalisha.java @@ -21,6 +21,7 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW; import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.gameserver.data.xml.impl.SkillData; @@ -208,7 +209,7 @@ public class ScarletVanHalisha extends AbstractNpcAI private Creature getRandomTarget(Npc npc, Skill skill) { - final ArrayList result = new ArrayList<>(); + final List result = new ArrayList<>(); for (WorldObject obj : World.getInstance().getVisibleObjects(npc, WorldObject.class)) { if (obj.isPlayable() || (obj instanceof DecoyInstance)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java index de96097cd1..6c24a116de 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/FishData.java @@ -111,7 +111,7 @@ public class FishData implements IXmlReader */ public List getFish(int level, int group, int grade) { - final ArrayList result = new ArrayList<>(); + final List result = new ArrayList<>(); Map fish = null; switch (grade) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java index ea8d3b8c8a..2be14671bf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/datatables/SchemeBufferTable.java @@ -68,7 +68,7 @@ public class SchemeBufferTable final int objectId = rs.getInt("object_id"); final String schemeName = rs.getString("scheme_name"); final String[] skills = rs.getString("skills").split(","); - final ArrayList schemeList = new ArrayList<>(); + final List schemeList = new ArrayList<>(); for (String skill : skills) { // Don't feed the skills list if the list is empty. diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentBase.java index 04fff3ee19..9b54696330 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -666,7 +666,7 @@ public abstract class DocumentBase case "clanhall": { final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - final ArrayList array = new ArrayList<>(st.countTokens()); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { final String item = st.nextToken().trim(); @@ -742,7 +742,7 @@ public abstract class DocumentBase case "class_id_restriction": { final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - final ArrayList array = new ArrayList<>(st.countTokens()); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { final String item = st.nextToken().trim(); @@ -760,7 +760,7 @@ public abstract class DocumentBase case "instanceid": { final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - final ArrayList array = new ArrayList<>(st.countTokens()); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { final String item = st.nextToken().trim(); @@ -784,7 +784,7 @@ public abstract class DocumentBase case "haspet": { final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - final ArrayList array = new ArrayList<>(st.countTokens()); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { final String item = st.nextToken().trim(); @@ -796,7 +796,7 @@ public abstract class DocumentBase case "servitornpcid": { final StringTokenizer st = new StringTokenizer(a.getNodeValue(), ","); - final ArrayList array = new ArrayList<>(st.countTokens()); + final List array = new ArrayList<>(st.countTokens()); while (st.hasMoreTokens()) { final String item = st.nextToken().trim(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 26f998e08c..a5bc4f1f71 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index c4d350b8c5..384738cce4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -70,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -346,7 +346,7 @@ public class ItemAuctionInstance public ItemAuction[] getAuctionsByBidder(int bidderObjId) { final Collection auctions = getAuctions(); - final ArrayList stack = new ArrayList<>(auctions.size()); + final List stack = new ArrayList<>(auctions.size()); for (ItemAuction auction : getAuctions()) { if ((auction.getAuctionState() != ItemAuctionState.CREATED) && (auction.getBidFor(bidderObjId) != null)) diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java index f3fd38e5e4..98b62c0c60 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/clientpackets/MultiSellChoose.java @@ -181,7 +181,7 @@ public class MultiSellChoose implements IClientIncomingPacket return; } - final ArrayList ingredientsList = new ArrayList<>(entry.getIngredients().size()); + final List ingredientsList = new ArrayList<>(entry.getIngredients().size()); // Generate a list of distinct ingredients and counts in order to check if the correct item-counts // are possessed by the player boolean newIng; diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 4fcd9944a5..245cf97793 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.model.WorldObject; @@ -58,7 +59,7 @@ public class StatusUpdate implements IClientOutgoingPacket public static final int MAX_CP = 0x22; private final int _objectId; - private final ArrayList _attributes = new ArrayList<>(); + private final List _attributes = new ArrayList<>(); static class Attribute { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerTable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerTable.java index 97f6c4091e..97b0d7d8dd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/GameServerTable.java @@ -29,6 +29,7 @@ import java.sql.ResultSet; import java.sql.Statement; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.logging.Logger; @@ -302,7 +303,7 @@ public class GameServerTable implements IXmlReader private GameServerThread _gst; private int _status; // network - private final ArrayList _addrs = new ArrayList<>(5); + private final List _addrs = new ArrayList<>(5); private int _port; // config private static final boolean IS_PVP = true; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table. diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index 4c2d1f2dde..af17941c61 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -21,6 +21,7 @@ import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_FOLLOW; import static org.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.gameserver.data.xml.impl.SkillData; import org.l2jmobius.gameserver.geoengine.GeoEngine; @@ -212,7 +213,7 @@ public class ScarletVanHalisha extends AbstractNpcAI private Creature getRandomTarget(Npc npc, Skill skill) { - final ArrayList result = new ArrayList<>(); + final List result = new ArrayList<>(); { for (WorldObject obj : npc.getInstanceWorld().getPlayers()) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java index 2b64295571..a00093e6db 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clientstrings/Builder.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.model.clientstrings; import java.util.ArrayList; +import java.util.List; /** * @author Forsaiken, Zoey76 @@ -31,7 +32,7 @@ public abstract class Builder public static Builder newBuilder(String text) { - final ArrayList builders = new ArrayList<>(); + final List builders = new ArrayList<>(); int index1 = 0; int index2 = 0; diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java index 9b9e85a0b3..8b0351112b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemauction/ItemAuctionInstance.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Comparator; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; @@ -69,7 +70,7 @@ public class ItemAuctionInstance private final int _instanceId; private final AtomicInteger _auctionIds; private final Map _auctions; - private final ArrayList _items; + private final List _items; private final AuctionDateGenerator _dateGenerator; private ItemAuction _currentAuction; @@ -593,7 +594,7 @@ public class ItemAuctionInstance return null; } - final ArrayList auctionBids = new ArrayList<>(); + final List auctionBids = new ArrayList<>(); try (PreparedStatement ps = con.prepareStatement(SELECT_PLAYERS_ID_BY_AUCTION_ID)) { ps.setInt(1, auctionId); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java index 09ddc5be86..b836d3f9d1 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/loginserverpackets/game/ServerStatus.java @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.loginserverpackets.game; import java.util.ArrayList; +import java.util.List; import org.l2jmobius.commons.network.BaseSendablePacket; @@ -25,7 +26,7 @@ import org.l2jmobius.commons.network.BaseSendablePacket; */ public class ServerStatus extends BaseSendablePacket { - private final ArrayList _attributes; + private final List _attributes; public static final String[] STATUS_STRING = { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java index 225295914c..3d2c436dcf 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/CronParser.java @@ -29,6 +29,7 @@ import java.io.Reader; import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.List; /** *

@@ -304,7 +305,7 @@ public class CronParser size = line.length(); // Splitting the line - final ArrayList splitted = new ArrayList<>(); + final List splitted = new ArrayList<>(); StringBuilder current = null; boolean quotes = false; for (int i = 0; i < size; i++) @@ -376,9 +377,9 @@ public class CronParser File stdinFile = null; File stdoutFile = null; File stderrFile = null; - final ArrayList envsList = new ArrayList<>(); + final List envsList = new ArrayList<>(); String command = null; - final ArrayList argsList = new ArrayList<>(); + final List argsList = new ArrayList<>(); for (int i = 0; i < size; i++) { final String tk = splitted.get(i); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java index 2d0619ffcb..99250d9a1c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/DayOfMonthValueMatcher.java @@ -18,7 +18,7 @@ */ package org.l2jmobius.gameserver.util.cron4j; -import java.util.ArrayList; +import java.util.List; /** *

@@ -48,7 +48,7 @@ class DayOfMonthValueMatcher extends IntArrayValueMatcher * Builds the ValueMatcher. * @param values An ArrayList of Integer elements, one for every value accepted by the matcher. The match() method will return true only if its parameter will be one of this list or the last-day-of-month setting applies. */ - public DayOfMonthValueMatcher(ArrayList values) + public DayOfMonthValueMatcher(List values) { super(values); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java index b602d5c2f2..237b664827 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/FileTaskCollector.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.List; /** *

@@ -34,7 +35,7 @@ class FileTaskCollector implements TaskCollector /** * File list. */ - private final ArrayList files = new ArrayList<>(); + private final List files = new ArrayList<>(); /** * Adds a file. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java index 6fd472c546..01d063045a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/MemoryTaskCollector.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,17 +38,17 @@ class MemoryTaskCollector implements TaskCollector /** * The inner scheduling pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * The inner task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * IDs for task-pattern couples. */ - private final ArrayList ids = new ArrayList<>(); + private final List ids = new ArrayList<>(); /** * Counts how many task are currently collected by this collector. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java index b9bec8590b..efd112dbda 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/Scheduler.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.io.File; import java.util.ArrayList; +import java.util.List; import java.util.TimeZone; /** @@ -53,7 +54,7 @@ public class Scheduler /** * Registered {@link TaskCollector}s list. */ - private final ArrayList collectors = new ArrayList<>(); + private final List collectors = new ArrayList<>(); /** * The {@link MemoryTaskCollector} used for memory stored tasks. Represented here for convenience, it is also the first element in the {@link Scheduler#collectors} list. @@ -68,7 +69,7 @@ public class Scheduler /** * Registered {@link SchedulerListener}s list. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * The thread checking the clock and requesting the spawning of launcher threads. @@ -78,12 +79,12 @@ public class Scheduler /** * Currently running {@link LauncherThread} instances. */ - private ArrayList launchers = null; + private List launchers = null; /** * Currently running {@link TaskExecutor} instances. */ - private ArrayList executors = null; + private List executors = null; /** * Internal lock, used to synchronize status-aware operations. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java index 4e04b22d1f..939b173821 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/SchedulingPattern.java @@ -21,6 +21,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; import java.util.Calendar; import java.util.GregorianCalendar; +import java.util.List; import java.util.StringTokenizer; import java.util.TimeZone; @@ -165,27 +166,27 @@ public class SchedulingPattern /** * The ValueMatcher list for the "minute" field. */ - protected ArrayList minuteMatchers = new ArrayList<>(); + protected List minuteMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "hour" field. */ - protected ArrayList hourMatchers = new ArrayList<>(); + protected List hourMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of month" field. */ - protected ArrayList dayOfMonthMatchers = new ArrayList<>(); + protected List dayOfMonthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "month" field. */ - protected ArrayList monthMatchers = new ArrayList<>(); + protected List monthMatchers = new ArrayList<>(); /** * The ValueMatcher list for the "day of week" field. */ - protected ArrayList dayOfWeekMatchers = new ArrayList<>(); + protected List dayOfWeekMatchers = new ArrayList<>(); /** * How many matcher groups in this pattern? @@ -270,12 +271,12 @@ public class SchedulingPattern { return new AlwaysTrueValueMatcher(); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); final StringTokenizer st = new StringTokenizer(str, ","); while (st.hasMoreTokens()) { final String element = st.nextToken(); - ArrayList local; + List local; try { local = parseListElement(element, parser); @@ -311,7 +312,7 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseListElement(String str, ValueParser parser) throws Exception + private List parseListElement(String str, ValueParser parser) throws Exception { final StringTokenizer st = new StringTokenizer(str, "/"); final int size = st.countTokens(); @@ -319,7 +320,7 @@ public class SchedulingPattern { throw new Exception("syntax error"); } - ArrayList values; + List values; try { values = parseRange(st.nextToken(), parser); @@ -344,7 +345,7 @@ public class SchedulingPattern { throw new Exception("non positive divisor \"" + div + "\""); } - final ArrayList values2 = new ArrayList<>(); + final List values2 = new ArrayList<>(); for (int i = 0; i < values.size(); i += div) { values2.add(values.get(i)); @@ -361,13 +362,13 @@ public class SchedulingPattern * @return A list of integers representing the allowed values. * @throws Exception If the supplied pattern part is not valid. */ - private ArrayList parseRange(String str, ValueParser parser) throws Exception + private List parseRange(String str, ValueParser parser) throws Exception { if (str.equals("*")) { final int min = parser.getMinValue(); final int max = parser.getMaxValue(); - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); for (int i = min; i <= max; i++) { values.add(i); @@ -392,7 +393,7 @@ public class SchedulingPattern } if (size == 1) { - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); values.add(v1); return values; } @@ -406,7 +407,7 @@ public class SchedulingPattern { throw new Exception("invalid value \"" + v2Str + "\", " + e.getMessage()); } - final ArrayList values = new ArrayList<>(); + final List values = new ArrayList<>(); if (v1 < v2) { for (int i = v1; i <= v2; i++) diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java index 8c34d7eca0..aa8f381807 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/StreamBridge.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.util.ArrayList; +import java.util.List; /** *

@@ -35,7 +36,7 @@ class StreamBridge /** * Used to trace alive instances. */ - static ArrayList traced = new ArrayList<>(); + static List traced = new ArrayList<>(); /** * A self-referece, for inner classes. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java index 9995782abe..83929df78a 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/TaskExecutor.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -64,7 +65,7 @@ public class TaskExecutor /** * A list of {@link TaskExecutorListener} instances. */ - private final ArrayList listeners = new ArrayList<>(); + private final List listeners = new ArrayList<>(); /** * A time stamp reporting the start time of this thread. diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java index 2dc8e44b47..ce97a2244b 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/cron4j/TaskTable.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.util.cron4j; import java.util.ArrayList; +import java.util.List; /** *

@@ -37,12 +38,12 @@ public class TaskTable /** * Pattern list. */ - private final ArrayList patterns = new ArrayList<>(); + private final List patterns = new ArrayList<>(); /** * Task list. */ - private final ArrayList tasks = new ArrayList<>(); + private final List tasks = new ArrayList<>(); /** * Adds a task and an associated scheduling pattern to the table.