Cleanup (duplication)

java/execution/impl/src/com/intellij/execution/util/JreVersionDetector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.execution.util;
 
 import com.intellij.execution.CommonJavaRunConfigurationParameters;
 import com.intellij.execution.configurations.ModuleBasedConfiguration;
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.projectRoots.JavaSdk;
 import com.intellij.openapi.projectRoots.JavaSdkVersion;
 import com.intellij.openapi.projectRoots.Sdk;
+import com.intellij.openapi.projectRoots.ex.JavaSdkUtil;
+import com.intellij.openapi.projectRoots.impl.SdkVersionUtil;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.Comparing;
-import org.jetbrains.annotations.Nullable;
+import com.intellij.openapi.util.text.StringUtil;
 
 public class JreVersionDetector {
   private String myLastAlternativeJrePath ; //awful hack
@@ -41,25 +41,29 @@ public class JreVersionDetector {
 
   public boolean isJre50Configured(final CommonJavaRunConfigurationParameters configuration) {
     if (configuration.isAlternativeJrePathEnabled()) {
-      if (Comparing.equal(configuration.getAlternativeJrePath(), myLastAlternativeJrePath)) {
+      String alternativeJrePath = configuration.getAlternativeJrePath();
+      if (!StringUtil.isEmptyOrSpaces(alternativeJrePath)) {
+        if (Comparing.equal(alternativeJrePath, myLastAlternativeJrePath)) {
+          return myLastIsJre50;
+        }
+
+        myLastAlternativeJrePath = alternativeJrePath;
+        String versionString = SdkVersionUtil.detectJdkVersion(myLastAlternativeJrePath);
+        myLastIsJre50 = versionString != null && isJre50(versionString);
         return myLastIsJre50;
       }
-      myLastAlternativeJrePath = configuration.getAlternativeJrePath();
-      final String versionString = JavaSdk.getJdkVersion(myLastAlternativeJrePath);
-      myLastIsJre50 = versionString != null && isJre50(versionString);
-      return myLastIsJre50;
     }
+
     return false;
   }
 
-  private static boolean isJre50(final Sdk jdk) {
-    if (jdk == null) return false;
-    return JavaSdk.getInstance().isOfVersionOrHigher(jdk, JavaSdkVersion.JDK_1_5);
+  private static boolean isJre50(Sdk jdk) {
+    return JavaSdkUtil.isJdkAtLeast(jdk, JavaSdkVersion.JDK_1_5);
   }
 
-  private static boolean isJre50(final @Nullable String versionString) {
+  private static boolean isJre50(String versionString) {
     if (versionString == null) return false;
-    JavaSdkVersion version = JavaSdk.getInstance().getVersion(versionString);
+    JavaSdkVersion version = JavaSdkVersion.fromVersionString(versionString);
     return version != null && version.isAtLeast(JavaSdkVersion.JDK_1_5);
   }
 }

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

@@ -330,7 +330,7 @@ public class JavaSdkImpl extends JavaSdk {
   public final String getVersionString(String sdkHome) {
     String versionString = myCachedVersionStrings.get(sdkHome);
     if (versionString == null) {
-      versionString = getJdkVersion(sdkHome);
+      versionString = SdkVersionUtil.detectJdkVersion(sdkHome);
       if (!StringUtil.isEmpty(versionString)) {
         myCachedVersionStrings.put(sdkHome, versionString);
       }

java/openapi/src/com/intellij/openapi/projectRoots/JavaSdk.java

@@ -57,7 +57,7 @@ public abstract class JavaSdk extends SdkType implements JavaSdkType {
     return JdkUtil.checkForJre(file);
   }
 
-  @Nullable
+  /** @deprecated use {@link SdkVersionUtil#detectJdkVersion} (to be removed in IDEA 2019) */
   public static String getJdkVersion(@NotNull String sdkHome) {
     return SdkVersionUtil.detectJdkVersion(sdkHome);
   }