diff options
author | Josh Giles <joshgiles@google.com> | 2015-07-31 13:48:28 -0400 |
---|---|---|
committer | Josh Giles <joshgiles@google.com> | 2015-07-31 13:48:28 -0400 |
commit | 3eb1c340319f49c6da066b31c0b20c06b03e968f (patch) | |
tree | ecffdb2988e9b952eed70edd07a1f7a352aa451b | |
parent | 82343e6882b95d4f1bdff77a51518877b1380bbe (diff) | |
download | idea-3eb1c340319f49c6da066b31c0b20c06b03e968f.tar.gz |
Implement getAllApplicationIds, use it in chooser.
Change-Id: I9dc1fae63469322c5601663eb3d5cac17e8f6952
-rw-r--r-- | android/src/com/android/tools/idea/gradle/IdeaAndroidProject.java | 9 | ||||
-rw-r--r-- | android/src/org/jetbrains/android/actions/AndroidProcessChooserDialog.java | 17 |
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 60b482118e1..343e35310a6 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; |