diff --git a/platform/platform-impl/src/com/intellij/ide/actions/project/convertModuleGroupsToQualifiedNames.kt b/platform/platform-impl/src/com/intellij/ide/actions/project/convertModuleGroupsToQualifiedNames.kt index d788b8867d63..13d309ed0699 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/project/convertModuleGroupsToQualifiedNames.kt +++ b/platform/platform-impl/src/com/intellij/ide/actions/project/convertModuleGroupsToQualifiedNames.kt @@ -13,7 +13,6 @@ import com.intellij.lang.StdLanguages import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.application.ApplicationNamesInfo import com.intellij.openapi.application.runWriteAction -import com.intellij.openapi.components.StorageScheme import com.intellij.openapi.editor.Document import com.intellij.openapi.editor.Editor import com.intellij.openapi.editor.LineExtensionInfo @@ -30,11 +29,9 @@ import com.intellij.openapi.ui.DialogWrapper import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.panel.JBPanelFactory import com.intellij.openapi.util.text.StringUtil -import com.intellij.project.stateStore import com.intellij.psi.PsiDocumentManager import com.intellij.ui.* import com.intellij.ui.components.JBLabel -import com.intellij.util.PathUtil import com.intellij.util.ui.JBUI import com.intellij.util.ui.UIUtil import com.intellij.xml.util.XmlStringUtil @@ -51,7 +48,7 @@ class ConvertModuleGroupsToQualifiedNamesDialog(val project: Project) : DialogWr private val document: Document get() = editorArea.document private lateinit var modules: List - private val rememberOldNamesCheckBox: JCheckBox + private val recordPreviousNamesCheckBox: JCheckBox init { title = ProjectBundle.message("convert.module.groups.dialog.title") @@ -70,7 +67,7 @@ class ConvertModuleGroupsToQualifiedNamesDialog(val project: Project) : DialogWr (it as? EditorImpl)?.registerLineExtensionPainter(this::generateLineExtension) setupHighlighting(it) }, MonospaceEditorCustomization.getInstance())) - rememberOldNamesCheckBox = JCheckBox(ProjectBundle.message("convert.module.groups.remember.old.names.text"), true) + recordPreviousNamesCheckBox = JCheckBox(ProjectBundle.message("convert.module.groups.record.previous.names.text"), true) importRenamingScheme(emptyMap()) init() } @@ -92,17 +89,13 @@ class ConvertModuleGroupsToQualifiedNamesDialog(val project: Project) : DialogWr override fun createCenterPanel(): JPanel { val text = XmlStringUtil.wrapInHtml(ProjectBundle.message("convert.module.groups.description.text")) - val historyFilePath = when (project.stateStore.storageScheme) { - StorageScheme.DIRECTORY_BASED -> "${Project.DIRECTORY_STORE_FOLDER}/modules.xml" - StorageScheme.DEFAULT -> PathUtil.getFileName(project.stateStore.projectFilePath) - } - val rememberOldNames = JBPanelFactory.panel(rememberOldNamesCheckBox) - .withTooltip(ProjectBundle.message("convert.module.groups.remember.old.names.tooltip", historyFilePath, + val recordPreviousNames = JBPanelFactory.panel(recordPreviousNamesCheckBox) + .withTooltip(ProjectBundle.message("convert.module.groups.record.previous.names.tooltip", ApplicationNamesInfo.getInstance().fullProductName)).createPanel() return JBUI.Panels.simplePanel(0, UIUtil.DEFAULT_VGAP) .addToCenter(editorArea) .addToTop(JBLabel(text)) - .addToBottom(rememberOldNames) + .addToBottom(recordPreviousNames) } override fun getPreferredFocusedComponent() = editorArea.focusTarget @@ -159,7 +152,7 @@ class ConvertModuleGroupsToQualifiedNamesDialog(val project: Project) : DialogWr runWriteAction { model.commit() } - if (rememberOldNamesCheckBox.isSelected) { + if (recordPreviousNamesCheckBox.isSelected) { (ModulePointerManager.getInstance(project) as ModulePointerManagerImpl).setRenamingScheme(renamingScheme) } project.save() diff --git a/platform/projectModel-impl/src/messages/ProjectBundle.properties b/platform/projectModel-impl/src/messages/ProjectBundle.properties index 26b8b9ad3437..374b9e941708 100644 --- a/platform/projectModel-impl/src/messages/ProjectBundle.properties +++ b/platform/projectModel-impl/src/messages/ProjectBundle.properties @@ -152,10 +152,9 @@ convert.module.groups.button.text=Convert convert.module.groups.description.text=Each line in the text below corresponds to a module. Adjust module names if needed and press 'Convert' to \ rename modules and discard module groups. convert.module.groups.error.at.text=Error at line {0}: {1} -convert.module.groups.remember.old.names.tooltip=Store old names of modules being renamed in {0} file. If it''s committed to VCS, \ - {1} will use it to automatically convert module names in workspace settings (e.g. non-shared run configurations) \ - when another copy of the project is updated from VCS. -convert.module.groups.remember.old.names.text=&Remember old names in project configuration +convert.module.groups.record.previous.names.tooltip=All changes in module names will be recorded. {0} will use this data to automatically \ + replace module names in workspace settings after you update the project from VCS. +convert.module.groups.record.previous.names.text=&Record previous module names module.renaming.scheme.cannot.load.error=Failed to load renaming scheme from {0}:\n{1} module.renaming.scheme.cannot.save.error=Failed to save renaming scheme:\n{0}