diff --git a/plugins/android/resources/messages/AndroidBundle.properties b/plugins/android/resources/messages/AndroidBundle.properties index 5fba05a4e6f8..25136fc22d19 100644 --- a/plugins/android/resources/messages/AndroidBundle.properties +++ b/plugins/android/resources/messages/AndroidBundle.properties @@ -214,7 +214,7 @@ android.keystore.confirm.password.label=C&onfirm: android.export.package.new.key.alias.label=&Alias: android.key.password.label=Pa&ssword: android.cannot.run.library.project.error=The module cannot be Android library project -android.compilation.error.specify.platform=Android SDK is not specified for module {0} +android.compilation.error.specify.platform=[{0}] Android SDK is not specified or cannot be parsed android.compilation.error.manifest.not.found=[{0}] AndroidManifest.xml file not found. Please, check Android facet settings. android.compilation.error.apt.gen.not.specified=AAPT destination directory not specified for module {0} android.compilation.error.apk.path.not.specified=Final APK path not specified for module {0} diff --git a/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java b/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java index ea2c399aa8a0..d9d8d43f00d7 100644 --- a/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java +++ b/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurableForm.java @@ -16,7 +16,6 @@ package org.jetbrains.android.sdk; import com.android.sdklib.IAndroidTarget; -import com.intellij.ui.ListCellRendererWrapper; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.SdkModel; import com.intellij.openapi.projectRoots.SdkModificator; @@ -24,6 +23,7 @@ import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.ui.OrderRoot; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.ui.ListCellRendererWrapper; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NotNull; @@ -68,6 +68,9 @@ class AndroidSdkConfigurableForm { if (value instanceof IAndroidTarget) { setText(AndroidSdkUtils.getTargetPresentableName((IAndroidTarget)value)); } + else if (value == null) { + setText("[none]"); + } } }); @@ -142,10 +145,11 @@ class AndroidSdkConfigurableForm { IAndroidTarget target = (IAndroidTarget)myBuildTargetsModel.getElementAt(i); if (buildTarget.hashString().equals(target.hashString())) { myBuildTargetComboBox.setSelectedIndex(i); - break; + return; } } } + myBuildTargetComboBox.setSelectedItem(null); } private void updateJdks() {