From b012e2ed0b4fa29b6aebf8b465deaaa965b9dd6c Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 25 May 2021 17:02:40 +0300 Subject: [PATCH] IDEA-268436 No longer possible to set temporary configurations limit moved to Advanced Settings GitOrigin-RevId: 59d61b7f52644e5ad4b21f0afe294434aa1fc8d1 --- .../src/com/intellij/execution/RunManagerConfig.java | 8 ++++---- .../resources/messages/ExecutionBundle.properties | 1 - .../resources/messages/ApplicationBundle.properties | 1 + .../src/META-INF/PlatformExtensions.xml | 1 + platform/util/resources/misc/registry.properties | 2 -- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/platform/execution-impl/src/com/intellij/execution/RunManagerConfig.java b/platform/execution-impl/src/com/intellij/execution/RunManagerConfig.java index 975da364b5b9..58172412d11b 100644 --- a/platform/execution-impl/src/com/intellij/execution/RunManagerConfig.java +++ b/platform/execution-impl/src/com/intellij/execution/RunManagerConfig.java @@ -2,7 +2,7 @@ package com.intellij.execution; import com.intellij.ide.util.PropertiesComponent; -import com.intellij.openapi.util.registry.Registry; +import com.intellij.openapi.options.advanced.AdvancedSettings; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -18,18 +18,18 @@ public final class RunManagerConfig { @NonNls private static final String DELETION_FROM_POPUP_REQUIRES_CONFIRMATION = "deletionFromPopupRequiresConfirmation"; @NonNls private static final String STOP_INCOMPATIBLE_REQUIRES_CONFIRMATION = "stopIncompatibleRequiresConfirmation"; - @NonNls private static final String RECENTS_LIMIT_REGISTRY_KEY = "temporary.configurations.limit"; + @NonNls private static final String RECENTS_LIMIT_KEY = "temporary.configurations.limit"; public RunManagerConfig(@NotNull PropertiesComponent propertiesComponent) { myPropertiesComponent = propertiesComponent; } public int getRecentsLimit() { - return Math.max(MIN_RECENT_LIMIT, Registry.get(RECENTS_LIMIT_REGISTRY_KEY).asInteger()); + return AdvancedSettings.getInt(RECENTS_LIMIT_KEY); } public void setRecentsLimit(int recentsLimit) { - Registry.get(RECENTS_LIMIT_REGISTRY_KEY).setValue(recentsLimit); + AdvancedSettings.setInt(RECENTS_LIMIT_KEY, recentsLimit); } public void migrateToRegistry() { diff --git a/platform/lang-api/resources/messages/ExecutionBundle.properties b/platform/lang-api/resources/messages/ExecutionBundle.properties index 5d04f8356f12..f2ef1d48b106 100644 --- a/platform/lang-api/resources/messages/ExecutionBundle.properties +++ b/platform/lang-api/resources/messages/ExecutionBundle.properties @@ -175,7 +175,6 @@ rerun.singleton.confirmation.message=''{0}'' is not allowed to run in parallel.\ rerun.confirmation.button.text=Stop and Rerun rerun.confirmation.checkbox=Confirm rerun with process termination popup.deletion.confirmation=Confirm deletion from Run/Debug popup -temporary.configurations.limit=Temporary configurations limit: stop.incompatible.confirmation.message=''{0}'' run configuration is not compatible with {2, choice, 1#currently running {1} configuration.|2#following running configurations:\n{1}}\nAre you sure you want to stop {2, choice, 1#incompatible running instance|2#{2, number} incompatible running instances}? stop.incompatible.confirmation.button.text=Stop incompatible run.configuration.dump.threads.action.name=Dump Threads diff --git a/platform/platform-api/resources/messages/ApplicationBundle.properties b/platform/platform-api/resources/messages/ApplicationBundle.properties index 8ddada0a8808..728181600f79 100644 --- a/platform/platform-api/resources/messages/ApplicationBundle.properties +++ b/platform/platform-api/resources/messages/ApplicationBundle.properties @@ -786,6 +786,7 @@ button.advanced.settings.reset=Reset Setting advanced.setting.ide.show.fileType.icon.in.titleBar=Show file type icon in IDE frame header advanced.setting.ide.show.fileType.icon.in.titleBar.description=On macOS the icon can be used to drag the file to a different application advanced.setting.ide.max.recent.projects=Maximum number of recent projects +advanced.setting.temporary.configurations.limit=Temporary Run/Debug configurations limit advanced.setting.localHistory.daysToKeep=Duration of storing changes in local history advanced.setting.localHistory.daysToKeep.description=WARNING: Do not use local history as the primary version control system since it may become corrupted if the IDE hangs. advanced.setting.localHistory.daysToKeep.trailingLabel=days diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index 67f60a039101..397e7e7545c3 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -1223,6 +1223,7 @@ + diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 5ac0280c8418..8107f5c69d52 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -1418,8 +1418,6 @@ ide.new.run.config=true ide.new.run.config.description=New Run Configuration UI ide.new.run.config.junit=true ide.new.run.config.junit.description=New JUnit Configuration UI -temporary.configurations.limit=5 -temporary.configurations.limit.description=Temporary configurations limit select.run.configuration.from.context=true select.run.configuration.from.context.description=Select run configuration when run from context (gutter icon, popup menu)