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

notnull

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-04-26 13:38:44 +03:00
parent 6533a1875f
commit d2a4dca0f0
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
+3 -1
View File
@@ -112,7 +112,8 @@ public class ProjectStructureConfigurable extends BaseConfigurable implements Se
private final ModulesConfigurator myModuleConfigurator;
private JdkListConfigurable myJdkListConfig;
private final JLabel myEmptySelection = new JLabel("<html><body><center>Select a setting to view or edit its details here</center></body></html>", JLabel.CENTER);
private final JLabel myEmptySelection = new JLabel("<html><body><center>Select a setting to view or edit its details here</center></body></html>",
SwingConstants.CENTER);
public ProjectStructureConfigurable(final Project project,
final ProjectLibrariesConfigurable projectLibrariesConfigurable,
@@ -593,6 +594,7 @@ public class ProjectStructureConfigurable extends BaseConfigurable implements Se
return ServiceManager.getService(project, ProjectStructureConfigurable.class);
}
@NotNull
public ProjectSdksModel getProjectJdksModel() {
return myProjectJdksModel;
}
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java
+4 -3
View File
@@ -43,9 +43,10 @@ public class JdkConfigurable extends ProjectStructureElementConfigurable<Sdk> im
private final SdkEditor mySdkEditor;
private final SdkProjectStructureElement myProjectStructureElement;
public JdkConfigurable(final ProjectJdkImpl projectJdk,
final ProjectSdksModel sdksModel,
final Runnable updateTree, @NotNull History history, @NotNull Project project) {
public JdkConfigurable(@NotNull ProjectJdkImpl projectJdk,
@NotNull ProjectSdksModel sdksModel,
@NotNull Runnable updateTree,
@NotNull History history, @NotNull Project project) {
super(true, updateTree);
myProjectJdk = projectJdk;
mySdkEditor = createSdkEditor(project, sdksModel, history, myProjectJdk);
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java
+1 -1
View File
@@ -31,7 +31,6 @@ import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStr
import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.SdkProjectStructureElement;
import com.intellij.openapi.ui.MasterDetailsComponent;
import com.intellij.openapi.ui.NamedConfigurable;
import com.intellij.util.Consumer;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -41,6 +40,7 @@ import javax.swing.tree.TreePath;
import java.util.*;
public class JdkListConfigurable extends BaseStructureConfigurable {
@NotNull
private final ProjectSdksModel myJdksTreeModel;
private final SdkModel.Listener myListener = new SdkModel.Listener() {
@Override
platform/lang-api/src/com/intellij/openapi/projectRoots/JavaSdkType.java
+4 -3
View File
@@ -21,16 +21,17 @@
package com.intellij.openapi.projectRoots;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
public interface JavaSdkType {
@NonNls
String getBinPath(Sdk sdk);
String getBinPath(@NotNull Sdk sdk);
@NonNls
String getToolsPath(Sdk sdk);
String getToolsPath(@NotNull Sdk sdk);
@NonNls
String getVMExecutablePath(Sdk sdk);
String getVMExecutablePath(@NotNull Sdk sdk);
default boolean isDependent() { return false; }
}