From 04aa2fbda701a1ece9c6896387ac01a161905502 Mon Sep 17 00:00:00 2001 From: Victor Alenkov Date: Tue, 16 Oct 2018 21:34:23 -0700 Subject: [PATCH] Reuse the constant for "idea.required.plugins.id" instead of hardcoded string values --- .../src/com/intellij/ide/plugins/PluginManagerCore.java | 3 ++- .../platform-impl/src/com/intellij/idea/IdeaApplication.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java index 7a62874173e6..ac4cf75a21a5 100644 --- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java +++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java @@ -50,6 +50,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import static com.intellij.openapi.application.JetBrainsProtocolHandler.REQUIRED_PLUGINS_KEY; import static com.intellij.util.ObjectUtils.notNull; import static java.util.Collections.singletonList; @@ -134,7 +135,7 @@ public class PluginManagerCore { public static void loadDisabledPlugins(@NotNull String configPath, @NotNull Collection disabledPlugins) { File file = new File(configPath, DISABLED_PLUGINS_FILENAME); if (file.isFile()) { - List requiredPlugins = StringUtil.split(System.getProperty("idea.required.plugins.id", ""), ","); + List requiredPlugins = StringUtil.split(System.getProperty(REQUIRED_PLUGINS_KEY, ""), ","); try { boolean updateDisablePluginsList = false; try (BufferedReader reader = new BufferedReader(new FileReader(file))) { diff --git a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java index ad8037c650f5..2a463f7f012c 100644 --- a/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java +++ b/platform/platform-impl/src/com/intellij/idea/IdeaApplication.java @@ -47,11 +47,13 @@ import java.util.EnumSet; import java.util.List; import java.util.concurrent.ForkJoinPool; +import static com.intellij.openapi.application.JetBrainsProtocolHandler.REQUIRED_PLUGINS_KEY; + public class IdeaApplication { public static final String IDEA_IS_INTERNAL_PROPERTY = "idea.is.internal"; public static final String IDEA_IS_UNIT_TEST = "idea.is.unit.test"; - private static final String[] SAFE_JAVA_ENV_PARAMETERS = {"idea.required.plugins.id"}; + private static final String[] SAFE_JAVA_ENV_PARAMETERS = {REQUIRED_PLUGINS_KEY}; private static final Logger LOG = Logger.getInstance("#com.intellij.idea.IdeaApplication");