From ad61522e895e0e75b0ff57e33eca5731267d558c Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Thu, 3 Jan 2019 14:04:26 +0200 Subject: [PATCH] Flipped equals statements with string literals --- .../plan/command/commands/manage/ManageImportCommand.java | 2 +- .../java/com/djrapitops/plan/system/locale/LocaleSystem.java | 2 +- .../java/com/djrapitops/plan/system/webserver/WebServer.java | 2 +- .../response/pages/parts/InspectPagePluginsContent.java | 2 +- .../plan/utilities/formatting/time/DateFormatter.java | 2 +- .../com/djrapitops/plan/utilities/html/pages/InspectPage.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java index 5f654f958..73dbb7131 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/command/commands/manage/ManageImportCommand.java @@ -71,7 +71,7 @@ public class ManageImportCommand extends CommandNode { String importArg = args[0]; - if (importArg.equals("list")) { + if ("list".equals(importArg)) { sender.sendMessage(locale.getString(ManageLang.IMPORTERS)); importSystem.getImporterNames().forEach(name -> sender.sendMessage("- " + name)); return; diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleSystem.java b/Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleSystem.java index c28ab7681..075b74825 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleSystem.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/locale/LocaleSystem.java @@ -131,7 +131,7 @@ public class LocaleSystem implements SubSystem { private Optional loadSettingLocale() { try { String setting = config.get(PluginSettings.LOCALE); - if (!setting.equalsIgnoreCase("default")) { + if (!"default".equalsIgnoreCase(setting)) { return Optional.of(Locale.forLangCodeString(plugin, setting)); } } catch (IOException e) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java index 10c65c8b8..649fbe9ce 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/WebServer.java @@ -159,7 +159,7 @@ public class WebServer implements SubSystem { private boolean startHttpsServer() { String keyStorePath = config.get(WebserverSettings.CERTIFICATE_PATH); - if (keyStorePath.equalsIgnoreCase("proxy")) { + if ("proxy".equalsIgnoreCase(keyStorePath)) { return true; } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/pages/parts/InspectPagePluginsContent.java b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/pages/parts/InspectPagePluginsContent.java index e27ad82bf..a28fc5236 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/pages/parts/InspectPagePluginsContent.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/system/webserver/response/pages/parts/InspectPagePluginsContent.java @@ -51,7 +51,7 @@ public class InspectPagePluginsContent extends PageResponse { public static InspectPagePluginsContent generateForThisServer(UUID playerUUID, ServerInfo serverInfo, HookHandler hookHandler) { String serverName = serverInfo.getServer().getName(); - String actualServerName = serverName.equals("Plan") ? "Server " + serverInfo.getServer().getId() : serverName; + String actualServerName = "Plan".equals(serverName) ? "Server " + serverInfo.getServer().getId() : serverName; Map containers = hookHandler.getInspectContainersFor(playerUUID); if (containers.isEmpty()) { diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DateFormatter.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DateFormatter.java index 6d09d127d..6bf1e03fd 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DateFormatter.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/formatting/time/DateFormatter.java @@ -49,7 +49,7 @@ public abstract class DateFormatter implements Formatter { protected String format(long epochMs, String format) { boolean useServerTime = config.isTrue(TimeSettings.USE_SERVER_TIME); String localeSetting = config.get(PluginSettings.LOCALE); - java.util.Locale usedLocale = localeSetting.equalsIgnoreCase("default") + java.util.Locale usedLocale = "default".equalsIgnoreCase(localeSetting) ? java.util.Locale.ENGLISH : java.util.Locale.forLanguageTag(localeSetting); SimpleDateFormat dateFormat = new SimpleDateFormat(format, usedLocale); diff --git a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java index f40c02eca..72e434d39 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/utilities/html/pages/InspectPage.java @@ -247,7 +247,7 @@ public class InspectPage implements Page { String serverName = serverNames.get(serverUUID); replacer.put("networkName", - serverName.equalsIgnoreCase("bungeecord") + "bungeecord".equalsIgnoreCase(serverName) ? config.get(ProxySettings.NETWORK_NAME) : serverName );