From bb7e3b8e1b6524db050752159c1c07c93e675bda Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 8 Sep 2018 22:58:58 +0000 Subject: [PATCH] Replaced concatenations with infix operations. --- .../HarnakUndergroundRuinsZone.java | 4 ++-- .../l2jmobius/tools/accountmanager/SQLAccountManager.java | 8 ++++---- .../HarnakUndergroundRuinsZone.java | 4 ++-- .../l2jmobius/tools/accountmanager/SQLAccountManager.java | 8 ++++---- .../HarnakUndergroundRuinsZone.java | 4 ++-- .../l2jmobius/tools/accountmanager/SQLAccountManager.java | 8 ++++---- .../HarnakUndergroundRuinsZone.java | 4 ++-- .../l2jmobius/tools/accountmanager/SQLAccountManager.java | 8 ++++---- .../l2jmobius/tools/accountmanager/SQLAccountManager.java | 8 ++++---- .../l2jmobius/tools/accountmanager/SQLAccountManager.java | 8 ++++---- .../l2jmobius/tools/accountmanager/SQLAccountManager.java | 8 ++++---- .../l2jmobius/tools/accountmanager/SQLAccountManager.java | 8 ++++---- .../l2jmobius/tools/accountmanager/SQLAccountManager.java | 8 ++++---- 13 files changed, 44 insertions(+), 44 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 8265e5ee42..71233b6823 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -175,7 +175,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.DEMONIC_SYSTEM_WILL_ACTIVATE, ExShowScreenMessage.TOP_CENTER, 3000)); String zoneName = zone.getName().toLowerCase().replace(" ", "_"); _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName))); - _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")), null)); + _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic"), null)); zone.getPlayersInside().forEach(temp -> temp.sendPacket(new ExSendUIEvent(temp, false, false, 600, 0, NpcStringId.DEMONIC_SYSTEM_ACTIVATED))); currentInfo.setZoneStage(7); ThreadPool.schedule(new changeZoneStage(zone), 600000); // 10min @@ -198,7 +198,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI } } String zoneName = zone.getName().toLowerCase().replace(" ", "_"); - _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")))); + _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic"))); _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null)); return; } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java index 4fb705c8b1..bbc5644b83 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java @@ -155,17 +155,17 @@ public class SQLAccountManager String q = "SELECT login, accessLevel FROM accounts "; if (m.equals("1")) { - q = q.concat("WHERE accessLevel < 0"); + q += "WHERE accessLevel < 0"; } else if (m.equals("2")) { - q = q.concat("WHERE accessLevel > 0"); + q += "WHERE accessLevel > 0"; } else if (m.equals("3")) { - q = q.concat("WHERE accessLevel = 0"); + q += "WHERE accessLevel = 0"; } - q = q.concat(" ORDER BY login ASC"); + q += " ORDER BY login ASC"; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(q); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 8265e5ee42..71233b6823 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -175,7 +175,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.DEMONIC_SYSTEM_WILL_ACTIVATE, ExShowScreenMessage.TOP_CENTER, 3000)); String zoneName = zone.getName().toLowerCase().replace(" ", "_"); _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName))); - _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")), null)); + _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic"), null)); zone.getPlayersInside().forEach(temp -> temp.sendPacket(new ExSendUIEvent(temp, false, false, 600, 0, NpcStringId.DEMONIC_SYSTEM_ACTIVATED))); currentInfo.setZoneStage(7); ThreadPool.schedule(new changeZoneStage(zone), 600000); // 10min @@ -198,7 +198,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI } } String zoneName = zone.getName().toLowerCase().replace(" ", "_"); - _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")))); + _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic"))); _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null)); return; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java index 4fb705c8b1..bbc5644b83 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java @@ -155,17 +155,17 @@ public class SQLAccountManager String q = "SELECT login, accessLevel FROM accounts "; if (m.equals("1")) { - q = q.concat("WHERE accessLevel < 0"); + q += "WHERE accessLevel < 0"; } else if (m.equals("2")) { - q = q.concat("WHERE accessLevel > 0"); + q += "WHERE accessLevel > 0"; } else if (m.equals("3")) { - q = q.concat("WHERE accessLevel = 0"); + q += "WHERE accessLevel = 0"; } - q = q.concat(" ORDER BY login ASC"); + q += " ORDER BY login ASC"; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(q); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 8265e5ee42..71233b6823 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -175,7 +175,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.DEMONIC_SYSTEM_WILL_ACTIVATE, ExShowScreenMessage.TOP_CENTER, 3000)); String zoneName = zone.getName().toLowerCase().replace(" ", "_"); _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName))); - _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")), null)); + _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic"), null)); zone.getPlayersInside().forEach(temp -> temp.sendPacket(new ExSendUIEvent(temp, false, false, 600, 0, NpcStringId.DEMONIC_SYSTEM_ACTIVATED))); currentInfo.setZoneStage(7); ThreadPool.schedule(new changeZoneStage(zone), 600000); // 10min @@ -198,7 +198,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI } } String zoneName = zone.getName().toLowerCase().replace(" ", "_"); - _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")))); + _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic"))); _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null)); return; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java index 4fb705c8b1..bbc5644b83 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java @@ -155,17 +155,17 @@ public class SQLAccountManager String q = "SELECT login, accessLevel FROM accounts "; if (m.equals("1")) { - q = q.concat("WHERE accessLevel < 0"); + q += "WHERE accessLevel < 0"; } else if (m.equals("2")) { - q = q.concat("WHERE accessLevel > 0"); + q += "WHERE accessLevel > 0"; } else if (m.equals("3")) { - q = q.concat("WHERE accessLevel = 0"); + q += "WHERE accessLevel = 0"; } - q = q.concat(" ORDER BY login ASC"); + q += " ORDER BY login ASC"; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(q); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java index 8265e5ee42..71233b6823 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/areas/TalkingIsland/HarnakUndergroundRuinsZone/HarnakUndergroundRuinsZone.java @@ -175,7 +175,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI zone.broadcastPacket(new ExShowScreenMessage(NpcStringId.DEMONIC_SYSTEM_WILL_ACTIVATE, ExShowScreenMessage.TOP_CENTER, 3000)); String zoneName = zone.getName().toLowerCase().replace(" ", "_"); _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName))); - _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")), null)); + _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic"), null)); zone.getPlayersInside().forEach(temp -> temp.sendPacket(new ExSendUIEvent(temp, false, false, 600, 0, NpcStringId.DEMONIC_SYSTEM_ACTIVATED))); currentInfo.setZoneStage(7); ThreadPool.schedule(new changeZoneStage(zone), 600000); // 10min @@ -198,7 +198,7 @@ public class HarnakUndergroundRuinsZone extends AbstractNpcAI } } String zoneName = zone.getName().toLowerCase().replace(" ", "_"); - _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName.concat("_demonic")))); + _templates.stream().forEach(t -> t.despawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName + "_demonic"))); _templates.stream().forEach(t -> t.spawn(g -> String.valueOf(g.getName()).equalsIgnoreCase(zoneName), null)); return; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java index 4fb705c8b1..bbc5644b83 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java @@ -155,17 +155,17 @@ public class SQLAccountManager String q = "SELECT login, accessLevel FROM accounts "; if (m.equals("1")) { - q = q.concat("WHERE accessLevel < 0"); + q += "WHERE accessLevel < 0"; } else if (m.equals("2")) { - q = q.concat("WHERE accessLevel > 0"); + q += "WHERE accessLevel > 0"; } else if (m.equals("3")) { - q = q.concat("WHERE accessLevel = 0"); + q += "WHERE accessLevel = 0"; } - q = q.concat(" ORDER BY login ASC"); + q += " ORDER BY login ASC"; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(q); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java index e08998a69e..7026ec23ca 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java @@ -167,17 +167,17 @@ public class SQLAccountManager String q = "SELECT login, accessLevel FROM accounts "; if (m.equals("1")) { - q = q.concat("WHERE accessLevel < 0"); + q += "WHERE accessLevel < 0"; } else if (m.equals("2")) { - q = q.concat("WHERE accessLevel > 0"); + q += "WHERE accessLevel > 0"; } else if (m.equals("3")) { - q = q.concat("WHERE accessLevel = 0"); + q += "WHERE accessLevel = 0"; } - q = q.concat(" ORDER BY login ASC"); + q += " ORDER BY login ASC"; PreparedStatement statement = con.prepareStatement(q); ResultSet rset = statement.executeQuery(); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java index 4fb705c8b1..bbc5644b83 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java @@ -155,17 +155,17 @@ public class SQLAccountManager String q = "SELECT login, accessLevel FROM accounts "; if (m.equals("1")) { - q = q.concat("WHERE accessLevel < 0"); + q += "WHERE accessLevel < 0"; } else if (m.equals("2")) { - q = q.concat("WHERE accessLevel > 0"); + q += "WHERE accessLevel > 0"; } else if (m.equals("3")) { - q = q.concat("WHERE accessLevel = 0"); + q += "WHERE accessLevel = 0"; } - q = q.concat(" ORDER BY login ASC"); + q += " ORDER BY login ASC"; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(q); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java index 4fb705c8b1..bbc5644b83 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java @@ -155,17 +155,17 @@ public class SQLAccountManager String q = "SELECT login, accessLevel FROM accounts "; if (m.equals("1")) { - q = q.concat("WHERE accessLevel < 0"); + q += "WHERE accessLevel < 0"; } else if (m.equals("2")) { - q = q.concat("WHERE accessLevel > 0"); + q += "WHERE accessLevel > 0"; } else if (m.equals("3")) { - q = q.concat("WHERE accessLevel = 0"); + q += "WHERE accessLevel = 0"; } - q = q.concat(" ORDER BY login ASC"); + q += " ORDER BY login ASC"; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(q); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java index 4fb705c8b1..bbc5644b83 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java @@ -155,17 +155,17 @@ public class SQLAccountManager String q = "SELECT login, accessLevel FROM accounts "; if (m.equals("1")) { - q = q.concat("WHERE accessLevel < 0"); + q += "WHERE accessLevel < 0"; } else if (m.equals("2")) { - q = q.concat("WHERE accessLevel > 0"); + q += "WHERE accessLevel > 0"; } else if (m.equals("3")) { - q = q.concat("WHERE accessLevel = 0"); + q += "WHERE accessLevel = 0"; } - q = q.concat(" ORDER BY login ASC"); + q += " ORDER BY login ASC"; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(q); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java index 4fb705c8b1..bbc5644b83 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java @@ -155,17 +155,17 @@ public class SQLAccountManager String q = "SELECT login, accessLevel FROM accounts "; if (m.equals("1")) { - q = q.concat("WHERE accessLevel < 0"); + q += "WHERE accessLevel < 0"; } else if (m.equals("2")) { - q = q.concat("WHERE accessLevel > 0"); + q += "WHERE accessLevel > 0"; } else if (m.equals("3")) { - q = q.concat("WHERE accessLevel = 0"); + q += "WHERE accessLevel = 0"; } - q = q.concat(" ORDER BY login ASC"); + q += " ORDER BY login ASC"; try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(q);