From dcc1959f38427fb2929f992f0ec63142bd5cd1a8 Mon Sep 17 00:00:00 2001 From: Sergei Vorobyov Date: Mon, 20 Jun 2022 15:46:41 +0300 Subject: [PATCH] IJ-CR-25995 added custom project builder plugin validation instead all available builder ids enum validator GitOrigin-RevId: 7aa1876c752be6a6a8acd20615dc0d8097e55de9 --- .../impl/module/CloudModuleBuilder.java | 4 +- .../NewProjectWizardCollector.kt | 43 +++++++++-- .../NewProjectWizardConstants.kt | 73 ------------------- .../NewProjectLinkNewProjectWizardStep.kt | 2 +- .../src/META-INF/PlatformExtensions.xml | 1 + .../src/module/IdePluginModuleBuilder.kt | 3 +- .../wizard/InternalGradleModuleBuilder.java | 7 -- .../config/GroovyAwareModuleBuilder.java | 4 +- .../javaFX/wizard/JavaFxModuleBuilder.kt | 3 +- .../ComposeModuleBuilder.kt | 4 +- .../wizard/NewProjectWizardModuleBuilder.kt | 3 +- .../wizards/InternalMavenModuleBuilder.java | 7 -- .../MavenArchetypeNewProjectWizard.kt | 3 +- 13 files changed, 44 insertions(+), 113 deletions(-) diff --git a/java/remote-servers/impl/src/com/intellij/remoteServer/impl/module/CloudModuleBuilder.java b/java/remote-servers/impl/src/com/intellij/remoteServer/impl/module/CloudModuleBuilder.java index 68e5be8edda7..e06cc1edaf91 100644 --- a/java/remote-servers/impl/src/com/intellij/remoteServer/impl/module/CloudModuleBuilder.java +++ b/java/remote-servers/impl/src/com/intellij/remoteServer/impl/module/CloudModuleBuilder.java @@ -27,8 +27,6 @@ import javax.swing.*; import java.util.HashMap; import java.util.Map; -import static com.intellij.ide.projectWizard.NewProjectWizardConstants.Generators; - public class CloudModuleBuilder extends JavaModuleBuilder { @@ -62,7 +60,7 @@ public class CloudModuleBuilder extends JavaModuleBuilder { @Override public @NonNls String getBuilderId() { - return Generators.CLOUD; + return "Cloud"; } @Override diff --git a/platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardCollector.kt b/platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardCollector.kt index bcbf58e88738..73079862284a 100644 --- a/platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardCollector.kt +++ b/platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardCollector.kt @@ -13,7 +13,11 @@ import com.intellij.ide.wizard.NewProjectWizardStep import com.intellij.internal.statistic.eventLog.EventLogGroup import com.intellij.internal.statistic.eventLog.FeatureUsageData import com.intellij.internal.statistic.eventLog.events.* +import com.intellij.internal.statistic.eventLog.validator.ValidationResultType +import com.intellij.internal.statistic.eventLog.validator.rules.EventContext +import com.intellij.internal.statistic.eventLog.validator.rules.impl.CustomValidationRule import com.intellij.internal.statistic.service.fus.collectors.CounterUsagesCollector +import com.intellij.internal.statistic.utils.getPluginInfo import com.intellij.openapi.project.Project import com.intellij.openapi.projectRoots.Sdk import com.intellij.util.lang.JavaVersion @@ -31,7 +35,7 @@ class NewProjectWizardCollector : CounterUsagesCollector() { private val screenNumField = EventFields.Int("screen") private val typedCharsField = IntEventField("typed_chars") private val hitsField = IntEventField("hits") - private val generatorTypeField = BoundedStringEventField.enum("generator", *NewProjectWizardConstants.Generators.ALL) + private val generatorTypeField = GeneratorEventField("generator") private val languageField = BoundedStringEventField.lowercase("language", *NewProjectWizardConstants.Language.ALL) private val gitField = EventFields.Boolean("git") private val isSucceededField = EventFields.Boolean("project_created") @@ -86,11 +90,11 @@ class NewProjectWizardCollector : CounterUsagesCollector() { @JvmStatic fun logOpen(context: WizardContext) = open.log(context.project,sessionIdField with context.sessionId.id, screenNumField with context.screen) @JvmStatic fun logFinish(context: WizardContext, success: Boolean, duration: Long) = finish.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, isSucceededField with success, EventFields.DurationMs with duration) @JvmStatic fun logSearchChanged(context: WizardContext, chars: Int, results: Int) = search.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, typedCharsField with min(chars, 10), hitsField with results) - @JvmStatic fun logLocationChanged(context: WizardContext, generator: String) = location.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, generatorTypeField with generator) - @JvmStatic fun logNameChanged(context: WizardContext, generator: String) = name.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, generatorTypeField with generator) + @JvmStatic fun logLocationChanged(context: WizardContext, generator: ModuleBuilder?) = location.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, generatorTypeField with generator) + @JvmStatic fun logNameChanged(context: WizardContext, generator: ModuleBuilder?) = name.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, generatorTypeField with generator) @JvmStatic fun logLanguageChanged(context: WizardContext, language: String) = languageSelected.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, languageField with language) @JvmStatic fun logGitChanged(context: WizardContext) = gitChanged.log(context.project,screenNumField with context.screen) - @JvmStatic fun logGeneratorSelected(context: WizardContext, generator: String) = generatorSelected.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, generatorTypeField with generator) + @JvmStatic fun logGeneratorSelected(context: WizardContext, generator: ModuleBuilder?) = generatorSelected.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, generatorTypeField with generator) @JvmStatic fun logCustomTemplateSelected(context: WizardContext) = templateSelected.log(context.project,screenNumField with context.screen) @JvmStatic fun logNext(context: WizardContext, inputMask: Long = -1) = next.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, inputMaskField with inputMask) @JvmStatic fun logPrev(context: WizardContext, inputMask: Long = -1) = prev.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, inputMaskField with inputMask) @@ -100,7 +104,7 @@ class NewProjectWizardCollector : CounterUsagesCollector() { @JvmStatic fun logProjectCreated(project: Project?, context: WizardContext) = projectCreated.log(project,screenNumField with context.screen) @JvmStatic fun logLanguageFinished(context: WizardContext, language: String) = languageFinished.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, languageField with language) @JvmStatic fun logGitFinished(context: WizardContext, git: Boolean) = gitFinish.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, gitField with git) - @JvmStatic fun logGeneratorFinished(context: WizardContext, generator: String) = generatorFinished.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, generatorTypeField with generator) + @JvmStatic fun logGeneratorFinished(context: WizardContext, generator: ModuleBuilder?) = generatorFinished.log(context.project, sessionIdField with context.sessionId.id,screenNumField with context.screen, generatorTypeField with generator) @JvmStatic fun logAddPlugin(context: WizardContext) = addPlugin.log(context.project,screenNumField with context.screen) @JvmStatic fun logPluginSelected(context: WizardContext, plugin: String) = pluginSelected.log(context.project, sessionIdField with context.sessionId.id, screenNumField with context.screen, pluginField with plugin) @@ -114,9 +118,8 @@ class NewProjectWizardCollector : CounterUsagesCollector() { private val Sdk.featureVersion: Int? get() = JavaVersion.tryParse(versionString)?.feature - private val WizardContext.generator: String - get() = (projectBuilder as? ModuleBuilder)?.builderId?.removePrefix(NPW_PREFIX) - ?: OTHER + private val WizardContext.generator: ModuleBuilder? + get() = projectBuilder as? ModuleBuilder private val NewProjectWizardStep.language: String get() = (this as? LanguageNewProjectWizardData)?.language @@ -212,4 +215,28 @@ class NewProjectWizardCollector : CounterUsagesCollector() { } } } + + private class GeneratorEventField(override val name: String) : PrimitiveEventField() { + + override fun addData(fuData: FeatureUsageData, value: ModuleBuilder?) { + fuData.addPluginInfo(value?.let { getPluginInfo(it.javaClass) }) + fuData.addData(name, value?.builderId?.removePrefix(NPW_PREFIX) ?: OTHER) + } + + override val validationRule: List + get() = listOf("{util#${GeneratorValidationRule.ID}}") + } + + class GeneratorValidationRule : CustomValidationRule() { + override fun getRuleId(): String = ID + + override fun doValidate(data: String, context: EventContext): ValidationResultType { + if (isThirdPartyValue(data) || OTHER == data) return ValidationResultType.ACCEPTED + return acceptWhenReportedByPluginFromPluginRepository(context) + } + + companion object { + const val ID = "npw_generator" + } + } } \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardConstants.kt b/platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardConstants.kt index 97921051565f..ea7e9c4a04b9 100644 --- a/platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardConstants.kt +++ b/platform/platform-impl/src/com/intellij/ide/projectWizard/NewProjectWizardConstants.kt @@ -32,79 +32,6 @@ object NewProjectWizardConstants { const val EMPTY_WEB_PROJECT = "empty-web-project" const val SIMPLE_PROJECT = "simple-project" const val SIMPLE_MODULE = "simple-module" - - const val ALL_REACT = "AllReact" - const val ALL_HTML5 = "AllHTML5" - const val DJANGO = "django" - const val FAST_API = "FastApi" - const val FLASK = "Flask" - const val MAVEN_ARCHETYPE = "MavenArchetype" - - const val ANGULAR_CLI = "AngularCLI" - const val COMPOSER = "Composer" - const val CORDOVA = "Cordova" - const val DART = "Dart" - const val DRUPAL = "Drupal" - const val EXPRESS_APP = "ExpressApp" - const val HTML5 = "HTML5" - const val JOOMLA = "Joomla" - const val METEOR = "Meteor" - const val NODE_JS = "NodeJS" - const val PHP = "PHP" - const val PHP_STORM_WORKSHOP = "PhpStormWorkshop" - const val R_PROJECT = "R_PROJECT" - const val R_PACKAGE = "R_PACKAGE" - const val REACT = "React" - const val REACT_NATIVE = "ReactNative" - const val TWITTER = "TwitterBootstrap" - const val VUE_JS = "VueJS" - const val WORD_PRESS = "WordPress" - - const val ANDROID = "Android" - const val CLOUD = "Cloud" - const val COMPOSE = "ComposeModuleBuilder" - const val GAUGE = "gauge" - const val GRAILS_FORGE = "GrailsForge" - const val GRAILS = "Grails" - const val GROOVY = "groovy" - const val HELIDON = "helidon" - const val IDEA_PLUGIN = "idea-plugin" - const val JAVAEE = "javaee" - const val JAVAFX = "javafx" - const val KTOR = "KtorStarter" - const val MICRONAUT = "micronaut" - const val QUARKUS = "quarkus-jetbrains" - const val PUPPET = "Puppet" - const val RUBY_GEM = "RubyGem" - const val RUBY_ON_RAILS = "RubyOnRails" - const val SELENIUM = "selenium" - const val SPRING_INITIALIZR = "SpringInitializr" - const val YEOMAN = "Yeoman" - - const val FLASH = "Flex" - const val KOTLIN_MPP = "kotlin.newProjectWizard.builder" - - const val LEGACY_DART = "DartModuleBuilder" - const val LEGACY_GRADLE = "InternalGradleModuleBuilder" - const val LEGACY_MAVEN = "InternalMavenModuleBuilder" - const val LEGACY_JAVA_EE = "LegacyJavaEE" - const val LEGACY_SPRING = "LegacySpring" - - val ALL = arrayOf( - EMPTY_PROJECT, EMPTY_WEB_PROJECT, SIMPLE_PROJECT, SIMPLE_MODULE, - - ALL_REACT, ALL_HTML5, DJANGO, FAST_API, FLASK, MAVEN_ARCHETYPE, - - ANGULAR_CLI, COMPOSER, CORDOVA, DART, DRUPAL, EXPRESS_APP, HTML5, JOOMLA, METEOR, NODE_JS, PHP, PHP_STORM_WORKSHOP, R_PROJECT, - R_PACKAGE, REACT, REACT_NATIVE, TWITTER, VUE_JS, WORD_PRESS, - - ANDROID, CLOUD, COMPOSE, GAUGE, GRAILS_FORGE, GRAILS, GROOVY, HELIDON, IDEA_PLUGIN, JAVAEE, JAVAFX, KTOR, MICRONAUT, QUARKUS, PUPPET, - RUBY_GEM, RUBY_ON_RAILS, SELENIUM, SPRING_INITIALIZR, YEOMAN, - - FLASH, KOTLIN_MPP, - - LEGACY_DART, LEGACY_GRADLE, LEGACY_MAVEN, LEGACY_JAVA_EE, LEGACY_SPRING - ) } const val OTHER = "other" diff --git a/platform/platform-impl/src/com/intellij/ide/wizard/util/NewProjectLinkNewProjectWizardStep.kt b/platform/platform-impl/src/com/intellij/ide/wizard/util/NewProjectLinkNewProjectWizardStep.kt index 8fe94d8c5626..a21434ea5162 100644 --- a/platform/platform-impl/src/com/intellij/ide/wizard/util/NewProjectLinkNewProjectWizardStep.kt +++ b/platform/platform-impl/src/com/intellij/ide/wizard/util/NewProjectLinkNewProjectWizardStep.kt @@ -10,7 +10,7 @@ abstract class NewProjectLinkNewProjectWizardStep(parent: NewProjectWizardStep) private val builder = if (context.isCreatingNewProject) NewProjectBuilder() else NewModuleBuilder() - override val builderId: String = builder.builderId!! + override val builderId: String = builder.builderId override val comment: String by lazy { getComment(builder.presentableName) } diff --git a/platform/platform-resources/src/META-INF/PlatformExtensions.xml b/platform/platform-resources/src/META-INF/PlatformExtensions.xml index 77655934260a..6317d5cbd774 100644 --- a/platform/platform-resources/src/META-INF/PlatformExtensions.xml +++ b/platform/platform-resources/src/META-INF/PlatformExtensions.xml @@ -800,6 +800,7 @@ + diff --git a/plugins/devkit/devkit-core/src/module/IdePluginModuleBuilder.kt b/plugins/devkit/devkit-core/src/module/IdePluginModuleBuilder.kt index c8bd7d494aba..52a07fbea7a9 100644 --- a/plugins/devkit/devkit-core/src/module/IdePluginModuleBuilder.kt +++ b/plugins/devkit/devkit-core/src/module/IdePluginModuleBuilder.kt @@ -5,7 +5,6 @@ import com.intellij.icons.AllIcons import com.intellij.ide.fileTemplates.FileTemplateManager import com.intellij.ide.plugins.PluginManager import com.intellij.ide.projectView.actions.MarkRootActionBase -import com.intellij.ide.projectWizard.NewProjectWizardConstants.Generators import com.intellij.ide.starters.local.* import com.intellij.ide.starters.local.wizard.StarterInitialStep import com.intellij.ide.starters.shared.* @@ -41,7 +40,7 @@ class IdePluginModuleBuilder : StarterModuleBuilder() { private val PLUGIN_TYPE_KEY: Key = Key.create("ide.plugin.type") - override fun getBuilderId(): String = Generators.IDEA_PLUGIN + override fun getBuilderId(): String = "idea-plugin" override fun getPresentableName(): String = DevKitBundle.message("module.builder.title") override fun getWeight(): Int = IJ_PLUGIN_WEIGHT override fun getNodeIcon(): Icon = AllIcons.Nodes.Plugin diff --git a/plugins/gradle/java/src/service/project/wizard/InternalGradleModuleBuilder.java b/plugins/gradle/java/src/service/project/wizard/InternalGradleModuleBuilder.java index 1bfb60b785e4..a89439995a5d 100644 --- a/plugins/gradle/java/src/service/project/wizard/InternalGradleModuleBuilder.java +++ b/plugins/gradle/java/src/service/project/wizard/InternalGradleModuleBuilder.java @@ -12,16 +12,9 @@ import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; -import static com.intellij.ide.projectWizard.NewProjectWizardConstants.Generators; - @ApiStatus.Internal public final class InternalGradleModuleBuilder extends AbstractGradleModuleBuilder { - @Override - public String getBuilderId() { - return Generators.LEGACY_GRADLE; - } - @Override public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider) { return new ModuleWizardStep[]{new GradleStructureWizardStep(this, wizardContext)}; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java index 6d668cf329f6..02d20e75b17c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/config/GroovyAwareModuleBuilder.java @@ -22,8 +22,6 @@ import org.jetbrains.plugins.groovy.config.wizard.GroovyProjectWizardUtils; import javax.swing.*; -import static com.intellij.ide.projectWizard.NewProjectWizardConstants.Generators; - /** * @author peter */ @@ -72,7 +70,7 @@ public final class GroovyAwareModuleBuilder extends JavaModuleBuilder { @Override public @NonNls String getBuilderId() { - return Generators.GROOVY; + return "groovy"; } public void addGroovySample(@NotNull String path) { diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/wizard/JavaFxModuleBuilder.kt b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/wizard/JavaFxModuleBuilder.kt index 9ab868349f5b..15ac7631bc78 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/wizard/JavaFxModuleBuilder.kt +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/wizard/JavaFxModuleBuilder.kt @@ -3,7 +3,6 @@ package org.jetbrains.plugins.javaFX.wizard import com.intellij.icons.AllIcons import com.intellij.ide.fileTemplates.FileTemplateManager -import com.intellij.ide.projectWizard.NewProjectWizardConstants.Generators import com.intellij.ide.starters.local.* import com.intellij.ide.starters.local.StandardAssetsProvider import com.intellij.ide.starters.shared.* @@ -16,7 +15,7 @@ import org.jetbrains.plugins.javaFX.JavaFXBundle import javax.swing.Icon internal class JavaFxModuleBuilder : StarterModuleBuilder() { - override fun getBuilderId(): String = Generators.JAVAFX + override fun getBuilderId(): String = "javafx" override fun getNodeIcon(): Icon = AllIcons.Nodes.Module override fun getPresentableName(): String = JavaFXBundle.JAVA_FX override fun getDescription(): String = JavaFXBundle.message("javafx.module.builder.description") diff --git a/plugins/kotlin/project-wizard-compose/src/org/jetbrains/kotlin/tools/composeProjectWizard/ComposeModuleBuilder.kt b/plugins/kotlin/project-wizard-compose/src/org/jetbrains/kotlin/tools/composeProjectWizard/ComposeModuleBuilder.kt index 1abbfe83f4c6..d305ea308492 100644 --- a/plugins/kotlin/project-wizard-compose/src/org/jetbrains/kotlin/tools/composeProjectWizard/ComposeModuleBuilder.kt +++ b/plugins/kotlin/project-wizard-compose/src/org/jetbrains/kotlin/tools/composeProjectWizard/ComposeModuleBuilder.kt @@ -2,7 +2,6 @@ package org.jetbrains.kotlin.tools.composeProjectWizard import com.intellij.ide.fileTemplates.FileTemplateManager -import com.intellij.ide.projectWizard.NewProjectWizardConstants.Generators import com.intellij.ide.starters.local.* import com.intellij.ide.starters.local.StandardAssetsProvider import com.intellij.ide.starters.local.wizard.StarterInitialStep @@ -25,8 +24,7 @@ class ComposeModuleBuilder : StarterModuleBuilder() { val COMPOSE_PLATFORM_KEY: Key = Key.create("compose.platform") } - - override fun getBuilderId(): String = Generators.COMPOSE + override fun getBuilderId(): String = "ComposeModuleBuilder" override fun getPresentableName(): String = ComposeProjectWizardBundle.message("module.presentation.name") override fun getWeight(): Int = KOTLIN_WEIGHT-1 override fun getNodeIcon(): Icon = KotlinIcons.Wizard.COMPOSE diff --git a/plugins/kotlin/project-wizard/idea/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleBuilder.kt b/plugins/kotlin/project-wizard/idea/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleBuilder.kt index 56423028443f..0e0fc4981c61 100644 --- a/plugins/kotlin/project-wizard/idea/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleBuilder.kt +++ b/plugins/kotlin/project-wizard/idea/src/org/jetbrains/kotlin/tools/projectWizard/wizard/NewProjectWizardModuleBuilder.kt @@ -3,7 +3,6 @@ package org.jetbrains.kotlin.tools.projectWizard.wizard import com.intellij.ide.RecentProjectsManager import com.intellij.ide.actions.NewProjectAction -import com.intellij.ide.projectWizard.NewProjectWizardConstants.Generators import com.intellij.ide.util.projectWizard.* import com.intellij.ide.wizard.AbstractWizard import com.intellij.openapi.Disposable @@ -76,7 +75,7 @@ class NewProjectWizardModuleBuilder : EmptyModuleBuilder() { } companion object { - const val MODULE_BUILDER_ID = Generators.KOTLIN_MPP + const val MODULE_BUILDER_ID = "kotlin.newProjectWizard.builder" private val projectNameValidator = StringValidators.shouldBeValidIdentifier("Project name", setOf('-', '_')) private val INVALID_PROJECT_NAME_MESSAGE @NlsContexts.DialogTitle diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/InternalMavenModuleBuilder.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/InternalMavenModuleBuilder.java index 7a8389ec0d37..d1d0c644eaec 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/InternalMavenModuleBuilder.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/InternalMavenModuleBuilder.java @@ -16,16 +16,9 @@ import org.jetbrains.idea.maven.importing.MavenProjectImporter; import java.util.Collections; import java.util.List; -import static com.intellij.ide.projectWizard.NewProjectWizardConstants.Generators; - @ApiStatus.Internal public final class InternalMavenModuleBuilder extends AbstractMavenModuleBuilder { - @Override - public String getBuilderId() { - return Generators.LEGACY_MAVEN; - } - @Override public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider) { return new ModuleWizardStep[]{ diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/archetype/MavenArchetypeNewProjectWizard.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/archetype/MavenArchetypeNewProjectWizard.kt index 3d1d31a32ac6..8fd732ebed2b 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/archetype/MavenArchetypeNewProjectWizard.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/archetype/MavenArchetypeNewProjectWizard.kt @@ -7,7 +7,6 @@ import com.intellij.execution.util.setVisibleRowCount import com.intellij.icons.AllIcons import com.intellij.ide.projectWizard.NewProjectWizardCollector.BuildSystem.logVersionChanged import com.intellij.ide.projectWizard.NewProjectWizardConstants.BuildSystem.MAVEN -import com.intellij.ide.projectWizard.NewProjectWizardConstants.Generators import com.intellij.ide.projectWizard.NewProjectWizardConstants.Language.JAVA import com.intellij.ide.projectWizard.generators.AssetsNewProjectWizardStep import com.intellij.ide.projectWizard.generators.BuildSystemJavaNewProjectWizardData.Companion.buildSystem @@ -66,7 +65,7 @@ import javax.swing.Icon import javax.swing.JList class MavenArchetypeNewProjectWizard : GeneratorNewProjectWizard { - override val id: String = Generators.MAVEN_ARCHETYPE + override val id: String = "MavenArchetype" override val name: String = MavenWizardBundle.message("maven.new.project.wizard.archetype.generator.name")