From aa1d2b82f361a9fccd4257be2f446f423d4e20a9 Mon Sep 17 00:00:00 2001 From: Andrey Vokin Date: Fri, 29 Jul 2016 11:30:13 +0200 Subject: [PATCH] Use help id from ServerType when there is no any other ServerTypes. RUBY-18227 Map help button of the Heroku settings dialog --- .../impl/configuration/RemoteServerListConfigurable.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/RemoteServerListConfigurable.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/RemoteServerListConfigurable.java index 4de021a4fba1..efb9be5413eb 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/RemoteServerListConfigurable.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/configuration/RemoteServerListConfigurable.java @@ -190,7 +190,14 @@ public class RemoteServerListConfigurable extends MasterDetailsComponent impleme @Override public String getHelpTopic() { - return ObjectUtils.notNull(super.getHelpTopic(), "reference.settings.clouds"); + String result = super.getHelpTopic(); + if (result == null) { + ServerType singleServerType = getSingleServerType(); + if (singleServerType != null) { + return singleServerType.getHelpTopic(); + } + } + return "reference.settings.clouds"; } @Override