From cdf75b460bcc91e4d5d3d6f4395ea6aab22238ce Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 9 Mar 2011 18:47:09 +0300 Subject: [PATCH] IDEA-66336 Settings dialog will not open (use implementation class name as @NotNull default for getId() for settings component) --- .../vcs/configurable/VcsManagerConfigurable.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java index afc60fca0624..f4ecbb306b61 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java @@ -97,7 +97,13 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra @NotNull public String getId() { - return getClass().getName(); + return getDefaultConfigurableIdValue(this); + } + + @NotNull + private static String getDefaultConfigurableIdValue(final Configurable configurable) { + final String helpTopic = configurable.getHelpTopic(); + return helpTopic == null ? configurable.getClass().getName() : helpTopic; } protected Configurable[] buildConfigurables() { @@ -214,7 +220,7 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra @NotNull public String getId() { - return delegate instanceof SearchableConfigurable ? ((SearchableConfigurable) delegate).getId() : getHelpTopic(); + return delegate instanceof SearchableConfigurable ? ((SearchableConfigurable) delegate).getId() : getDefaultConfigurableIdValue(this); } public Runnable enableSearch(String option) {