Merge "Move computePackageName calls to getApplicationId." into studio-1.4-dev automerge: ffcd440

automerge: 92e6e3a

* commit '92e6e3aa98c0711727b38032b462286a54aa6a8b':
  Move computePackageName calls to getApplicationId.

5 files changed, 5 insertions, 14 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..47b1167b36c 100644
--- a/android/src/com/android/tools/idea/gradle/IdeaAndroidProject.java
+++ b/android/src/com/android/tools/idea/gradle/IdeaAndroidProject.java
@@ -170,7 +170,7 @@ public class IdeaAndroidProject implements AndroidModel, Serializable {
   @NotNull
   @Override
   public String getApplicationId() {
-    throw new UnsupportedOperationException("Not yet implemented.");
+    return getSelectedVariant().getMainArtifact().getApplicationId();
   }
 
   @NotNull
@@ -362,14 +362,6 @@ public class IdeaAndroidProject implements AndroidModel, Serializable {
     return LanguageLevel.parse(sourceCompatibility);
   }
 
-  /**
-   * Returns the package name used for the current variant in the given project.
-   */
-  @NotNull
-  public String computePackageName() {
-    return getSelectedVariant().getMainArtifact().getApplicationId();
-  }
-
   public boolean isLibrary() {
     return getAndroidProject().isLibrary();
   }
diff --git a/android/src/com/android/tools/idea/model/AndroidModel.java b/android/src/com/android/tools/idea/model/AndroidModel.java
index 3cd516fc079..9c1ba7df9ea 100644
--- a/android/src/com/android/tools/idea/model/AndroidModel.java
+++ b/android/src/com/android/tools/idea/model/AndroidModel.java
@@ -73,7 +73,6 @@ public interface AndroidModel {
 
   /**
    * @return the current application ID.
-   * See {@link com.android.tools.idea.gradle.IdeaAndroidProject#computePackageName()}
    */
   @NotNull
   String getApplicationId();
diff --git a/android/src/com/android/tools/idea/model/AndroidModuleInfo.java b/android/src/com/android/tools/idea/model/AndroidModuleInfo.java
index bff115c3acb..3c784cd8808 100644
--- a/android/src/com/android/tools/idea/model/AndroidModuleInfo.java
+++ b/android/src/com/android/tools/idea/model/AndroidModuleInfo.java
@@ -60,9 +60,9 @@ public class AndroidModuleInfo {
   /** Obtains the package name for the current variant, or if not specified, from the primary manifest. */
   @Nullable
   public String getPackage() {
-    IdeaAndroidProject androidModel = myFacet.getAndroidModel();
+    AndroidModel androidModel = myFacet.getAndroidModel();
     if (androidModel != null) {
-      return androidModel.computePackageName();
+      return androidModel.getApplicationId();
     }
 
     // Read from the manifest: Not overridden in the configuration
diff --git a/android/src/com/android/tools/idea/npw/AddAndroidActivityPath.java b/android/src/com/android/tools/idea/npw/AddAndroidActivityPath.java
index 5c29dde4f1b..9649995a95b 100644
--- a/android/src/com/android/tools/idea/npw/AddAndroidActivityPath.java
+++ b/android/src/com/android/tools/idea/npw/AddAndroidActivityPath.java
@@ -436,7 +436,7 @@ public final class AddAndroidActivityPath extends DynamicWizardPath {
     //noinspection ConstantConditions
     IdeaAndroidProject androidModel = AndroidFacet.getInstance(getModule()).getAndroidModel();
     assert androidModel != null;
-    return androidModel.computePackageName();
+    return androidModel.getApplicationId();
   }
 
   private Map<String, Object> getDirectories() {
diff --git a/android/src/org/jetbrains/android/inspections/lint/IntellijLintProject.java b/android/src/org/jetbrains/android/inspections/lint/IntellijLintProject.java
index 25e6c265e95..d8128031efa 100644
--- a/android/src/org/jetbrains/android/inspections/lint/IntellijLintProject.java
+++ b/android/src/org/jetbrains/android/inspections/lint/IntellijLintProject.java
@@ -802,7 +802,7 @@ class IntellijLintProject extends Project {
 
       IdeaAndroidProject androidModel = myFacet.getAndroidModel();
       if (androidModel != null) {
-        return androidModel.computePackageName();
+        return androidModel.getApplicationId();
       }
 
       return null;