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

PY-25720 Fixed NPE when associating created virtualenv without any project open

Browse Source
This commit is contained in:
Andrey Vlasovskikh
2017-08-21 21:30:46 +03:00
parent 46c9090035
commit 7ea46d3c36
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java
+1 -1
View File
@@ -59,7 +59,7 @@ import java.util.List;
import java.util.Set;
public class PyActiveSdkConfigurable implements UnnamedConfigurable {
private final Project myProject;
@NotNull private final Project myProject;
@Nullable private final Module myModule;
private MySdkModelListener mySdkModelListener = new MySdkModelListener();
private PyConfigurableInterpreterList myInterpreterList;
python/python-community-configure/src/com/jetbrains/python/configuration/PythonSdkDetailsDialog.java
+1 -1
View File
@@ -350,7 +350,7 @@ public class PythonSdkDetailsDialog extends DialogWrapper {
additionalData = new PythonSdkAdditionalData(PythonSdkFlavor.getFlavor(modificator.getHomePath()));
modificator.setSdkAdditionalData(additionalData);
}
if (isAssociated) {
if (isAssociated && myProject != null) {
additionalData.associateWithProject(myProject);
}
else {
python/src/com/jetbrains/python/sdk/PythonSdkAdditionalData.java
+2 -2
View File
@@ -105,7 +105,7 @@ public class PythonSdkAdditionalData implements SdkAdditionalData {
myAssociateWithNewProject = false;
}
public void associateWithProject(Project project) {
public void associateWithProject(@NotNull Project project) {
final String path = project.getBasePath();
if (path != null) {
myAssociatedProjectPath = FileUtil.toSystemIndependentName(path);
@@ -117,7 +117,7 @@ public class PythonSdkAdditionalData implements SdkAdditionalData {
myAssociateWithNewProject = true;
}
public void reassociateWithCreatedProject(Project project) {
public void reassociateWithCreatedProject(@NotNull Project project) {
if (myAssociateWithNewProject) {
associateWithProject(project);
}
python/src/com/jetbrains/python/sdk/PythonSdkDetailsStep.java
+1 -1
View File
@@ -192,7 +192,7 @@ public class PythonSdkDetailsStep extends BaseListPopupStep<String> {
if (myNewProject) {
((PythonSdkAdditionalData)additionalData).associateWithNewProject();
}
else {
else if (myProject != null) {
((PythonSdkAdditionalData)additionalData).associateWithProject(myProject);
}
}