Changes names of kotlin gradle models to be less confusing

Author: Kordyjan

kotlin-eclipse-gradle-model/src/org/jetbrains/kotlin/gradle/model/GradleProjectForEclipse.kt

@@ -23,7 +23,7 @@ interface GradleProjectForEclipse : Serializable {
     	get() = emptyList()
 }
 
-data class GradleProjectForEclipseImpl(
+data class KotlinGradleProject(
     override val codestyle: String?,
     override val apiVersion: String?,
     override val languageVersion: String?,
@@ -33,6 +33,6 @@ data class GradleProjectForEclipseImpl(
     override val isKotlinProject: Boolean = true
 }
 
-object NoKotlinProject : GradleProjectForEclipse {
+object NonKotlinProject : GradleProjectForEclipse {
     override val isKotlinProject: Boolean = false
 }

kotlin-eclipse-gradle/scripts/init.gradle.kts

@@ -4,10 +4,10 @@ import org.gradle.api.Project
 import org.gradle.tooling.provider.model.ToolingModelBuilder
 import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry
 import org.jetbrains.kotlin.gradle.model.GradleProjectForEclipse
-import org.jetbrains.kotlin.gradle.model.GradleProjectForEclipseImpl
+import org.jetbrains.kotlin.gradle.model.KotlinGradleProject
 import org.jetbrains.kotlin.gradle.model.GradleMultiProjectForEclipse
 import org.jetbrains.kotlin.gradle.model.GradleMultiProjectForEclipseImpl
-import org.jetbrains.kotlin.gradle.model.NoKotlinProject
+import org.jetbrains.kotlin.gradle.model.NonKotlinProject
 import org.jetbrains.kotlin.gradle.model.CompilerPluginConfig
 import org.jetbrains.kotlin.gradle.model.AllOpen
 import org.jetbrains.kotlin.gradle.model.NoArg
@@ -40,7 +40,7 @@ class GradleProjectForEclipseBuilder() : ToolingModelBuilder {
 
     override fun canBuild(modelName: String) = (modelName == GradleMultiProjectForEclipse::class.qualifiedName)
 
-    override fun buildAll(modelName: String, project: Project): Any =
+    override fun buildAll(modelName: String, project: Project): GradleMultiProjectForEclipse =
         GradleMultiProjectForEclipseImpl(process(project).toMap())
 
     private fun process(project: Project): List<Pair<String, GradleProjectForEclipse>> =
@@ -51,14 +51,14 @@ class GradleProjectForEclipseBuilder() : ToolingModelBuilder {
         project.tasks.findByName("compileKotlin")
             ?.dynamicCall("kotlinOptions")
             ?.run {
-                GradleProjectForEclipseImpl(
+                KotlinGradleProject(
                     project.findProperty("kotlin.code.style") as? String,
                     property("apiVersion"),
                     property("languageVersion"),
                     property("jvmTarget"),
                     collectPlugins(project)
                 )
-            } ?: NoKotlinProject
+            } ?: NonKotlinProject
 
     private fun collectPlugins(project: Project): List<CompilerPluginConfig> {
         val result = arrayListOf<CompilerPluginConfig>()