cleanup

java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java

@@ -314,7 +314,7 @@ public class JavaSdkImpl extends JavaSdk {
 
   @Override
   @SuppressWarnings({"HardCodedStringLiteral"})
-  public void setupSdkPaths(Sdk sdk) {
+  public void setupSdkPaths(@NotNull Sdk sdk) {
     final File jdkHome = new File(sdk.getHomePath());
     List<VirtualFile> classes = findClasses(jdkHome, false);
     VirtualFile sources = findSources(jdkHome);
@@ -427,10 +427,6 @@ public class JavaSdkImpl extends JavaSdk {
 
   @Override
   public JavaSdkVersion getVersion(@NotNull Sdk sdk) {
-    return getVersion1(sdk);
-  }
-
-  private static JavaSdkVersion getVersion1(Sdk sdk) {
     String version = sdk.getVersionString();
     if (version == null) return null;
     return JdkVersionUtil.getVersion(version);

java/java-psi-api/src/com/intellij/openapi/projectRoots/JavaVersionService.java

@@ -22,13 +22,14 @@ package com.intellij.openapi.projectRoots;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiUtil;
+import org.jetbrains.annotations.NotNull;
 
 public class JavaVersionService {
   public static JavaVersionService getInstance() {
     return ServiceManager.getService(JavaVersionService.class);
   }
 
-  public boolean isAtLeast(PsiElement element, JavaSdkVersion version) {
+  public boolean isAtLeast(@NotNull PsiElement element, @NotNull JavaSdkVersion version) {
     return PsiUtil.getLanguageLevel(element).isAtLeast(version.getMaxLanguageLevel());
   }
 }

platform/lang-api/src/com/intellij/openapi/projectRoots/SdkType.java

@@ -79,7 +79,7 @@ public abstract class SdkType implements SdkTypeId {
 
   public abstract String suggestSdkName(String currentSdkName, String sdkHome);
 
-  public void setupSdkPaths(Sdk sdk) {}
+  public void setupSdkPaths(@NotNull Sdk sdk) {}
 
   public boolean setupSdkPaths(final Sdk sdk, final SdkModel sdkModel) {
     setupSdkPaths(sdk);
@@ -88,8 +88,6 @@ public abstract class SdkType implements SdkTypeId {
 
   /**
    * @return Configurable object for the sdk's additional data or null if not applicable
-   * @param sdkModel
-   * @param sdkModificator
    */
   @Nullable
   public abstract AdditionalDataConfigurable createAdditionalDataConfigurable(SdkModel sdkModel, SdkModificator sdkModificator);
@@ -179,7 +177,7 @@ public abstract class SdkType implements SdkTypeId {
   }
 
   @Nullable
-  public String getDefaultDocumentationUrl(final @NotNull Sdk sdk) {
+  public String getDefaultDocumentationUrl(@NotNull final Sdk sdk) {
     return null;
   }