From 3b672e3c4d7b74a949f7560bcf343c8db9772d2e Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 15 Dec 2011 20:31:34 +0400 Subject: [PATCH] IDEA-78833 android: update version string when internal jdk changed --- .../src/org/jetbrains/android/sdk/AndroidSdkConfigurable.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurable.java b/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurable.java index 6a55c277b1d2..677e291a257e 100644 --- a/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurable.java +++ b/plugins/android/src/org/jetbrains/android/sdk/AndroidSdkConfigurable.java @@ -54,9 +54,11 @@ public class AndroidSdkConfigurable implements AdditionalDataConfigurable { @Override public void apply() throws ConfigurationException { - AndroidSdkAdditionalData newData = new AndroidSdkAdditionalData(mySdk, myForm.getSelectedSdk()); + final Sdk javaSdk = myForm.getSelectedSdk(); + AndroidSdkAdditionalData newData = new AndroidSdkAdditionalData(mySdk, javaSdk); newData.setBuildTarget(myForm.getSelectedBuildTarget()); final SdkModificator modificator = mySdk.getSdkModificator(); + modificator.setVersionString(javaSdk != null ? javaSdk.getVersionString() : null); modificator.setSdkAdditionalData(newData); ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() {