From fe22a4aa7455ead91f69854b07f340e773117d52 Mon Sep 17 00:00:00 2001
From: Louis Vignier <louis.vignier@jetbrains.com>
Date: Mon, 6 Dec 2021 16:44:18 +0100
Subject: [PATCH] IJ-CR-17317 [java.ui] Add content root and module file
 location to NPW data

GitOrigin-RevId: ee8346dbc0c445df6f5ef94721a55555336b3115
---
 .../generators/IntelliJJavaNewProjectWizardData.kt            | 2 ++
 .../projectWizard/generators/IntelliJNewProjectWizardData.kt  | 2 ++
 .../projectWizard/generators/IntelliJNewProjectWizardStep.kt  | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJJavaNewProjectWizardData.kt b/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJJavaNewProjectWizardData.kt
index eecc7e6b526b..ab8da59b49f9 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJJavaNewProjectWizardData.kt
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJJavaNewProjectWizardData.kt
@@ -12,5 +12,7 @@ interface IntelliJJavaNewProjectWizardData: IntelliJNewProjectWizardData {
 
     @JvmStatic var NewProjectWizardStep.sdk get() = javaData.sdk; set(it) { javaData.sdk = it }
     @JvmStatic var NewProjectWizardStep.moduleName get() = javaData.moduleName; set(it) { javaData.moduleName = it }
+    @JvmStatic var NewProjectWizardStep.contentRoot get() = javaData.contentRoot; set(it) { javaData.contentRoot = it }
+    @JvmStatic var NewProjectWizardStep.moduleFileLocation get() = javaData.moduleFileLocation; set(it) { javaData.moduleFileLocation = it }
   }
 }
\ No newline at end of file
diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJNewProjectWizardData.kt b/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJNewProjectWizardData.kt
index 0be012ae93a9..27ac90b355b6 100644
--- a/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJNewProjectWizardData.kt
+++ b/java/idea-ui/src/com/intellij/ide/projectWizard/generators/IntelliJNewProjectWizardData.kt
@@ -6,4 +6,6 @@ import com.intellij.openapi.projectRoots.Sdk
 interface IntelliJNewProjectWizardData {
   var sdk: Sdk?
   var moduleName: String
+  var contentRoot: String
+  var moduleFileLocation: String
 }
\ No newline at end of file
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 85377580fe52..f74f816d4a11 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
@@ -53,8 +53,8 @@ abstract class IntelliJNewProjectWizardStep<ParentStep>(val parent: ParentStep)
 
   final override var sdk by sdkProperty
   final override var moduleName by moduleNameProperty
-  protected var contentRoot by contentRootProperty
-  protected var moduleFileLocation by moduleFileLocationProperty
+  final override var contentRoot by contentRootProperty
+  final override var moduleFileLocation by moduleFileLocationProperty
 
   private var userDefinedContentRoot: Boolean = false
   private var userDefinedModuleFileLocation: Boolean = false