Rename isConfigurableProvided to canCreateConfigurable and remove duplicated code in several createConfigurable methods

This commit is contained in:
Sergey Malenkov
2014-09-04 14:20:36 +04:00
parent 998397403a
commit d10bb69853
8 changed files with 10 additions and 10 deletions
@@ -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()));
}
}
@@ -175,13 +175,13 @@ public class ConfigurableEP<T extends UnnamedConfigurable> 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<T extends UnnamedConfigurable> extends AbstractExten
private class InstanceFromProviderFactory extends AtomicNotNullLazyValue<ConfigurableProvider> implements NullableFactory<T> {
public T create() {
ConfigurableProvider provider = getValue();
return provider.isConfigurableProvided()
return provider.canCreateConfigurable()
? (T)provider.createConfigurable()
: null;
}
@@ -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;
}
}
@@ -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
@@ -164,7 +164,7 @@ public class ConfigurableExtensionPointUtil {
@NotNull
private static <T extends Configurable> T findConfigurable(ConfigurableEP<Configurable>[] extensions, Class<T> configurableClass) {
for (ConfigurableEP<Configurable> extension : extensions) {
if (extension.isConfigurableProvided()) {
if (extension.canCreateConfigurable()) {
final Configurable configurable = extension.createConfigurable();
if (configurableClass.isInstance(configurable)) {
return configurableClass.cast(configurable);
@@ -47,7 +47,7 @@ public class ConfigurableWrapper implements SearchableConfigurable {
@Nullable
public static <T extends UnnamedConfigurable> T wrapConfigurable(ConfigurableEP<T> ep) {
if (!ep.isConfigurableProvided()) {
if (!ep.canCreateConfigurable()) {
return null;
}
if (ep.displayName != null || ep.key != null || ep.groupId != null) {
@@ -35,7 +35,7 @@ public final class VcsManagerConfigurableProvider extends ConfigurableProvider {
}
@Override
public boolean isConfigurableProvided() {
public boolean canCreateConfigurable() {
return ProjectLevelVcsManager.getInstance(myProject).getAllVcss().length > 0;
}
}
@@ -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;
}
}