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

JavaFrameworkType: J2K

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-07-19 15:34:34 +02:00
parent 079f7690a8
commit 0f2992ddec
3 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/framework/JSFrameworkSupportProvider.kt
+2 -2
View File
@@ -53,14 +53,14 @@ class JSFrameworkSupportProvider : FrameworkSupportInModuleProvider() {
FrameworksCompatibilityUtils.suggestRemoveIncompatibleFramework( FrameworksCompatibilityUtils.suggestRemoveIncompatibleFramework(
rootModel, rootModel,
JavaRuntimeLibraryDescription.SUITABLE_LIBRARY_KINDS, JavaRuntimeLibraryDescription.SUITABLE_LIBRARY_KINDS,
JavaFrameworkType.getInstance()) JavaFrameworkType.instance)
description.finishLibConfiguration(module, rootModel) description.finishLibConfiguration(module, rootModel)
} }
override fun onFrameworkSelectionChanged(selected: Boolean) { override fun onFrameworkSelectionChanged(selected: Boolean) {
if (selected) { if (selected) {
val providerId = JavaFrameworkType.getInstance().id val providerId = JavaFrameworkType.instance.id
if (model.isFrameworkSelected(providerId)) { if (model.isFrameworkSelected(providerId)) {
model.setFrameworkComponentEnabled(providerId, false) model.setFrameworkComponentEnabled(providerId, false)
} }
idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkSupportProvider.kt
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.KotlinPluginUtil
import javax.swing.JComponent import javax.swing.JComponent
internal class JavaFrameworkSupportProvider : FrameworkSupportInModuleProvider() { internal class JavaFrameworkSupportProvider : FrameworkSupportInModuleProvider() {
override fun getFrameworkType(): FrameworkTypeEx = JavaFrameworkType.getInstance() override fun getFrameworkType(): FrameworkTypeEx = JavaFrameworkType.instance
override fun createConfigurable(model: FrameworkSupportModel): FrameworkSupportInModuleConfigurable { override fun createConfigurable(model: FrameworkSupportModel): FrameworkSupportInModuleConfigurable {
return object : FrameworkSupportInModuleConfigurable() { return object : FrameworkSupportInModuleConfigurable() {
idea/src/org/jetbrains/kotlin/idea/framework/JavaFrameworkType.kt
+12 -28
View File
@@ -14,39 +14,23 @@
* limitations under the License. * limitations under the License.
*/ */
package org.jetbrains.kotlin.idea.framework; package org.jetbrains.kotlin.idea.framework
import com.intellij.framework.FrameworkTypeEx; import com.intellij.framework.FrameworkTypeEx
import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider; import com.intellij.framework.addSupport.FrameworkSupportInModuleProvider
import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.KotlinIcons
import org.jetbrains.kotlin.idea.KotlinIcons; import javax.swing.Icon
import javax.swing.*; class JavaFrameworkType : FrameworkTypeEx("kotlin-java-framework-id") {
public class JavaFrameworkType extends FrameworkTypeEx { override fun createProvider(): FrameworkSupportInModuleProvider = JavaFrameworkSupportProvider()
public static JavaFrameworkType getInstance() {
return FrameworkTypeEx.EP_NAME.findExtension(JavaFrameworkType.class);
}
public JavaFrameworkType() { override fun getPresentableName() = "Kotlin (Java)"
super("kotlin-java-framework-id");
}
@NotNull override fun getIcon(): Icon = KotlinIcons.SMALL_LOGO
@Override
public FrameworkSupportInModuleProvider createProvider() {
return new JavaFrameworkSupportProvider();
}
@NotNull companion object {
@Override val instance: JavaFrameworkType
public String getPresentableName() { get() = FrameworkTypeEx.EP_NAME.findExtension(JavaFrameworkType::class.java)
return "Kotlin (Java)";
}
@NotNull
@Override
public Icon getIcon() {
return KotlinIcons.SMALL_LOGO;
} }
} }