From d33bfa17b2b3c81d765bd2098eb67c205288a3f8 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 9 Sep 2018 19:05:28 +0000 Subject: [PATCH] Replaced indexOf() with contains() method. --- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../java/com/l2jmobius/gameserver/SevenSignsFestival.java | 2 +- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- .../java/com/l2jmobius/commons/database/DatabaseBackup.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/database/DatabaseBackup.java index 4d08f41445..be0d99d96e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -69,7 +69,7 @@ public class DatabaseBackup } // Dump to file. - final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; + final String mysqldumpPath = System.getProperty("os.name").toLowerCase().contains("win") ? Config.MYSQL_BIN_PATH : ""; try { final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/database/DatabaseBackup.java index 4d08f41445..be0d99d96e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -69,7 +69,7 @@ public class DatabaseBackup } // Dump to file. - final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; + final String mysqldumpPath = System.getProperty("os.name").toLowerCase().contains("win") ? Config.MYSQL_BIN_PATH : ""; try { final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/database/DatabaseBackup.java index 4d08f41445..be0d99d96e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -69,7 +69,7 @@ public class DatabaseBackup } // Dump to file. - final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; + final String mysqldumpPath = System.getProperty("os.name").toLowerCase().contains("win") ? Config.MYSQL_BIN_PATH : ""; try { final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/database/DatabaseBackup.java index 4d08f41445..be0d99d96e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -69,7 +69,7 @@ public class DatabaseBackup } // Dump to file. - final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; + final String mysqldumpPath = System.getProperty("os.name").toLowerCase().contains("win") ? Config.MYSQL_BIN_PATH : ""; try { final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/database/DatabaseBackup.java index 4d08f41445..be0d99d96e 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -69,7 +69,7 @@ public class DatabaseBackup } // Dump to file. - final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; + final String mysqldumpPath = System.getProperty("os.name").toLowerCase().contains("win") ? Config.MYSQL_BIN_PATH : ""; try { final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseBackup.java index 4d08f41445..be0d99d96e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -69,7 +69,7 @@ public class DatabaseBackup } // Dump to file. - final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; + final String mysqldumpPath = System.getProperty("os.name").toLowerCase().contains("win") ? Config.MYSQL_BIN_PATH : ""; try { final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java index dfcbb6ea33..f70537bc6b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/SevenSignsFestival.java @@ -1669,7 +1669,7 @@ public class SevenSignsFestival implements SpawnListener { for (StatsSet festivalData : festivalDataMap.values()) { - if (festivalData.getString("members").indexOf(playerName) > -1) + if (festivalData.getString("members").contains(playerName)) { final int festivalId = festivalData.getInt("festivalId"); final int numPartyMembers = festivalData.getString("members").split(",").length; diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/database/DatabaseBackup.java index 4d08f41445..be0d99d96e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -69,7 +69,7 @@ public class DatabaseBackup } // Dump to file. - final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; + final String mysqldumpPath = System.getProperty("os.name").toLowerCase().contains("win") ? Config.MYSQL_BIN_PATH : ""; try { final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/database/DatabaseBackup.java index 4d08f41445..be0d99d96e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -69,7 +69,7 @@ public class DatabaseBackup } // Dump to file. - final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; + final String mysqldumpPath = System.getProperty("os.name").toLowerCase().contains("win") ? Config.MYSQL_BIN_PATH : ""; try { final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date())); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/database/DatabaseBackup.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/database/DatabaseBackup.java index 4d08f41445..be0d99d96e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/database/DatabaseBackup.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/commons/database/DatabaseBackup.java @@ -69,7 +69,7 @@ public class DatabaseBackup } // Dump to file. - final String mysqldumpPath = System.getProperty("os.name").toLowerCase().indexOf("win") >= 0 ? Config.MYSQL_BIN_PATH : ""; + final String mysqldumpPath = System.getProperty("os.name").toLowerCase().contains("win") ? Config.MYSQL_BIN_PATH : ""; try { final Process process = Runtime.getRuntime().exec(mysqldumpPath + "mysqldump -u " + Config.DATABASE_LOGIN + (Config.DATABASE_PASSWORD.trim().isEmpty() ? "" : " -p" + Config.DATABASE_PASSWORD) + " " + Config.DATABASE_URL.replace("jdbc:mariadb://", "").replaceAll(".*\\/|\\?.*", "") + " -r " + Config.BACKUP_PATH + (Server.serverMode == Server.MODE_GAMESERVER ? "game" : "login") + new SimpleDateFormat("_yyyy_MM_dd_HH_mm'.sql'").format(new Date()));