This commit is contained in:
Dmitry Avdeev
2013-02-08 18:13:58 +04:00
parent c177417809
commit e8640944fe
2 changed files with 2 additions and 4 deletions
@@ -16,7 +16,6 @@
package com.intellij.openapi.options.ex;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurableEP;
import com.intellij.openapi.options.ConfigurableProvider;
@@ -41,8 +40,7 @@ public class ConfigurableExtensionPointUtil {
public static List<Configurable> buildConfigurablesList(final ConfigurableEP<Configurable>[] extensions,
final Configurable[] components,
@Nullable ConfigurableFilter filter,
ExtensionPointName<ConfigurableEP<Configurable>> configurablesExtensionPoint) {
@Nullable ConfigurableFilter filter) {
final List<Configurable> result = new ArrayList<Configurable>();
ContainerUtil.addAll(result, components);
final Map<String, ConfigurableWrapper> idToConfigurable = new HashMap<String, ConfigurableWrapper>();
@@ -46,7 +46,7 @@ public abstract class ConfigurablesGroupBase implements ConfigurableGroup {
final ConfigurableEP<Configurable>[] extensions = myComponentManager.getExtensions(myConfigurablesExtensionPoint);
Configurable[] components = myLoadComponents ? myComponentManager.getComponents(Configurable.class) : new Configurable[0];
List<Configurable> result = ConfigurableExtensionPointUtil.buildConfigurablesList(extensions, components, getConfigurableFilter(), myConfigurablesExtensionPoint);
List<Configurable> result = ConfigurableExtensionPointUtil.buildConfigurablesList(extensions, components, getConfigurableFilter());
myChildren = result.toArray(new Configurable[result.size()]);
}
return myChildren;