From ef0fbcb505b9b7ea5810c27f656fefbf115bd039 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 2 Dec 2014 20:04:08 +0300 Subject: [PATCH] Add logging to ConfigurableWrapper --- .../options/ex/ConfigurableWrapper.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java index a70fc39ae6a3..c7f4b60c7560 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableWrapper.java @@ -135,9 +135,14 @@ public class ConfigurableWrapper implements SearchableConfigurable { @Override public String getDisplayName() { if (myEp.displayName == null && myEp.key == null) { - UnnamedConfigurable configurable = getConfigurable(); - if (configurable instanceof Configurable) { - return ((Configurable)configurable).getDisplayName(); + boolean loaded = myConfigurable != null; + Configurable configurable = cast(Configurable.class, this); + if (configurable != null) { + String name = configurable.getDisplayName(); + if (!loaded) { + LOG.warn("configurable loaded for its name: " + name); + } + return name; } } return myEp.getDisplayName(); @@ -189,9 +194,14 @@ public class ConfigurableWrapper implements SearchableConfigurable { if (myEp.id != null) { return myEp.id; } + boolean loaded = myConfigurable != null; SearchableConfigurable configurable = cast(SearchableConfigurable.class, this); if (configurable != null) { - return configurable.getId(); + String id = configurable.getId(); + if (!loaded) { + LOG.warn("configurable loaded for its id: " + id); + } + return id; } return myEp.instanceClass != null ? myEp.instanceClass