azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KotlinProjectConfigurator: J2K

Browse Source
This commit is contained in:
Dmitry Jemerov
2016-10-17 16:37:24 +02:00
parent 7d442f9ca2
commit d8c7f2ffdb
5 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.kt
+2 -3
View File
@@ -38,9 +38,8 @@ class KotlinJavaMavenConfigurator : KotlinMavenConfigurator(KotlinJavaMavenConfi
createExecution(pomFile, kotlinPlugin, PomFile.DefaultPhases.TestCompile, PomFile.KotlinGoals.TestCompile, module, true) createExecution(pomFile, kotlinPlugin, PomFile.DefaultPhases.TestCompile, PomFile.KotlinGoals.TestCompile, module, true)
} }
override fun getTargetPlatform(): TargetPlatform { override val targetPlatform: TargetPlatform
return JvmPlatform get() = JvmPlatform
}
companion object { companion object {
private val NAME = "maven" private val NAME = "maven"
idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavascriptMavenConfigurator.kt
+2 -3
View File
@@ -38,9 +38,8 @@ class KotlinJavascriptMavenConfigurator : KotlinMavenConfigurator(KotlinJavascri
createExecution(pomFile, kotlinPlugin, PomFile.DefaultPhases.TestCompile, PomFile.KotlinGoals.TestJs, module, true) createExecution(pomFile, kotlinPlugin, PomFile.DefaultPhases.TestCompile, PomFile.KotlinGoals.TestJs, module, true)
} }
override fun getTargetPlatform(): TargetPlatform { override val targetPlatform: TargetPlatform
return JsPlatform get() = JsPlatform
}
companion object { companion object {
private val NAME = "js maven" private val NAME = "js maven"
idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.kt
+6 -7
View File
@@ -41,18 +41,17 @@ import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersi
import org.jetbrains.kotlin.idea.maven.PomFile import org.jetbrains.kotlin.idea.maven.PomFile
import org.jetbrains.kotlin.idea.maven.excludeMavenChildrenModules import org.jetbrains.kotlin.idea.maven.excludeMavenChildrenModules
abstract class KotlinMavenConfigurator protected constructor(private val stdlibArtifactId: String, private val testArtifactId: String?, private val addJunit: Boolean, private val name: String, private val presentableText: String) : KotlinProjectConfigurator { abstract class KotlinMavenConfigurator
protected constructor(private val stdlibArtifactId: String,
private val testArtifactId: String?,
private val addJunit: Boolean,
override val name: String,
override val presentableText: String) : KotlinProjectConfigurator {
override fun isApplicable(module: Module): Boolean { override fun isApplicable(module: Module): Boolean {
return KotlinPluginUtil.isMavenModule(module) return KotlinPluginUtil.isMavenModule(module)
} }
override fun getPresentableText() = presentableText
override fun getName(): String {
return name
}
override fun isConfigured(module: Module): Boolean { override fun isConfigured(module: Module): Boolean {
if (!isKotlinModule(module)) { if (!isKotlinModule(module)) {
return false return false
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java
+1 -1
View File
@@ -114,6 +114,6 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator
} }
public static KotlinJavaModuleConfigurator getInstance() { public static KotlinJavaModuleConfigurator getInstance() {
return Extensions.findExtension(EP_NAME, KotlinJavaModuleConfigurator.class); return Extensions.findExtension(Companion.getEP_NAME(), KotlinJavaModuleConfigurator.class);
} }
} }
idea/src/org/jetbrains/kotlin/idea/configuration/KotlinProjectConfigurator.kt
+15 -16
View File
@@ -14,29 +14,28 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.configuration; package org.jetbrains.kotlin.idea.configuration
import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.extensions.ExtensionPointName
import com.intellij.openapi.module.Module; import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project; import com.intellij.openapi.project.Project
import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.resolve.TargetPlatform
import org.jetbrains.kotlin.resolve.TargetPlatform;
import java.util.Collection; interface KotlinProjectConfigurator {
public interface KotlinProjectConfigurator { fun isConfigured(module: Module): Boolean
ExtensionPointName<KotlinProjectConfigurator> EP_NAME = ExtensionPointName.create("org.jetbrains.kotlin.projectConfigurator");
boolean isConfigured(@NotNull Module module); fun isApplicable(module: Module): Boolean
boolean isApplicable(@NotNull Module module); @JvmSuppressWildcards fun configure(project: Project, excludeModules: Collection<Module>)
void configure(@NotNull Project project, Collection<Module> excludeModules); val presentableText: String
@NotNull String getPresentableText(); val name: String
@NotNull String getName(); val targetPlatform: TargetPlatform
@NotNull companion object {
TargetPlatform getTargetPlatform(); val EP_NAME = ExtensionPointName.create<KotlinProjectConfigurator>("org.jetbrains.kotlin.projectConfigurator")
}
} }