From d10bb6985397d4388439f9cfd8763d45a871d002 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Thu, 4 Sep 2014 14:18:06 +0400 Subject: [PATCH] Rename isConfigurableProvided to canCreateConfigurable and remove duplicated code in several createConfigurable methods --- .../openapi/roots/ui/configuration/ModuleEditor.java | 2 +- .../src/com/intellij/openapi/options/ConfigurableEP.java | 6 +++--- .../com/intellij/openapi/options/ConfigurableProvider.java | 2 +- .../intellij/openapi/options/SearchableConfigurable.java | 2 +- .../openapi/options/ex/ConfigurableExtensionPointUtil.java | 2 +- .../intellij/openapi/options/ex/ConfigurableWrapper.java | 2 +- .../vcs/configurable/VcsManagerConfigurableProvider.java | 2 +- .../impl/settings/DebuggerConfigurableProvider.java | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java index b3de63ee0f7b..a10265607029 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModuleEditor.java @@ -206,7 +206,7 @@ public abstract class ModuleEditor implements Place.Navigator, Disposable { myEditors.add(new ModuleConfigurableWrapper(moduleConfigurable)); } for(ModuleConfigurableEP extension : myModule.getExtensions(MODULE_CONFIGURABLES)) { - if (extension.isConfigurableProvided()) { + if (extension.canCreateConfigurable()) { myEditors.add(new ModuleConfigurableWrapper(extension.createConfigurable())); } } diff --git a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java index 3f9bc9d241f2..828907c13cfb 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java +++ b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableEP.java @@ -175,13 +175,13 @@ public class ConfigurableEP extends AbstractExten return getDisplayName(); } - public boolean isConfigurableProvided() { + public boolean canCreateConfigurable() { if (providerClass == null) { return implementationClass != null || instanceClass != null; } try { ConfigurableProvider provider = instantiate(providerClass, myPicoContainer); - return provider.isConfigurableProvided(); // do not load heavy configurables + return provider.canCreateConfigurable(); // do not load heavy configurables } catch (Exception ignored) { return true; // see InstanceFromProviderFactory#compute @@ -191,7 +191,7 @@ public class ConfigurableEP extends AbstractExten private class InstanceFromProviderFactory extends AtomicNotNullLazyValue implements NullableFactory { public T create() { ConfigurableProvider provider = getValue(); - return provider.isConfigurableProvided() + return provider.canCreateConfigurable() ? (T)provider.createConfigurable() : null; } diff --git a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableProvider.java b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableProvider.java index f0389cf83649..cf2bc0390c5a 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/ConfigurableProvider.java +++ b/platform/platform-api/src/com/intellij/openapi/options/ConfigurableProvider.java @@ -37,7 +37,7 @@ public abstract class ConfigurableProvider { * @return {@code true} if this provider creates configurable, * {@code false} otherwise */ - public boolean isConfigurableProvided() { + public boolean canCreateConfigurable() { return true; } } diff --git a/platform/platform-api/src/com/intellij/openapi/options/SearchableConfigurable.java b/platform/platform-api/src/com/intellij/openapi/options/SearchableConfigurable.java index 4f1d0dd4eaf9..b426e35d77a8 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/SearchableConfigurable.java +++ b/platform/platform-api/src/com/intellij/openapi/options/SearchableConfigurable.java @@ -36,7 +36,7 @@ public interface SearchableConfigurable extends Configurable { boolean hasOwnContent(); /** - * @deprecated use {@link ConfigurableProvider#isConfigurableProvided()} instead + * @deprecated use {@link ConfigurableProvider#canCreateConfigurable()} instead * to specify configurables which should not be visible */ @Deprecated diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java index 2aebbbbbeab1..2ead77c297e5 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ConfigurableExtensionPointUtil.java @@ -164,7 +164,7 @@ public class ConfigurableExtensionPointUtil { @NotNull private static T findConfigurable(ConfigurableEP[] extensions, Class configurableClass) { for (ConfigurableEP extension : extensions) { - if (extension.isConfigurableProvided()) { + if (extension.canCreateConfigurable()) { final Configurable configurable = extension.createConfigurable(); if (configurableClass.isInstance(configurable)) { return configurableClass.cast(configurable); 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 cca07555054b..83960e742ed1 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 @@ -47,7 +47,7 @@ public class ConfigurableWrapper implements SearchableConfigurable { @Nullable public static T wrapConfigurable(ConfigurableEP ep) { - if (!ep.isConfigurableProvided()) { + if (!ep.canCreateConfigurable()) { return null; } if (ep.displayName != null || ep.key != null || ep.groupId != null) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurableProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurableProvider.java index 3536139be64d..0ff9ef6c96d6 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurableProvider.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurableProvider.java @@ -35,7 +35,7 @@ public final class VcsManagerConfigurableProvider extends ConfigurableProvider { } @Override - public boolean isConfigurableProvided() { + public boolean canCreateConfigurable() { return ProjectLevelVcsManager.getInstance(myProject).getAllVcss().length > 0; } } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurableProvider.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurableProvider.java index cd0f0dccb1af..bb747f92eab7 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurableProvider.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurableProvider.java @@ -28,7 +28,7 @@ public final class DebuggerConfigurableProvider extends ConfigurableProvider { } @Override - public boolean isConfigurableProvided() { + public boolean canCreateConfigurable() { return XBreakpointType.EXTENSION_POINT_NAME.getExtensions().length != 0; } }