From 4faee01be547c7241726f8ab9a54f7560b21216c Mon Sep 17 00:00:00 2001 From: filoghost Date: Sat, 15 Aug 2020 20:37:29 +0200 Subject: [PATCH] Rename classes --- .../me/filoghost/chestcommands/legacy/UpgradeList.java | 8 ++++---- ...UpgradeTask.java => v4_0_MenuReformatUpgradeTask.java} | 4 ++-- ...UpgradeTask.java => v4_0_PlaceholdersUpgradeTask.java} | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) rename plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/{v4_0_MenuNodeReformatUpgradeTask.java => v4_0_MenuReformatUpgradeTask.java} (96%) rename plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/{v4_0_PlaceholdersFileUpgradeTask.java => v4_0_PlaceholdersUpgradeTask.java} (95%) diff --git a/plugin/src/main/java/me/filoghost/chestcommands/legacy/UpgradeList.java b/plugin/src/main/java/me/filoghost/chestcommands/legacy/UpgradeList.java index 49cf1ba..d3c4f4a 100644 --- a/plugin/src/main/java/me/filoghost/chestcommands/legacy/UpgradeList.java +++ b/plugin/src/main/java/me/filoghost/chestcommands/legacy/UpgradeList.java @@ -11,9 +11,9 @@ import me.filoghost.chestcommands.legacy.upgrade.Upgrade; import me.filoghost.chestcommands.legacy.upgrade.UpgradeTask; import me.filoghost.chestcommands.legacy.upgrade.UpgradeTaskException; import me.filoghost.chestcommands.legacy.v4_0.v4_0_LangUpgradeTask; -import me.filoghost.chestcommands.legacy.v4_0.v4_0_MenuNodeReformatUpgradeTask; import me.filoghost.chestcommands.legacy.v4_0.v4_0_MenuNodeRenameUpgradeTask; -import me.filoghost.chestcommands.legacy.v4_0.v4_0_PlaceholdersFileUpgradeTask; +import me.filoghost.chestcommands.legacy.v4_0.v4_0_MenuReformatUpgradeTask; +import me.filoghost.chestcommands.legacy.v4_0.v4_0_PlaceholdersUpgradeTask; import me.filoghost.chestcommands.legacy.v4_0.v4_0_SettingsUpgradeTask; import me.filoghost.chestcommands.logging.Errors; import me.filoghost.commons.collection.CollectionUtils; @@ -40,12 +40,12 @@ public class UpgradeList { multiTaskUpgrade("v4.0-menus-reformat", (configManager) -> { String legacyCommandSeparator = readLegacyCommandSeparator(configManager); return createMenuTasks(configManager, - file -> new v4_0_MenuNodeReformatUpgradeTask(configManager, file, legacyCommandSeparator)); + file -> new v4_0_MenuReformatUpgradeTask(configManager, file, legacyCommandSeparator)); }), // Upgrade config after reading the command separator for menus singleTaskUpgrade("v4.0-config", v4_0_SettingsUpgradeTask::new), - singleTaskUpgrade("v4.0-placeholders", v4_0_PlaceholdersFileUpgradeTask::new), + singleTaskUpgrade("v4.0-placeholders", v4_0_PlaceholdersUpgradeTask::new), singleTaskUpgrade("v4.0-lang", v4_0_LangUpgradeTask::new) ); diff --git a/plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/v4_0_MenuNodeReformatUpgradeTask.java b/plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/v4_0_MenuReformatUpgradeTask.java similarity index 96% rename from plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/v4_0_MenuNodeReformatUpgradeTask.java rename to plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/v4_0_MenuReformatUpgradeTask.java index fbd2ffe..b92b84d 100644 --- a/plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/v4_0_MenuNodeReformatUpgradeTask.java +++ b/plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/v4_0_MenuReformatUpgradeTask.java @@ -20,11 +20,11 @@ import java.util.Collections; import java.util.List; import java.util.regex.Pattern; -public class v4_0_MenuNodeReformatUpgradeTask extends YamlUpgradeTask { +public class v4_0_MenuReformatUpgradeTask extends YamlUpgradeTask { private final String legacyCommandSeparator; - public v4_0_MenuNodeReformatUpgradeTask(ConfigManager configManager, Path menuFile, String legacyCommandSeparator) { + public v4_0_MenuReformatUpgradeTask(ConfigManager configManager, Path menuFile, String legacyCommandSeparator) { super(configManager.getConfigLoader(menuFile)); this.legacyCommandSeparator = legacyCommandSeparator; } diff --git a/plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/v4_0_PlaceholdersFileUpgradeTask.java b/plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/v4_0_PlaceholdersUpgradeTask.java similarity index 95% rename from plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/v4_0_PlaceholdersFileUpgradeTask.java rename to plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/v4_0_PlaceholdersUpgradeTask.java index dd16d14..67d0fa3 100644 --- a/plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/v4_0_PlaceholdersFileUpgradeTask.java +++ b/plugin/src/main/java/me/filoghost/chestcommands/legacy/v4_0/v4_0_PlaceholdersUpgradeTask.java @@ -20,13 +20,13 @@ import java.nio.file.Files; import java.nio.file.Path; import java.util.List; -public class v4_0_PlaceholdersFileUpgradeTask extends UpgradeTask { +public class v4_0_PlaceholdersUpgradeTask extends UpgradeTask { private final Path oldPlaceholdersFile; private final ConfigLoader newPlaceholdersConfigLoader; private Config updatedConfig; - public v4_0_PlaceholdersFileUpgradeTask(ConfigManager configManager) { + public v4_0_PlaceholdersUpgradeTask(ConfigManager configManager) { this.oldPlaceholdersFile = configManager.getRootDataFolder().resolve("placeholders.yml"); this.newPlaceholdersConfigLoader = configManager.getConfigLoader("custom-placeholders.yml"); }