From da9a25fd213b4ab8d8f19efb8b58de94b8a5230b Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 16 Oct 2019 14:38:56 +0300 Subject: [PATCH] Minor: remove useless overrides --- .../kotlin/idea/test/KotlinJdkAndLibraryProjectDescriptor.kt | 5 ----- .../idea/test/KotlinJdkAndMultiplatformStdlibDescriptor.kt | 4 ---- .../kotlin/idea/test/KotlinStdJSProjectDescriptor.kt | 3 --- 3 files changed, 12 deletions(-) diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinJdkAndLibraryProjectDescriptor.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinJdkAndLibraryProjectDescriptor.kt index 246091fad01..2f59d186048 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinJdkAndLibraryProjectDescriptor.kt +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinJdkAndLibraryProjectDescriptor.kt @@ -17,14 +17,11 @@ package org.jetbrains.kotlin.idea.test import com.intellij.openapi.module.Module -import com.intellij.openapi.module.ModuleType -import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor import com.intellij.openapi.vfs.VfsUtil - import java.io.File open class KotlinJdkAndLibraryProjectDescriptor(private val libraryFiles: List) : KotlinLightProjectDescriptor() { @@ -37,8 +34,6 @@ open class KotlinJdkAndLibraryProjectDescriptor(private val libraryFiles: List = StdModuleTypes.JAVA - override fun getSdk(): Sdk? = PluginTestCaseBase.mockJdk() override fun configureModule(module: Module, model: ModifiableRootModel) { diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinJdkAndMultiplatformStdlibDescriptor.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinJdkAndMultiplatformStdlibDescriptor.kt index 6c55240801e..e3e2ed34b95 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinJdkAndMultiplatformStdlibDescriptor.kt +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinJdkAndMultiplatformStdlibDescriptor.kt @@ -6,8 +6,6 @@ package org.jetbrains.kotlin.idea.test import com.intellij.openapi.module.Module -import com.intellij.openapi.module.ModuleType -import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.OrderRootType @@ -18,8 +16,6 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import java.io.File class KotlinJdkAndMultiplatformStdlibDescriptor private constructor(private val withSources: Boolean) : KotlinLightProjectDescriptor() { - override fun getModuleType(): ModuleType<*> = StdModuleTypes.JAVA - override fun getSdk(): Sdk? = PluginTestCaseBase.mockJdk8() override fun configureModule(module: Module, model: ModifiableRootModel) { diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt index 7ad7dbbfe7c..6c45cf78adf 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinStdJSProjectDescriptor.kt @@ -17,8 +17,6 @@ package org.jetbrains.kotlin.idea.test import com.intellij.openapi.module.Module -import com.intellij.openapi.module.ModuleType -import com.intellij.openapi.module.StdModuleTypes import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.roots.ModifiableRootModel import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor @@ -26,7 +24,6 @@ import org.jetbrains.kotlin.idea.framework.JSLibraryKind import org.jetbrains.kotlin.idea.framework.JSLibraryStdDescription object KotlinStdJSProjectDescriptor : KotlinLightProjectDescriptor() { - override fun getModuleType(): ModuleType<*> = StdModuleTypes.JAVA override fun getSdk(): Sdk? = null override fun configureModule(module: Module, model: ModifiableRootModel) {