MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

proper reset in case sdk added

Browse Source
This commit is contained in:
Ekaterina Tuzova
2014-02-12 18:21:12 +04:00
parent 96f6a67225
commit 5111f9dfbb
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ide/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
+17 -7
View File
@@ -65,7 +65,7 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
private final Project myProject;
@Nullable private final Module myModule;
private MyListener myListener;
boolean mySdkAdded = false;
Sdk myAddedSdk = null;
private PyConfigurableInterpreterList myInterpreterList;
private ProjectSdksModel myProjectSdksModel;
@@ -115,9 +115,9 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
@Override
public void consume(Sdk sdk) {
if (sdk == null) return;
mySdkAdded = myProjectSdksModel.findSdk(sdk) == null;
if (mySdkAdded) {
if (myProjectSdksModel.findSdk(sdk) == null) {
myProjectSdksModel.addSdk(sdk);
myAddedSdk = sdk;
}
updateSdkList(false);
mySdkCombo.getModel().setSelectedItem(sdk);
@@ -219,7 +219,7 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
public boolean isModified() {
final Sdk sdk = getSdk();
final Sdk selectedItem = (Sdk)mySdkCombo.getSelectedItem();
return mySdkAdded || selectedItem instanceof PyDetectedSdk || sdk != myProjectSdksModel.findSdk(selectedItem);
return myAddedSdk != null || selectedItem instanceof PyDetectedSdk || sdk != myProjectSdksModel.findSdk(selectedItem);
}
@Nullable
@@ -247,12 +247,13 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
}
}, ModalityState.any());
}
if (mySdkAdded) {
if (myAddedSdk != null) {
myProjectSdksModel.addSdk(item);
myProjectSdksModel.apply(null, true);
mySdkCombo.setSelectedItem(item);
}
final Sdk selectedSdk = setSdk(item);
final Sdk prevSdk = ProjectRootManager.getInstance(myProject).getProjectSdk();
final Sdk selectedSdk = setSdk(item);
// update string literals if different LanguageLevel was selected
if (prevSdk != null && selectedSdk != null) {
@@ -271,6 +272,7 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
}
private Sdk setSdk(Sdk item) {
myAddedSdk = null;
final Sdk selectedSdk = myProjectSdksModel.findSdk(item);
if (myModule == null) {
final ProjectRootManager rootManager = ProjectRootManager.getInstance(myProject);
@@ -307,6 +309,14 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
@Override
public void reset() {
if (myAddedSdk != null) {
myProjectSdksModel.removeSdk(myAddedSdk);
myAddedSdk = null;
}
resetSdkList();
}
private void resetSdkList() {
updateSdkList(false);
final Sdk sdk = getSdk();
@@ -371,7 +381,7 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable {
@Override
public void sdkAdded(Sdk sdk) {
myConfigurable.reset();
myConfigurable.resetSdkList();
}
@Override