Merge "Migrate some clients to getMainArtifact." into studio-1.4-dev automerge: cb4c135

automerge: b97d32c

* commit 'b97d32c94fe35583c23a5b7f46018460802181e8':
  Migrate some clients to getMainArtifact.

10 files changed, 23 insertions, 26 deletions

diff --git a/android/src/com/android/tools/idea/gradle/AndroidJunitPatcher.java b/android/src/com/android/tools/idea/gradle/AndroidJunitPatcher.java
index c961ae76a63..93054295cb7 100644
--- a/android/src/com/android/tools/idea/gradle/AndroidJunitPatcher.java
+++ b/android/src/com/android/tools/idea/gradle/AndroidJunitPatcher.java
@@ -170,7 +170,7 @@ public class AndroidJunitPatcher extends JUnitPatcher {
         IdeaAndroidProject affectedAndroidModel = facet.getAndroidModel();
         if (affectedAndroidModel != null) {
           try {
-            classPath.add(affectedAndroidModel.getSelectedVariant().getMainArtifact().getJavaResourcesFolder());
+            classPath.add(affectedAndroidModel.getMainArtifact().getJavaResourcesFolder());
           }
           catch (UnsupportedMethodException e) {
             // Java resources were not present in older versions of the gradle plugin.
diff --git a/android/src/com/android/tools/idea/gradle/dependency/Dependency.java b/android/src/com/android/tools/idea/gradle/dependency/Dependency.java
index 4e265dafe20..44892f0a68e 100644
--- a/android/src/com/android/tools/idea/gradle/dependency/Dependency.java
+++ b/android/src/com/android/tools/idea/gradle/dependency/Dependency.java
@@ -86,13 +86,12 @@ public abstract class Dependency {
   @NotNull
   public static DependencySet extractFrom(@NotNull IdeaAndroidProject androidProject) {
     DependencySet dependencies = new DependencySet();
-    Variant selectedVariant = androidProject.getSelectedVariant();
 
     BaseArtifact testArtifact = androidProject.findSelectedTestArtifactInSelectedVariant();
     if (testArtifact != null) {
       populate(dependencies, testArtifact, DependencyScope.TEST);
     }
-    AndroidArtifact mainArtifact = selectedVariant.getMainArtifact();
+    AndroidArtifact mainArtifact = androidProject.getMainArtifact();
     populate(dependencies, mainArtifact, DependencyScope.COMPILE);
 
     return dependencies;
diff --git a/android/src/com/android/tools/idea/gradle/util/GradleUtil.java b/android/src/com/android/tools/idea/gradle/util/GradleUtil.java
index 1e6a8925c32..1d162f95a3a 100644
--- a/android/src/com/android/tools/idea/gradle/util/GradleUtil.java
+++ b/android/src/com/android/tools/idea/gradle/util/GradleUtil.java
@@ -1279,7 +1279,7 @@ public final class GradleUtil {
    * @return {@code true} if the project depends on the given artifact (including transitively)
    */
   public static boolean dependsOn(@NonNull IdeaAndroidProject androidModel, @NonNull String artifact) {
-    Dependencies dependencies = androidModel.getSelectedVariant().getMainArtifact().getDependencies();
+    Dependencies dependencies = androidModel.getMainArtifact().getDependencies();
     return dependsOn(dependencies, artifact);
   }
 
diff --git a/android/src/com/android/tools/idea/model/DeclaredPermissionsLookup.java b/android/src/com/android/tools/idea/model/DeclaredPermissionsLookup.java
index da7335a0b35..29b0be70c32 100644
--- a/android/src/com/android/tools/idea/model/DeclaredPermissionsLookup.java
+++ b/android/src/com/android/tools/idea/model/DeclaredPermissionsLookup.java
@@ -326,7 +326,7 @@ public class DeclaredPermissionsLookup implements ProjectComponent {
           }
         }
         if (myFacet.requiresAndroidModel() && myFacet.getAndroidModel() != null) {
-          Collection<AndroidLibrary> libraries = myFacet.getAndroidModel().getSelectedVariant().getMainArtifact().getDependencies().getLibraries();
+          Collection<AndroidLibrary> libraries = myFacet.getAndroidModel().getMainArtifact().getDependencies().getLibraries();
           myLibraries = Lists.newArrayList();
           for (AndroidLibrary library : libraries) {
             myLibraries.add(getLibraryPermissions(library));
diff --git a/android/src/com/android/tools/idea/rendering/AppResourceRepository.java b/android/src/com/android/tools/idea/rendering/AppResourceRepository.java
index 4320f265ace..014970c0441 100644
--- a/android/src/com/android/tools/idea/rendering/AppResourceRepository.java
+++ b/android/src/com/android/tools/idea/rendering/AppResourceRepository.java
@@ -273,7 +273,7 @@ public class AppResourceRepository extends MultiResourceRepository {
   private static void addGradleLibraries(List<AndroidLibrary> list, AndroidFacet facet) {
     IdeaAndroidProject androidModel = facet.getAndroidModel();
     if (androidModel != null) {
-      Collection<AndroidLibrary> libraries = androidModel.getSelectedVariant().getMainArtifact().getDependencies().getLibraries();
+      Collection<AndroidLibrary> libraries = androidModel.getMainArtifact().getDependencies().getLibraries();
       Set<File> unique = Sets.newHashSet();
       for (AndroidLibrary library : libraries) {
         addGradleLibrary(list, library, unique);
diff --git a/android/src/org/jetbrains/android/facet/AndroidFacet.java b/android/src/org/jetbrains/android/facet/AndroidFacet.java
index a1a1c69bfe5..56d06099b06 100644
--- a/android/src/org/jetbrains/android/facet/AndroidFacet.java
+++ b/android/src/org/jetbrains/android/facet/AndroidFacet.java
@@ -302,8 +302,7 @@ public class AndroidFacet extends Facet<AndroidFacetConfiguration> {
   @Nullable
   public SourceProvider getMultiFlavorSourceProvider() {
     if (myAndroidModel != null) {
-      Variant selectedVariant = myAndroidModel.getSelectedVariant();
-      AndroidArtifact mainArtifact = selectedVariant.getMainArtifact();
+      AndroidArtifact mainArtifact = myAndroidModel.getMainArtifact();
       SourceProvider provider = mainArtifact.getMultiFlavorSourceProvider();
       if (provider != null) {
         return provider;
@@ -321,8 +320,7 @@ public class AndroidFacet extends Facet<AndroidFacetConfiguration> {
   @Nullable
   public SourceProvider getVariantSourceProvider() {
     if (myAndroidModel != null) {
-      Variant selectedVariant = myAndroidModel.getSelectedVariant();
-      AndroidArtifact mainArtifact = selectedVariant.getMainArtifact();
+      AndroidArtifact mainArtifact = myAndroidModel.getMainArtifact();
       SourceProvider provider = mainArtifact.getVariantSourceProvider();
       if (provider != null) {
         return provider;
diff --git a/android/src/org/jetbrains/android/facet/AndroidRootUtil.java b/android/src/org/jetbrains/android/facet/AndroidRootUtil.java
index 43cdaee735a..49e68dd4aea 100644
--- a/android/src/org/jetbrains/android/facet/AndroidRootUtil.java
+++ b/android/src/org/jetbrains/android/facet/AndroidRootUtil.java
@@ -22,6 +22,7 @@ import com.android.builder.model.AndroidArtifactOutput;
 import com.android.builder.model.Variant;
 import com.android.tools.idea.AndroidPsiUtils;
 import com.android.tools.idea.gradle.IdeaAndroidProject;
+import com.android.tools.idea.model.AndroidModel;
 import com.intellij.ide.highlighter.ArchiveFileType;
 import com.intellij.lang.properties.psi.PropertiesFile;
 import com.intellij.openapi.application.ApplicationManager;
@@ -518,11 +519,10 @@ public class AndroidRootUtil {
 
   @Nullable
   public static String getApkPath(@NotNull AndroidFacet facet) {
-    IdeaAndroidProject androidModel = facet.getAndroidModel();
+    AndroidModel androidModel = facet.getAndroidModel();
     if (androidModel != null) {
-      // For Android-Gradle projects, IdeaAndroidProject is not null.
-      Variant selectedVariant = androidModel.getSelectedVariant();
-      AndroidArtifact mainArtifact = selectedVariant.getMainArtifact();
+      // For Android-Gradle projects, AndroidModel is not null.
+      AndroidArtifact mainArtifact = androidModel.getMainArtifact();
       AndroidArtifactOutput output = getOutput(mainArtifact);
       File outputFile = output.getMainOutputFile().getOutputFile();
       return outputFile.getAbsolutePath();
diff --git a/android/src/org/jetbrains/android/inspections/lint/IntellijLintProject.java b/android/src/org/jetbrains/android/inspections/lint/IntellijLintProject.java
index d8128031efa..076f5877e13 100644
--- a/android/src/org/jetbrains/android/inspections/lint/IntellijLintProject.java
+++ b/android/src/org/jetbrains/android/inspections/lint/IntellijLintProject.java
@@ -21,6 +21,7 @@ import com.android.sdklib.AndroidTargetHash;
 import com.android.sdklib.AndroidVersion;
 import com.android.tools.idea.gradle.IdeaAndroidProject;
 import com.android.tools.idea.gradle.util.GradleUtil;
+import com.android.tools.idea.model.AndroidModel;
 import com.android.tools.idea.model.AndroidModuleInfo;
 import com.android.tools.idea.model.ManifestInfo;
 import com.android.tools.lint.client.api.LintClient;
@@ -342,9 +343,9 @@ class IntellijLintProject extends Project {
                                                @NonNull LintModuleProject project,
                                                @NonNull Map<Project,Module> projectMap,
                                                @NonNull List<Project> dependencies) {
-    IdeaAndroidProject androidModel = facet.getAndroidModel();
+    AndroidModel androidModel = facet.getAndroidModel();
     if (androidModel != null) {
-      Collection<AndroidLibrary> libraries = androidModel.getSelectedVariant().getMainArtifact().getDependencies().getLibraries();
+      Collection<AndroidLibrary> libraries = androidModel.getMainArtifact().getDependencies().getLibraries();
       for (AndroidLibrary library : libraries) {
         Project p = libraryMap.get(library);
         if (p == null) {
@@ -745,10 +746,9 @@ class IntellijLintProject extends Project {
           // the module content root settings
           File dir = null;
           if (myFacet.requiresAndroidModel()) {
-            IdeaAndroidProject androidModel = myFacet.getAndroidModel();
+            AndroidModel androidModel = myFacet.getAndroidModel();
             if (androidModel != null) {
-              Variant variant = androidModel.getSelectedVariant();
-              dir = variant.getMainArtifact().getClassesFolder();
+              dir = androidModel.getMainArtifact().getClassesFolder();
             }
           }
           if (dir != null) {
@@ -770,8 +770,8 @@ class IntellijLintProject extends Project {
       if (SUPPORT_CLASS_FILES) {
         if (mJavaLibraries == null) {
           if (myFacet.requiresAndroidModel() && myFacet.getAndroidModel() != null) {
-            IdeaAndroidProject androidModel = myFacet.getAndroidModel();
-            Collection<JavaLibrary> libs = androidModel.getSelectedVariant().getMainArtifact().getDependencies().getJavaLibraries();
+            AndroidModel androidModel = myFacet.getAndroidModel();
+            Collection<JavaLibrary> libs = androidModel.getMainArtifact().getDependencies().getJavaLibraries();
             mJavaLibraries = Lists.newArrayListWithExpectedSize(libs.size());
             for (JavaLibrary lib : libs) {
               File jar = lib.getJarFile();
diff --git a/android/src/org/jetbrains/android/run/AndroidRunConfigurationBase.java b/android/src/org/jetbrains/android/run/AndroidRunConfigurationBase.java
index a1d6714a5af..413ccb69393 100644
--- a/android/src/org/jetbrains/android/run/AndroidRunConfigurationBase.java
+++ b/android/src/org/jetbrains/android/run/AndroidRunConfigurationBase.java
@@ -25,6 +25,7 @@ import com.android.tools.idea.gradle.IdeaAndroidProject;
 import com.android.tools.idea.gradle.project.AndroidGradleNotification;
 import com.android.tools.idea.gradle.service.notification.hyperlink.NotificationHyperlink;
 import com.android.tools.idea.gradle.util.GradleUtil;
+import com.android.tools.idea.model.AndroidModel;
 import com.android.tools.idea.model.AndroidModuleInfo;
 import com.android.tools.idea.run.CloudDebuggingTargetChooser;
 import com.android.tools.idea.run.CloudTargetChooser;
@@ -219,11 +220,10 @@ public abstract class AndroidRunConfigurationBase extends ModuleBasedConfigurati
       throw new ExecutionException(GRADLE_SYNC_FAILED_ERR_MSG);
     }
 
-    IdeaAndroidProject androidModel = facet.getAndroidModel();
+    AndroidModel androidModel = facet.getAndroidModel();
     if (androidModel != null) {
-      Variant variant = androidModel.getSelectedVariant();
-      if (!variant.getMainArtifact().isSigned()) {
-        AndroidArtifactOutput output = GradleUtil.getOutput(variant.getMainArtifact());
+      if (!androidModel.getMainArtifact().isSigned()) {
+        AndroidArtifactOutput output = GradleUtil.getOutput(androidModel.getMainArtifact());
         String message = AndroidBundle.message("run.error.apk.not.signed", output.getMainOutputFile().getOutputFile().getName());
         String title = CommonBundle.getErrorTitle();
         NotificationHyperlink quickfix =
diff --git a/android/src/org/jetbrains/android/uipreview/ModuleClassLoader.java b/android/src/org/jetbrains/android/uipreview/ModuleClassLoader.java
index 97ea9b31ccf..93b5501fe34 100644
--- a/android/src/org/jetbrains/android/uipreview/ModuleClassLoader.java
+++ b/android/src/org/jetbrains/android/uipreview/ModuleClassLoader.java
@@ -186,7 +186,7 @@ public final class ModuleClassLoader extends RenderClassLoader {
         if (androidModel != null) {
           Variant variant = androidModel.getSelectedVariant();
           String variantName = variant.getName();
-          AndroidArtifact mainArtifactInfo = variant.getMainArtifact();
+          AndroidArtifact mainArtifactInfo = androidModel.getMainArtifact();
           File classesFolder = mainArtifactInfo.getClassesFolder();
 
           // Older models may not supply it; in that case, we rely on looking relative