diff --git a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java index fa565646092e..830972e887e0 100644 --- a/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/projectRoots/ui/SdkEditor.java @@ -379,7 +379,7 @@ public class SdkEditor implements Configurable, Place.Navigator { setHomePathValue(homePath.replace('/', File.separatorChar)); try { - final Sdk dummySdk = (Sdk)mySdk.clone(); + final Sdk dummySdk = mySdk.clone(); SdkModificator sdkModificator = dummySdk.getSdkModificator(); sdkModificator.setHomePath(homePath); sdkModificator.removeAllRoots(); diff --git a/java/java-tests/testSrc/com/intellij/roots/ModuleRootManagerTestCase.java b/java/java-tests/testSrc/com/intellij/roots/ModuleRootManagerTestCase.java index e2a9e4ff23a3..d90110bd9fc6 100644 --- a/java/java-tests/testSrc/com/intellij/roots/ModuleRootManagerTestCase.java +++ b/java/java-tests/testSrc/com/intellij/roots/ModuleRootManagerTestCase.java @@ -43,7 +43,7 @@ public abstract class ModuleRootManagerTestCase extends JavaModuleTestCase { @Contract(pure = true) private static @NotNull Sdk retainRtJarOnlyAndSetVersion(Sdk jdk) { try { - jdk = (Sdk)jdk.clone(); + jdk = jdk.clone(); } catch (CloneNotSupportedException e) { throw new RuntimeException(e); diff --git a/java/testFramework/src/com/intellij/JavaTestUtil.java b/java/testFramework/src/com/intellij/JavaTestUtil.java index 181f0fc08ca7..a1716a90598a 100644 --- a/java/testFramework/src/com/intellij/JavaTestUtil.java +++ b/java/testFramework/src/com/intellij/JavaTestUtil.java @@ -44,7 +44,7 @@ public final class JavaTestUtil { Sdk jdk = internalJdk; if (!internalJdk.getName().equals(finalJdkName)) { try { - Sdk copy = (Sdk)internalJdk.clone(); + Sdk copy = internalJdk.clone(); SdkModificator modificator = copy.getSdkModificator(); modificator.setName(finalJdkName); modificator.commitChanges(); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java index cd2733fa9a23..82fd02d2aa9a 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java @@ -84,7 +84,7 @@ public class ProjectSdksModel implements SdkModel { Sdk editableCopy; try { - editableCopy = (Sdk)sdk.clone(); + editableCopy = sdk.clone(); } catch (CloneNotSupportedException e) { LOG.error(e); @@ -104,7 +104,7 @@ public class ProjectSdksModel implements SdkModel { final Sdk[] projectSdks = jdkTable.getAllJdks(); for (Sdk sdk : projectSdks) { try { - Sdk editable = (Sdk)sdk.clone(); + Sdk editable = sdk.clone(); myProjectSdks.put(sdk, editable); SdkDownloadTracker.getInstance().registerEditableSdk(sdk, editable); } @@ -521,7 +521,7 @@ public class ProjectSdksModel implements SdkModel { public void doAdd(@NotNull Sdk newSdk, @Nullable java.util.function.Consumer updateTree) { myModified = true; try { - Sdk editableCopy = (Sdk)newSdk.clone(); + Sdk editableCopy = newSdk.clone(); myProjectSdks.put(newSdk, editableCopy); if (updateTree != null) { updateTree.accept(editableCopy); diff --git a/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/sdk/SdkBridgeImpl.kt b/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/sdk/SdkBridgeImpl.kt index a27960f2dcc9..f8fca942dbcc 100644 --- a/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/sdk/SdkBridgeImpl.kt +++ b/platform/lang-impl/src/com/intellij/workspaceModel/ide/impl/legacyBridge/sdk/SdkBridgeImpl.kt @@ -85,7 +85,7 @@ class SdkBridgeImpl(private var sdkEntityBuilder: SdkEntity.Builder) : UserDataH override fun getSdkAdditionalData(): SdkAdditionalData? = additionalData - override fun clone(): Any { + override fun clone(): SdkBridgeImpl { val sdkEntityClone = SdkTableBridgeImpl.createEmptySdkEntity("", "", "") sdkEntityClone.applyChangesFrom(sdkEntityBuilder) return SdkBridgeImpl(sdkEntityClone) diff --git a/platform/lang-impl/testSources/com/intellij/openapi/roots/SdkInRootModelTest.kt b/platform/lang-impl/testSources/com/intellij/openapi/roots/SdkInRootModelTest.kt index d1f084098a66..9aa73913c123 100644 --- a/platform/lang-impl/testSources/com/intellij/openapi/roots/SdkInRootModelTest.kt +++ b/platform/lang-impl/testSources/com/intellij/openapi/roots/SdkInRootModelTest.kt @@ -228,7 +228,7 @@ class SdkInRootModelTest { } private fun renameSdk(sdk: Sdk, newName: String) { - val clone = sdk.clone() as Sdk + val clone = sdk.clone() val modificator = clone.sdkModificator modificator.name = newName diff --git a/platform/projectModel-api/src/com/intellij/openapi/projectRoots/Sdk.java b/platform/projectModel-api/src/com/intellij/openapi/projectRoots/Sdk.java index d745e127a4fd..0951b7ffb74d 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/projectRoots/Sdk.java +++ b/platform/projectModel-api/src/com/intellij/openapi/projectRoots/Sdk.java @@ -33,5 +33,5 @@ public interface Sdk extends UserDataHolder { @Nullable SdkAdditionalData getSdkAdditionalData(); - @NotNull Object clone() throws CloneNotSupportedException; + @NotNull Sdk clone() throws CloneNotSupportedException; } diff --git a/platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.java b/platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.java index fdc07e952277..c3e8ce511840 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.java +++ b/platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.java @@ -547,7 +547,7 @@ public final class PsiTestUtil { public static Sdk modifyJdkRoots(@NotNull Sdk sdk, Consumer modifier) { Sdk clone; try { - clone = (Sdk)sdk.clone(); + clone = sdk.clone(); } catch (CloneNotSupportedException e) { throw new RuntimeException(e); diff --git a/plugins/devkit/devkit-core/src/run/PluginRunConfiguration.java b/plugins/devkit/devkit-core/src/run/PluginRunConfiguration.java index 96b0a539bc04..e55ba608eaae 100644 --- a/plugins/devkit/devkit-core/src/run/PluginRunConfiguration.java +++ b/plugins/devkit/devkit-core/src/run/PluginRunConfiguration.java @@ -149,7 +149,7 @@ public class PluginRunConfiguration extends RunConfigurationBase implem } else { try { - usedIdeaJdk = (Sdk)usedIdeaJdk.clone(); + usedIdeaJdk = usedIdeaJdk.clone(); } catch (CloneNotSupportedException e) { throw new ExecutionException(e.getMessage()); diff --git a/plugins/kotlin/j2k/new/tests/test/org/jetbrains/kotlin/nj2k/testUtils.kt b/plugins/kotlin/j2k/new/tests/test/org/jetbrains/kotlin/nj2k/testUtils.kt index 2a89a87afc51..2f60ee104e81 100644 --- a/plugins/kotlin/j2k/new/tests/test/org/jetbrains/kotlin/nj2k/testUtils.kt +++ b/plugins/kotlin/j2k/new/tests/test/org/jetbrains/kotlin/nj2k/testUtils.kt @@ -32,7 +32,7 @@ fun descriptorByFileDirective(testDataFile: File, languageLevel: LanguageLevel = override fun getSdk(): Sdk? { val sdk = descriptor.sdk ?: return null runWriteAction { - val modificator: SdkModificator = (sdk.clone() as Sdk).sdkModificator + val modificator: SdkModificator = sdk.clone().sdkModificator JavaSdkImpl.attachJdkAnnotations(modificator) modificator.commitChanges() }