diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
index 1578e2885d21..528ba73d71ec 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
@@ -112,7 +112,8 @@ public class ProjectStructureConfigurable extends BaseConfigurable implements Se
private final ModulesConfigurator myModuleConfigurator;
private JdkListConfigurable myJdkListConfig;
- private final JLabel myEmptySelection = new JLabel("Select a setting to view or edit its details here", JLabel.CENTER);
+ private final JLabel myEmptySelection = new JLabel("Select a setting to view or edit its details here",
+ 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;
}
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java
index c38e1d92a150..c4d94c93dc27 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkConfigurable.java
@@ -43,9 +43,10 @@ public class JdkConfigurable extends ProjectStructureElementConfigurable 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);
diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java
index aae9d6955a8a..78fc2d443b1b 100644
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java
@@ -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
diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/JavaSdkType.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/JavaSdkType.java
index 0f044e65cd1e..e627853dde61 100644
--- a/platform/lang-api/src/com/intellij/openapi/projectRoots/JavaSdkType.java
+++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/JavaSdkType.java
@@ -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; }
}
\ No newline at end of file