Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/libraries/asm_tools.xml
	.idea/libraries/bouncy_castle.xml
	.idea/libraries/builder_model.xml
	.idea/libraries/commons_compress.xml
	.idea/libraries/easymock_tools.xml
	.idea/libraries/freemarker_2_3_20.xml
	.idea/libraries/guava_tools.xml
	.idea/libraries/kxml2.xml
	.idea/libraries/lombok_ast.xml
	.idea/libraries/mockito.xml
	.idea/modules.xml
	.idea/vcs.xml
	build/scripts/layouts.gant
	updater/src/com/intellij/updater/Runner.java

Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12

1 files changed, 7 insertions, 10 deletions

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 429a55b2b809..ca72bf30c541 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
@@ -48,7 +48,7 @@ public class ConfigurableExtensionPointUtil {
       }
     }
 
-    final Map<String, ConfigurableWrapper> idToConfigurable = new HashMap<String, ConfigurableWrapper>();
+    final Map<String, ConfigurableWrapper> idToConfigurable = new LinkedHashMap<String, ConfigurableWrapper>();
     for (ConfigurableEP<Configurable> ep : extensions) {
       final Configurable configurable = ConfigurableWrapper.wrapConfigurable(ep);
       if (isSuppressed(configurable, filter)) continue;
@@ -75,16 +75,13 @@ public class ConfigurableExtensionPointUtil {
         }
       }
     }
-    //leave only roots (i.e. configurables without parents)
-    for (final Iterator<String> iterator = idToConfigurable.keySet().iterator(); iterator.hasNext(); ) {
-      final String key = iterator.next();
-      final ConfigurableWrapper wrapper = idToConfigurable.get(key);
-      final String parentId = wrapper.getParentId();
-      if (parentId != null && idToConfigurable.containsKey(parentId)) {
-        iterator.remove(); // remove only processed parents
+    // add roots only (i.e. configurables without parents)
+    for (ConfigurableWrapper wrapper : idToConfigurable.values()) {
+      String parentId = wrapper.getParentId();
+      if (parentId == null || !idToConfigurable.containsKey(parentId)) {
+        result.add(wrapper);
       }
     }
-    ContainerUtil.addAll(result, idToConfigurable.values());
 
     return result;
   }
@@ -164,7 +161,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.providerClass != null || extension.instanceClass != null || extension.implementationClass != null) {
+      if (extension.canCreateConfigurable()) {
         final Configurable configurable = extension.createConfigurable();
         if (configurableClass.isInstance(configurable)) {
           return configurableClass.cast(configurable);