Merge "Implement getAllApplicationIds, use it in chooser." into studio-1.4-dev automerge: 3c820fd

automerge: 5917a04

* commit '5917a0446fc7317fcca7ee002700a75fc56728bf':
  Implement getAllApplicationIds, use it in chooser.

2 files changed, 11 insertions, 15 deletions

diff --git a/android/src/com/android/tools/idea/gradle/IdeaAndroidProject.java b/android/src/com/android/tools/idea/gradle/IdeaAndroidProject.java
index 47b1167b36c..393157f2673 100644
--- a/android/src/com/android/tools/idea/gradle/IdeaAndroidProject.java
+++ b/android/src/com/android/tools/idea/gradle/IdeaAndroidProject.java
@@ -176,7 +176,14 @@ public class IdeaAndroidProject implements AndroidModel, Serializable {
   @NotNull
   @Override
   public Set<String> getAllApplicationIds() {
-    throw new UnsupportedOperationException("Not yet implemented.");
+    Set<String> ids = Sets.newHashSet();
+    for (Variant v : myAndroidProject.getVariants()) {
+      String applicationId = v.getMergedFlavor().getApplicationId();
+      if (applicationId != null) {
+        ids.add(applicationId);
+      }
+    }
+    return ids;
   }
 
   @Override
diff --git a/android/src/org/jetbrains/android/actions/AndroidProcessChooserDialog.java b/android/src/org/jetbrains/android/actions/AndroidProcessChooserDialog.java
index 3c681ac2309..e55974da85f 100644
--- a/android/src/org/jetbrains/android/actions/AndroidProcessChooserDialog.java
+++ b/android/src/org/jetbrains/android/actions/AndroidProcessChooserDialog.java
@@ -15,13 +15,12 @@
  */
 package org.jetbrains.android.actions;
 
-import com.android.builder.model.Variant;
 import com.android.ddmlib.AndroidDebugBridge;
 import com.android.ddmlib.Client;
 import com.android.ddmlib.ClientData;
 import com.android.ddmlib.IDevice;
 import com.android.tools.idea.ddms.adb.AdbService;
-import com.android.tools.idea.gradle.IdeaAndroidProject;
+import com.android.tools.idea.model.AndroidModel;
 import com.intellij.execution.*;
 import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.execution.executors.DefaultDebugExecutor;
@@ -400,9 +399,9 @@ public class AndroidProcessChooserDialog extends DialogWrapper {
           collectProcessNames(xmlElement, result);
         }
       }
-      final IdeaAndroidProject androidModel = facet.getAndroidModel();
+      final AndroidModel androidModel = facet.getAndroidModel();
       if (androidModel != null) {
-        collectApplicationIds(androidModel, result);
+        result.addAll(androidModel.getAllApplicationIds());
       }
     }
 
@@ -424,16 +423,6 @@ public class AndroidProcessChooserDialog extends DialogWrapper {
     });
   }
 
-  private static void collectApplicationIds(IdeaAndroidProject androidModel, Set<String> result) {
-    final Collection<Variant> allVariants = androidModel.getAndroidProject().getVariants();
-    for (Variant v : allVariants) {
-      String applicationId = v.getMergedFlavor().getApplicationId();
-      if (applicationId != null) {
-        result.add(applicationId);
-      }
-    }
-  }
-
   @Override
   protected JComponent createCenterPanel() {
     return myContentPanel;