From edf572511ad37552ed5f310283c9bb981db7a560 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 18 Apr 2017 16:25:24 +0200 Subject: [PATCH] Cleanup (deprecated API) --- .../intellij/debugger/ui/impl/watch/CompilingEvaluator.java | 3 +-- .../src/com/intellij/codeInspection/JavaSuppressionUtil.java | 3 +-- .../src/com/intellij/openapi/projectRoots/ex/JavaSdkUtil.java | 2 +- .../intellij/openapi/projectRoots/impl/JavaHomeFinder.java | 4 ++-- .../com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java | 4 ++-- .../intellij/openapi/projectRoots/impl/WindowsJavaFinder.java | 4 ++-- .../com/intellij/openapi/projectRoots/JavaSdkVersionUtil.java | 4 ++-- .../plugins/javaFX/sceneBuilder/SceneBuilderImpl.java | 3 +-- 8 files changed, 12 insertions(+), 15 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/CompilingEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/CompilingEvaluator.java index 689924a31cbd..4caeb947277c 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/CompilingEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/CompilingEvaluator.java @@ -31,7 +31,6 @@ import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.compiler.ClassObject; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.JavaSdkVersion; -import com.intellij.openapi.projectRoots.JdkVersionUtil; import com.intellij.psi.PsiElement; import com.intellij.refactoring.extractMethodObject.ExtractLightMethodObjectHandler; import com.sun.jdi.ClassLoaderReference; @@ -80,7 +79,7 @@ public abstract class CompilingEvaluator implements ExpressionEvaluator { autoLoadContext.setClassLoader(classLoader); String version = ((VirtualMachineProxyImpl)process.getVirtualMachineProxy()).version(); - Collection classes = compile(JdkVersionUtil.getVersion(version)); + Collection classes = compile(JavaSdkVersion.fromVersionString(version)); defineClasses(classes, autoLoadContext, process, classLoader); diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/JavaSuppressionUtil.java b/java/java-analysis-impl/src/com/intellij/codeInspection/JavaSuppressionUtil.java index cf5847a0a56f..59d65117adb7 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/JavaSuppressionUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/JavaSuppressionUtil.java @@ -24,7 +24,6 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.JavaSdkVersion; -import com.intellij.openapi.projectRoots.JdkVersionUtil; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.util.Computable; @@ -330,7 +329,7 @@ public class JavaSuppressionUtil { private static JavaSdkVersion getVersion(@NotNull Sdk sdk) { String version = sdk.getVersionString(); if (version == null) return null; - return JdkVersionUtil.getVersion(version); + return JavaSdkVersion.fromVersionString(version); } @Nullable diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/ex/JavaSdkUtil.java b/java/java-impl/src/com/intellij/openapi/projectRoots/ex/JavaSdkUtil.java index d89c1d153700..34917ed7a633 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/ex/JavaSdkUtil.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/ex/JavaSdkUtil.java @@ -71,7 +71,7 @@ public class JavaSdkUtil { private static boolean isJdkSupportsLevel(@Nullable final Sdk jdk, @NotNull LanguageLevel level) { if (jdk == null) return true; String versionString = jdk.getVersionString(); - JavaSdkVersion version = versionString == null ? null : JdkVersionUtil.getVersion(versionString); + JavaSdkVersion version = versionString == null ? null : JavaSdkVersion.fromVersionString(versionString); return version != null && version.getMaxLanguageLevel().isAtLeast(level); } diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java index 3e63247dcfdd..8aafb4433d8e 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaHomeFinder.java @@ -17,8 +17,8 @@ package com.intellij.openapi.projectRoots.impl; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.execution.util.ExecUtil; +import com.intellij.openapi.projectRoots.JavaSdkVersion; import com.intellij.openapi.projectRoots.JdkUtil; -import com.intellij.openapi.projectRoots.JdkVersionUtil; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.SystemInfo; import org.jetbrains.annotations.NotNull; @@ -39,7 +39,7 @@ public abstract class JavaHomeFinder { @NotNull public static List suggestHomePaths() { List paths = new ArrayList<>(new HashSet<>(getFinder().findExistingJdks())); - paths.sort((o1, o2) -> Comparing.compare(JdkVersionUtil.getVersion(o2), JdkVersionUtil.getVersion(o1))); + paths.sort((o1, o2) -> Comparing.compare(JavaSdkVersion.fromVersionString(o2), JavaSdkVersion.fromVersionString(o1))); return paths; } diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java index 77a5e7bd00cf..e7435953af9b 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java @@ -340,13 +340,13 @@ public class JavaSdkImpl extends JavaSdk { public JavaSdkVersion getVersion(@NotNull Sdk sdk) { String version = sdk.getVersionString(); if (version == null) return null; - return JdkVersionUtil.getVersion(version); + return JavaSdkVersion.fromVersionString(version); } @Override @Nullable public JavaSdkVersion getVersion(@NotNull String versionString) { - return JdkVersionUtil.getVersion(versionString); + return JavaSdkVersion.fromVersionString(versionString); } @Override diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/WindowsJavaFinder.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/WindowsJavaFinder.java index 0cb5b45f130d..a2a2f9971a27 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/WindowsJavaFinder.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/WindowsJavaFinder.java @@ -15,7 +15,7 @@ */ package com.intellij.openapi.projectRoots.impl; -import com.intellij.openapi.projectRoots.JdkVersionUtil; +import com.intellij.openapi.projectRoots.JavaSdkVersion; import com.intellij.openapi.util.Comparing; import org.jetbrains.annotations.NotNull; @@ -57,7 +57,7 @@ class WindowsJavaFinder extends JavaHomeFinder { scanFolder(new File(anotherJavasFolder, javasFolder.getName()), result); } } - result.sort((o1, o2) -> Comparing.compare(JdkVersionUtil.getVersion(o2), JdkVersionUtil.getVersion(o1))); + result.sort((o1, o2) -> Comparing.compare(JavaSdkVersion.fromVersionString(o2), JavaSdkVersion.fromVersionString(o1))); return result; } } diff --git a/java/openapi/src/com/intellij/openapi/projectRoots/JavaSdkVersionUtil.java b/java/openapi/src/com/intellij/openapi/projectRoots/JavaSdkVersionUtil.java index 9d8c10413c08..7120a2bcf4db 100644 --- a/java/openapi/src/com/intellij/openapi/projectRoots/JavaSdkVersionUtil.java +++ b/java/openapi/src/com/intellij/openapi/projectRoots/JavaSdkVersionUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 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. @@ -37,7 +37,7 @@ public class JavaSdkVersionUtil { final Sdk sdk = ModuleRootManager.getInstance(module).getSdk(); if (sdk != null && sdk.getSdkType() instanceof JavaSdk) { String version = sdk.getVersionString(); - return version == null ? null : JdkVersionUtil.getVersion(version); + return version == null ? null : JavaSdkVersion.fromVersionString(version); } } return null; diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java index 90932adb5d82..0a05ea92ab8a 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/sceneBuilder/SceneBuilderImpl.java @@ -7,7 +7,6 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.JavaSdkVersion; -import com.intellij.openapi.projectRoots.JdkVersionUtil; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.*; import com.intellij.openapi.roots.libraries.LibraryUtil; @@ -224,7 +223,7 @@ public class SceneBuilderImpl implements SceneBuilder { if (jdk == null) return true; final String versionString = jdk.getVersionString(); if (versionString != null) { - final JavaSdkVersion jdkVersion = JdkVersionUtil.getVersion(versionString); + final JavaSdkVersion jdkVersion = JavaSdkVersion.fromVersionString(versionString); if (jdkVersion != null) { return targetLevel.isAtLeast(jdkVersion.getMaxLanguageLevel()); }