From 5e307b534b60ef63df836f3a6ad8a8781afab4b1 Mon Sep 17 00:00:00 2001 From: Sergei Vorobyov Date: Wed, 11 Sep 2024 12:27:34 +0200 Subject: [PATCH] [NPW|Assets] cleanup: migrated assets steps for the Java project on the AssetsJava util GitOrigin-RevId: 40a0d69cf7a288df080f7fecaa6967d56d22b44b --- .../generators/IntelliJJavaNewProjectWizard.kt | 4 ++-- .../generators/IntelliJNewProjectWizardStep.kt | 2 +- .../project/wizard/GradleJavaNewProjectWizard.kt | 11 ++++------- .../wizard/groovy/GradleGroovyNewProjectWizard.kt | 4 ++-- .../gradle/GradleKotlinNewProjectWizard.kt | 4 ++-- .../maven/MavenKotlinNewProjectWizard.kt | 4 ++-- .../idea/maven/wizards/MavenJavaNewProjectWizard.kt | 13 ++++++------- 7 files changed, 19 insertions(+), 23 deletions(-) diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJJavaNewProjectWizard.kt b/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJJavaNewProjectWizard.kt index 78b6b08964ca..69eea0cb7709 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJJavaNewProjectWizard.kt +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJJavaNewProjectWizard.kt @@ -47,7 +47,7 @@ class IntelliJJavaNewProjectWizard : BuildSystemJavaNewProjectWizard { private class AssetsStep( private val parent: Step - ) : AssetsJavaNewProjectWizardStep(parent) { + ) : AssetsNewProjectWizardStep(parent) { override fun setupAssets(project: Project) { outputDirectory = parent.contentRoot @@ -63,7 +63,7 @@ class IntelliJJavaNewProjectWizard : BuildSystemJavaNewProjectWizard { override fun setupProject(project: Project) { if (parent.generateOnboardingTips) { - prepareOnboardingTips(project) + prepareJavaSampleOnboardingTips(project) } super.setupProject(project) } diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJNewProjectWizardStep.kt b/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJNewProjectWizardStep.kt index 4e49e52e85fc..ab175bedff15 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJNewProjectWizardStep.kt +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJNewProjectWizardStep.kt @@ -12,7 +12,7 @@ import com.intellij.ide.projectWizard.NewProjectWizardCollector.BuildSystem.logS import com.intellij.ide.projectWizard.NewProjectWizardCollector.Intellij.logContentRootChanged import com.intellij.ide.projectWizard.NewProjectWizardCollector.Intellij.logModuleFileLocationChanged import com.intellij.ide.projectWizard.NewProjectWizardCollector.Intellij.logModuleNameChanged -import com.intellij.ide.projectWizard.generators.AssetsJavaNewProjectWizardStep.Companion.proposeToGenerateOnboardingTipsByDefault +import com.intellij.ide.projectWizard.generators.AssetsOnboardingTips.proposeToGenerateOnboardingTipsByDefault import com.intellij.ide.projectWizard.projectWizardJdkComboBox import com.intellij.ide.util.projectWizard.ModuleBuilder import com.intellij.ide.util.projectWizard.ProjectWizardUtil diff --git a/plugins/gradle/java/src/service/project/wizard/GradleJavaNewProjectWizard.kt b/plugins/gradle/java/src/service/project/wizard/GradleJavaNewProjectWizard.kt index d688bfa6f171..597aa887142b 100644 --- a/plugins/gradle/java/src/service/project/wizard/GradleJavaNewProjectWizard.kt +++ b/plugins/gradle/java/src/service/project/wizard/GradleJavaNewProjectWizard.kt @@ -6,11 +6,8 @@ import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampl import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampleOnboardingTipsChanged import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampleOnboardingTipsFinished import com.intellij.ide.projectWizard.NewProjectWizardConstants.BuildSystem.GRADLE -import com.intellij.ide.projectWizard.generators.AssetsJavaNewProjectWizardStep -import com.intellij.ide.projectWizard.generators.AssetsJavaNewProjectWizardStep.Companion.proposeToGenerateOnboardingTipsByDefault -import com.intellij.ide.projectWizard.generators.BuildSystemJavaNewProjectWizard -import com.intellij.ide.projectWizard.generators.BuildSystemJavaNewProjectWizardData -import com.intellij.ide.projectWizard.generators.JavaNewProjectWizard +import com.intellij.ide.projectWizard.generators.* +import com.intellij.ide.projectWizard.generators.AssetsOnboardingTips.proposeToGenerateOnboardingTipsByDefault import com.intellij.ide.starters.local.StandardAssetsProvider import com.intellij.ide.wizard.NewProjectWizardChainStep.Companion.nextStep import com.intellij.ide.wizard.NewProjectWizardStep @@ -93,7 +90,7 @@ internal class GradleJavaNewProjectWizard : BuildSystemJavaNewProjectWizard { private class AssetsStep( private val parent: Step - ) : AssetsJavaNewProjectWizardStep(parent) { + ) : AssetsNewProjectWizardStep(parent) { override fun setupAssets(project: Project) { if (context.isCreatingNewProject) { @@ -106,7 +103,7 @@ internal class GradleJavaNewProjectWizard : BuildSystemJavaNewProjectWizard { override fun setupProject(project: Project) { if (parent.generateOnboardingTips) { - prepareOnboardingTips(project) + prepareJavaSampleOnboardingTips(project) } super.setupProject(project) } diff --git a/plugins/gradle/java/src/service/project/wizard/groovy/GradleGroovyNewProjectWizard.kt b/plugins/gradle/java/src/service/project/wizard/groovy/GradleGroovyNewProjectWizard.kt index 30d0bede307c..9532dd054225 100644 --- a/plugins/gradle/java/src/service/project/wizard/groovy/GradleGroovyNewProjectWizard.kt +++ b/plugins/gradle/java/src/service/project/wizard/groovy/GradleGroovyNewProjectWizard.kt @@ -4,7 +4,7 @@ package org.jetbrains.plugins.gradle.service.project.wizard.groovy import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampleCodeChanged import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampleCodeFinished import com.intellij.ide.projectWizard.NewProjectWizardConstants.BuildSystem.GRADLE -import com.intellij.ide.projectWizard.generators.AssetsJavaNewProjectWizardStep.Companion.createJavaSourcePath +import com.intellij.ide.projectWizard.generators.AssetsJava import com.intellij.ide.projectWizard.generators.AssetsNewProjectWizardStep import com.intellij.ide.starters.local.StandardAssetsProvider import com.intellij.ide.wizard.NewProjectWizardStep @@ -95,7 +95,7 @@ class GradleGroovyNewProjectWizard : BuildSystemGroovyNewProjectWizard { addAssets(StandardAssetsProvider().getGradleIgnoreAssets()) } if (parent.addSampleCode) { - val sourcePath = createJavaSourcePath("src/main/groovy", parent.groupId, "Main.groovy") + val sourcePath = AssetsJava.createJavaSourcePath("src/main/groovy", parent.groupId, "Main.groovy") addTemplateAsset(sourcePath, "Groovy Sample Code", "PACKAGE_NAME" to parent.groupId) addFilesToOpen(sourcePath) } diff --git a/plugins/kotlin/project-wizard/gradle/src/org/jetbrains/kotlin/tools/projectWizard/gradle/GradleKotlinNewProjectWizard.kt b/plugins/kotlin/project-wizard/gradle/src/org/jetbrains/kotlin/tools/projectWizard/gradle/GradleKotlinNewProjectWizard.kt index d5278eee1340..12ca24da02c3 100644 --- a/plugins/kotlin/project-wizard/gradle/src/org/jetbrains/kotlin/tools/projectWizard/gradle/GradleKotlinNewProjectWizard.kt +++ b/plugins/kotlin/project-wizard/gradle/src/org/jetbrains/kotlin/tools/projectWizard/gradle/GradleKotlinNewProjectWizard.kt @@ -6,7 +6,7 @@ import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampl import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampleOnboardingTipsChanged import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampleOnboardingTipsFinished import com.intellij.ide.projectWizard.NewProjectWizardConstants.BuildSystem.GRADLE -import com.intellij.ide.projectWizard.generators.AssetsJavaNewProjectWizardStep +import com.intellij.ide.projectWizard.generators.AssetsOnboardingTips.proposeToGenerateOnboardingTipsByDefault import com.intellij.ide.wizard.NewProjectWizardChainStep.Companion.nextStep import com.intellij.ide.wizard.NewProjectWizardStep import com.intellij.ide.wizard.NewProjectWizardStep.Companion.ADD_SAMPLE_CODE_PROPERTY_NAME @@ -77,7 +77,7 @@ internal class GradleKotlinNewProjectWizard : BuildSystemKotlinNewProjectWizard override var addSampleCode by addSampleCodeProperty - override val generateOnboardingTipsProperty = propertyGraph.property(AssetsJavaNewProjectWizardStep.proposeToGenerateOnboardingTipsByDefault()) + override val generateOnboardingTipsProperty = propertyGraph.property(proposeToGenerateOnboardingTipsByDefault()) .bindBooleanStorage(NewProjectWizardStep.GENERATE_ONBOARDING_TIPS_NAME) override var generateOnboardingTips by generateOnboardingTipsProperty diff --git a/plugins/kotlin/project-wizard/maven/src/org/jetbrains/kotlin/tools/projectWizard/maven/MavenKotlinNewProjectWizard.kt b/plugins/kotlin/project-wizard/maven/src/org/jetbrains/kotlin/tools/projectWizard/maven/MavenKotlinNewProjectWizard.kt index e1f7f4868563..746514e6dfb4 100644 --- a/plugins/kotlin/project-wizard/maven/src/org/jetbrains/kotlin/tools/projectWizard/maven/MavenKotlinNewProjectWizard.kt +++ b/plugins/kotlin/project-wizard/maven/src/org/jetbrains/kotlin/tools/projectWizard/maven/MavenKotlinNewProjectWizard.kt @@ -6,7 +6,7 @@ import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampl import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampleOnboardingTipsChanged import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampleOnboardingTipsFinished import com.intellij.ide.projectWizard.NewProjectWizardConstants.BuildSystem.MAVEN -import com.intellij.ide.projectWizard.generators.AssetsJavaNewProjectWizardStep +import com.intellij.ide.projectWizard.generators.AssetsOnboardingTips.proposeToGenerateOnboardingTipsByDefault import com.intellij.ide.starters.local.StandardAssetsProvider import com.intellij.ide.wizard.NewProjectWizardChainStep.Companion.nextStep import com.intellij.ide.wizard.NewProjectWizardStep @@ -60,7 +60,7 @@ internal class MavenKotlinNewProjectWizard : BuildSystemKotlinNewProjectWizard { override var addSampleCode by addSampleCodeProperty - override val generateOnboardingTipsProperty = propertyGraph.property(AssetsJavaNewProjectWizardStep.proposeToGenerateOnboardingTipsByDefault()) + override val generateOnboardingTipsProperty = propertyGraph.property(proposeToGenerateOnboardingTipsByDefault()) .bindBooleanStorage(NewProjectWizardStep.GENERATE_ONBOARDING_TIPS_NAME) override var generateOnboardingTips by generateOnboardingTipsProperty diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenJavaNewProjectWizard.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenJavaNewProjectWizard.kt index 18c4ec1601f2..825311c3531f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenJavaNewProjectWizard.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenJavaNewProjectWizard.kt @@ -6,11 +6,8 @@ import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampl import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampleOnboardingTipsChanged import com.intellij.ide.projectWizard.NewProjectWizardCollector.Base.logAddSampleOnboardingTipsFinished import com.intellij.ide.projectWizard.NewProjectWizardConstants.BuildSystem.MAVEN -import com.intellij.ide.projectWizard.generators.AssetsJavaNewProjectWizardStep -import com.intellij.ide.projectWizard.generators.AssetsJavaNewProjectWizardStep.Companion.proposeToGenerateOnboardingTipsByDefault -import com.intellij.ide.projectWizard.generators.BuildSystemJavaNewProjectWizard -import com.intellij.ide.projectWizard.generators.BuildSystemJavaNewProjectWizardData -import com.intellij.ide.projectWizard.generators.JavaNewProjectWizard +import com.intellij.ide.projectWizard.generators.* +import com.intellij.ide.projectWizard.generators.AssetsOnboardingTips.proposeToGenerateOnboardingTipsByDefault import com.intellij.ide.starters.local.StandardAssetsProvider import com.intellij.ide.wizard.NewProjectWizardChainStep.Companion.nextStep import com.intellij.ide.wizard.NewProjectWizardStep @@ -90,7 +87,9 @@ class MavenJavaNewProjectWizard : BuildSystemJavaNewProjectWizard { } } - private class AssetsStep(private val parent: Step) : AssetsJavaNewProjectWizardStep(parent) { + private class AssetsStep( + private val parent: Step + ) : AssetsNewProjectWizardStep(parent) { override fun setupAssets(project: Project) { if (context.isCreatingNewProject) { @@ -103,7 +102,7 @@ class MavenJavaNewProjectWizard : BuildSystemJavaNewProjectWizard { override fun setupProject(project: Project) { if (parent.generateOnboardingTips) { - prepareOnboardingTips(project) + prepareJavaSampleOnboardingTips(project) } super.setupProject(project) }