Implement IdeaAndroidProject#getAllSourceProviders

Move the logic from IdeaSourceProvider to IdeaAndroidProject.

The IdeaSourceProvider test is really just a test of the Gradle logic,
and should be moved to IdeaAndroidProjectTest. However, the set-up in
that test class does not support the testing logic.

Change-Id: I3944b2cbf10e0191a5c79d78364882dd25d10e43

1 files changed, 1 insertions, 36 deletions

diff --git a/android/src/org/jetbrains/android/facet/IdeaSourceProvider.java b/android/src/org/jetbrains/android/facet/IdeaSourceProvider.java
index 51c25c941db..613baf18fe1 100644
--- a/android/src/org/jetbrains/android/facet/IdeaSourceProvider.java
+++ b/android/src/org/jetbrains/android/facet/IdeaSourceProvider.java
@@ -523,42 +523,7 @@ public abstract class IdeaSourceProvider {
       return Collections.singletonList(facet.getMainSourceProvider());
     }
 
-    AndroidProject androidProject = facet.getAndroidModel().getAndroidProject();
-    Collection<Variant> variants = androidProject.getVariants();
-    List<SourceProvider> providers = Lists.newArrayList();
-
-    // Add main source set
-    providers.add(facet.getMainSourceProvider());
-
-    // Add all flavors
-    Collection<ProductFlavorContainer> flavors = androidProject.getProductFlavors();
-    for (ProductFlavorContainer pfc : flavors) {
-      providers.add(pfc.getSourceProvider());
-    }
-
-    // Add the multi-flavor source providers
-    for (Variant v : variants) {
-      SourceProvider provider = v.getMainArtifact().getMultiFlavorSourceProvider();
-      if (provider != null) {
-        providers.add(provider);
-      }
-    }
-
-    // Add all the build types
-    Collection<BuildTypeContainer> buildTypes = androidProject.getBuildTypes();
-    for (BuildTypeContainer btc : buildTypes) {
-      providers.add(btc.getSourceProvider());
-    }
-
-    // Add all the variant source providers
-    for (Variant v : variants) {
-      SourceProvider provider = v.getMainArtifact().getVariantSourceProvider();
-      if (provider != null) {
-        providers.add(provider);
-      }
-    }
-
-    return providers;
+    return facet.getAndroidModel().getAllSourceProviders();
   }
 
   /**