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

do not pass null to findSdk() because it's useless

Browse Source 
GitOrigin-RevId: 3ddec3acf5e393ccbf9aaa9860aaa3270e6bfe49
This commit is contained in:
Alexey Kudravtsev
2019-05-03 01:49:45 +03:00
committed by intellij-monorepo-bot
parent 759448610a
commit 7fe2f016f7
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java
+3 -5
View File
@@ -77,14 +77,12 @@ public class UIRootConfigurationAccessor extends RootConfigurationAccessor {
@Override
@Nullable
public String getProjectSdkName(final Project project) {
final String projectJdkName = ProjectRootManager.getInstance(project).getProjectSdkName();
final Sdk projectJdk = getProjectSdk(project);
if (projectJdk != null) {
return projectJdk.getName();
}
else {
final ProjectSdksModel projectJdksModel = ProjectStructureConfigurable.getInstance(project).getProjectJdksModel();
return projectJdksModel.findSdk(projectJdkName) == null ? projectJdkName : null;
}
final String projectJdkName = ProjectRootManager.getInstance(project).getProjectSdkName();
final ProjectSdksModel projectJdksModel = ProjectStructureConfigurable.getInstance(project).getProjectJdksModel();
return projectJdkName != null && projectJdksModel.findSdk(projectJdkName) == null ? projectJdkName : null;
}
}
plugins/devkit/devkit-core/src/projectRoots/IdeaJdk.java
+1 -2
View File
@@ -331,8 +331,7 @@ public class IdeaJdk extends JavaDependentSdkType implements JavaSdkType {
String sdkHome = ObjectUtils.notNull(sdk.getHomePath());
JpsModel model = JpsSerializationManager.getInstance().loadModel(sdkHome, PathManager.getOptionsPath());
JpsSdkReference<JpsDummyElement> sdkRef = model.getProject().getSdkReferencesTable().getSdkReference(JpsJavaSdkType.INSTANCE);
String sdkName = sdkRef == null ? null : sdkRef.getSdkName();
Sdk internalJava = sdkModel.findSdk(sdkName);
Sdk internalJava = sdkRef == null ? null : sdkModel.findSdk(sdkRef.getSdkName());
if (internalJava != null && isValidInternalJdk(sdk, internalJava)) {
setInternalJdk(sdk, sdkModificator, internalJava);
}