MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

[NPW|Assets] cleanup: migrated assets steps for the Java project on the AssetsJava util

Browse Source 
GitOrigin-RevId: 40a0d69cf7a288df080f7fecaa6967d56d22b44b
This commit is contained in:
Sergei Vorobyov
2024-09-11 12:27:34 +02:00
committed by intellij-monorepo-bot
parent 2e66037578
commit 5e307b534b
7 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJJavaNewProjectWizard.kt
View File

@@ -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)
}

2
java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJNewProjectWizardStep.kt
View File

@@ -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

11
plugins/gradle/java/src/service/project/wizard/GradleJavaNewProjectWizard.kt
View File

@@ -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)
}

4
plugins/gradle/java/src/service/project/wizard/groovy/GradleGroovyNewProjectWizard.kt
View File

@@ -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)
}

4
plugins/kotlin/project-wizard/gradle/src/org/jetbrains/kotlin/tools/projectWizard/gradle/GradleKotlinNewProjectWizard.kt
View File

@@ -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

4
plugins/kotlin/project-wizard/maven/src/org/jetbrains/kotlin/tools/projectWizard/maven/MavenKotlinNewProjectWizard.kt
View File

@@ -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

13
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenJavaNewProjectWizard.kt
View File

@@ -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)
}