From ef2778333c16082b51b38fb6e6e31ca2ef9d30b6 Mon Sep 17 00:00:00 2001 From: Sergei Vorobyov Date: Sat, 2 May 2020 15:11:36 +0300 Subject: [PATCH] IDEA-228482 replaced all mentions about project [re]import by project reload GitOrigin-RevId: edf23532be3daf75737bf14fb96d27f6b6fbc0ba --- .../CreateKotlinMPProjectGuiTest.kt | 2 +- .../kotlin/model/ProjectsWithKotlin.kt | 4 +- .../messages/ExternalSystemBundle.properties | 26 ++++---- .../testGuiFramework/impl/GuiTestCaseExt.kt | 16 ++--- .../IncompatibleGradleJdkIssueChecker.kt | 2 +- .../gradle/issue/UnresolvedDependencyIssue.kt | 2 +- .../UnsupportedGradleVersionIssueChecker.kt | 2 +- ...radleOutputParsersMessagesImportingTest.kt | 4 +- .../MavenConfigurableBundle.properties | 2 +- .../messages/MavenProjectBundle.properties | 22 +++---- resources-en/src/search/searchableOptions.xml | 60 +++++++++---------- 11 files changed, 71 insertions(+), 71 deletions(-) diff --git a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/createProject/CreateKotlinMPProjectGuiTest.kt b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/createProject/CreateKotlinMPProjectGuiTest.kt index 16119a8de2fe..b8d191ae0c2d 100644 --- a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/createProject/CreateKotlinMPProjectGuiTest.kt +++ b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/createProject/CreateKotlinMPProjectGuiTest.kt @@ -58,7 +58,7 @@ class CreateKotlinMPProjectGuiTest(private val testParameters: TestParameters) : isKotlinDslUsed = false ) - step("gradle reimport after editing gradle files") { + step("reload gradle project after editing gradle files") { gradleReimport() } waitAMoment() diff --git a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/ProjectsWithKotlin.kt b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/ProjectsWithKotlin.kt index 7d2f20aa0e37..b549b625455e 100644 --- a/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/ProjectsWithKotlin.kt +++ b/community-guitests/testSrc/com/intellij/ide/projectWizard/kotlin/model/ProjectsWithKotlin.kt @@ -788,7 +788,7 @@ fun KotlinGuiTestCase.testCreateGradleAndConfigureKotlin( isKotlinDslUsed = project.isKotlinDsl ) waitAMoment() - step("gradle reimport after editing gradle files") { + step("gradle project reload after editing gradle files") { gradleReimport() } waitAMoment() @@ -877,7 +877,7 @@ fun KotlinGuiTestCase.testGradleProjectWithKotlin( isKotlinDslUsed = gradleOptions.useKotlinDsl ) waitAMoment() - step("gradle reimport after editing gradle files") { + step("gradle project reload after editing gradle files") { gradleReimport() } waitAMoment() diff --git a/platform/external-system-api/resources/messages/ExternalSystemBundle.properties b/platform/external-system-api/resources/messages/ExternalSystemBundle.properties index f4d779f58cc8..b847d218018d 100644 --- a/platform/external-system-api/resources/messages/ExternalSystemBundle.properties +++ b/platform/external-system-api/resources/messages/ExternalSystemBundle.properties @@ -1,14 +1,14 @@ # Import. -import.title=Import {0} Projects +import.title=Reload {0} Projects import.needed={0} projects need to be imported -import.importChanged=Import Changes -import.enableAutoImport=Enable Auto-Import +import.importChanged=Reload Project Changes +import.enableAutoImport=Enable Auto-Reload module.type.title={0} Module module.type.description={0} modules are used for developing JVM-based applications with dependencies managed by {0} orphan.modules.dialog.title=Orphan Modules orphan.modules.dialog.text=The modules below were removed from the project.
Select the ones you need to restore. -orphan.modules.text=The IDE modules below were removed by the {0} import:

{1}


You can open dialog to select the ones you need to restore. -local.history.remove.orphan.modules=Remove orphan modules after import +orphan.modules.text=The IDE modules below were removed by the {0} project reload:

{1}


You can open dialog to select the ones you need to restore. +local.history.remove.orphan.modules=Remove orphan modules after project reload # Settings. setting.type.location.deduced={0} location is deduced @@ -17,7 +17,7 @@ setting.type.location.explicit.correct={0} location is defined setting.type.location.explicit.incorrect={0} location is incorrect settings.label.select.project={0} project: settings.label.project.format=Project format: -settings.label.use.auto.import=Automatically import this project on changes in build script files +settings.label.use.auto.import=Auto-reload this project on changes in build script files settings.title.projects.settings={0} projects settings.title.system.settings=General settings @@ -30,11 +30,11 @@ progress.update.text={0}: {1} progress.update.refresh=Importing {0} # Errors. -error.project.import.error.title=Import Failed +error.project.import.error.title=Project Reload Failed error.project.does.not.exist={0} script file ''{1}'' not found error.project.already.registered=The project is already registered error.resolve.with.reason={0}\n\nConsult IDE log for more details (Help | Show Log) -error.resolve.already.running=Another ''Reimport project'' task is currently running for the project: {0} +error.resolve.already.running=Another ''Reload project'' task is currently running for the project: {0} # Tool window tool.window.title.projects=projects @@ -43,10 +43,10 @@ external.system.view.nodes.run_configurations.name=Run Configurations external.system.view.nodes.dependency_reference_node_tooltip=Dependencies omitted (listed previously).
Press Enter or left mouse button double click to navigate to dependencies. # Action. -action.refresh.all.projects.text=Reimport All {0} Projects -action.refresh.all.projects.description=Force reimport all linked {0} projects -action.refresh.project.text=Reimport {0} Project -action.refresh.project.description=Force reimport selected linked {0} project +action.refresh.all.projects.text=Reload All {0} Projects +action.refresh.all.projects.description=Force reload all linked {0} projects +action.refresh.project.text=Reload {0} Project +action.refresh.project.description=Force reload selected linked {0} project action.detach.external.project.text=Unlink {0} Project action.detach.external.project.description=Unlink selected project action.detach.external.confirmation.prompt={0} {1, choice, 1#Module|2#Modules} {2} will be unlinked.\nNo files will be deleted. @@ -69,7 +69,7 @@ action.open.settings.text={0} Settings action.open.settings.description=Edit {0} settings for the current project # Notification -notification.project.refresh.fail.title={0} ''{1}'' project reimport failed +notification.project.refresh.fail.title={0} ''{1}'' project reload failed notification.project.build.fail.title={0} ''{1}'' project build failed notification.messages.project.sync.tab.name={0} Sync notification.messages.task.execution.tab.name={0} Task diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCaseExt.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCaseExt.kt index 9525995dac0f..667514940a65 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCaseExt.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCaseExt.kt @@ -195,8 +195,8 @@ fun GuiTestCase.waitForGradleReimport(rootPath: String): Boolean { val syncFailed = "sync failed" var reimportStatus = "" - step("wait for Gradle reimport") { - GuiTestUtilKt.waitUntil("for gradle reimport finishing", timeout = Timeouts.minutes05) { + step("wait for Gradle project reload") { + GuiTestUtilKt.waitUntil("for gradle project reload finishing", timeout = Timeouts.minutes05) { var isReimportButtonEnabled: Boolean = false var syncState = false try { @@ -234,7 +234,7 @@ fun GuiTestCase.waitForGradleReimport(rootPath: String): Boolean { else { syncState = false } - logInfo("Reimport status is '$reimportStatus', synchronization is ${if(syncState) "finished" else "in process"}") + logInfo("Project reload status is '$reimportStatus', synchronization is ${if(syncState) "finished" else "in process"}") } } } @@ -250,7 +250,7 @@ fun GuiTestCase.waitForGradleReimport(rootPath: String): Boolean { } fun GuiTestCase.gradleReimport() { - step("reimport gradle project") { + step("reload gradle project") { ideFrame { toolwindow(id = "Gradle") { content(tabName = "") { @@ -265,12 +265,12 @@ fun GuiTestCase.gradleReimport() { } fun GuiTestCase.mavenReimport() { - step("reimport maven project") { + step("reload maven project") { ideFrame { toolwindow(id = "Maven") { content(tabName = "") { - step("search when button 'Reimport All Maven Projects' becomes enable and click it") { - val reimportAction = "Reimport All Maven Projects" + step("search when button 'Reload All Maven Projects' becomes enable and click it") { + val reimportAction = "Reload All Maven Projects" val showDepAction = "Show UML Diagram" // but tooltip says "Show Dependencies" GuiTestUtilKt.waitUntil("Wait for button '$reimportAction' to be enabled.", timeout = Timeouts.minutes02) { actionButton(reimportAction, timeout = Timeouts.seconds30).isEnabled @@ -279,7 +279,7 @@ fun GuiTestCase.mavenReimport() { actionButton(showDepAction, timeout = Timeouts.minutes01) } catch (ignore: ComponentLookupException) { - logInfo("Maven reimport: not found 'Show Dependencies' button after 1 min waiting") + logInfo("Maven reload: not found 'Show Dependencies' button after 1 min waiting") } robot().waitForIdle() actionButton(reimportAction).click() diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/issue/IncompatibleGradleJdkIssueChecker.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/issue/IncompatibleGradleJdkIssueChecker.kt index de1570c4ce2f..788eee69782f 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/issue/IncompatibleGradleJdkIssueChecker.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/issue/IncompatibleGradleJdkIssueChecker.kt @@ -106,7 +106,7 @@ class IncompatibleGradleJdkIssueChecker : GradleIssueChecker { val wrapperSettingsOpenQuickFix = GradleWrapperSettingsOpenQuickFix(issueData.projectPath, "distributionUrl") val reimportQuickFix = ReimportQuickFix(issueData.projectPath, GradleConstants.SYSTEM_ID) issueDescription.append(" - Open Gradle wrapper settings, " + - "upgrade version to 4.8.1 or newer and reimport the project\n") + "upgrade version to 4.8.1 or newer and reload the project\n") quickFixes.add(wrapperSettingsOpenQuickFix) quickFixes.add(reimportQuickFix) } diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/issue/UnresolvedDependencyIssue.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/issue/UnresolvedDependencyIssue.kt index 2dcf681adec8..293c84187b3c 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/issue/UnresolvedDependencyIssue.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/issue/UnresolvedDependencyIssue.kt @@ -49,7 +49,7 @@ class UnresolvedDependencySyncIssue(dependencyName: String, projectPath: String, isOfflineMode: Boolean) : UnresolvedDependencyIssue(dependencyName) { override val quickFixes = if (isOfflineMode) listOf(DisableOfflineAndReimport(projectPath)) else emptyList() - override val description: String = buildDescription(failureMessage, isOfflineMode, "Disable offline mode and reimport the project") + override val description: String = buildDescription(failureMessage, isOfflineMode, "Disable offline mode and reload the project") inner class DisableOfflineAndReimport(private val projectPath: String) : BuildIssueQuickFix { override val id = offlineQuickFixId diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/issue/UnsupportedGradleVersionIssueChecker.kt b/plugins/gradle/src/org/jetbrains/plugins/gradle/issue/UnsupportedGradleVersionIssueChecker.kt index c6e15a68d474..f66ba54d1060 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/issue/UnsupportedGradleVersionIssueChecker.kt +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/issue/UnsupportedGradleVersionIssueChecker.kt @@ -76,7 +76,7 @@ class UnsupportedGradleVersionIssueChecker : GradleIssueChecker { val wrapperSettingsOpenQuickFix = GradleWrapperSettingsOpenQuickFix(issueData.projectPath, "distributionUrl") val reimportQuickFix = ReimportQuickFix(issueData.projectPath, GradleConstants.SYSTEM_ID) issueDescription.append(" - Open Gradle wrapper settings, " + - "upgrade version to ${gradleMinimumVersionRequired.version} or newer and reimport the project\n") + "upgrade version to ${gradleMinimumVersionRequired.version} or newer and reload the project\n") quickFixes.add(wrapperSettingsOpenQuickFix) quickFixes.add(reimportQuickFix) } diff --git a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleOutputParsersMessagesImportingTest.kt b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleOutputParsersMessagesImportingTest.kt index aee456ef6541..4da6759f65d6 100644 --- a/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleOutputParsersMessagesImportingTest.kt +++ b/plugins/gradle/testSources/org/jetbrains/plugins/gradle/importing/GradleOutputParsersMessagesImportingTest.kt @@ -164,7 +164,7 @@ open class GradleOutputParsersMessagesImportingTest : BuildViewMessagesImporting } + "\n" + "Possible solution:\n" + - " - Disable offline mode and reimport the project\n" + + " - Disable offline mode and reload the project\n" + "\n") // check unresolved dependency for offline mode when merged project used @@ -178,7 +178,7 @@ open class GradleOutputParsersMessagesImportingTest : BuildViewMessagesImporting "Could not resolve junit:junit:99.99.\n" + "\n" + "Possible solution:\n" + - " - Disable offline mode and reimport the project\n" + + " - Disable offline mode and reload the project\n" + "\n") currentExternalProjectSettings.isResolveModulePerSourceSet = true diff --git a/plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties b/plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties index b15689243b39..058b3610e230 100644 --- a/plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties +++ b/plugins/maven/src/main/resources/messages/MavenConfigurableBundle.properties @@ -36,7 +36,7 @@ maven.settings.importing.auto.download=Automatically download: maven.settings.importing.auto.download.documentation=&Documentation maven.settings.importing.auto.download.sources=Sou&rces maven.settings.importing.auto.download.annotations=Annotations -maven.settings.importing.keep.folders.on.reimport=Keep source and test &folders on reimport +maven.settings.importing.keep.folders.on.reimport=Keep source and test &folders on project reload maven.settings.importing.project.format=Project forma&t: maven.settings.importing.project.files.keep.in=&Keep project files in: maven.settings.importing.project.files.keep.in.tooltip=Keep IDEA specified files like *.iml / .idea in selected directory. By default *.iml files are stored beside the pom.xml diff --git a/plugins/maven/src/main/resources/messages/MavenProjectBundle.properties b/plugins/maven/src/main/resources/messages/MavenProjectBundle.properties index 00c3645813bd..d61fbc10a2f7 100644 --- a/plugins/maven/src/main/resources/messages/MavenProjectBundle.properties +++ b/plugins/maven/src/main/resources/messages/MavenProjectBundle.properties @@ -22,10 +22,10 @@ maven.action.download.sources=Download Sources maven.action.download.sources.busy.text=Downloading sources... maven.project.changed=Maven projects need to be imported -maven.project.importChanged=Import Changes -maven.project.enableAutoImport=Enable Auto-Import +maven.project.importChanged=Reload Project Changes +maven.project.enableAutoImport=Enable Auto-Reload maven.project.importing=Importing Maven projects -maven.project.import.title=Import Maven Projects +maven.project.import.title=Reload Maven Projects maven.project.importing.finished=Finished importing Maven projects maven.project.import.waiting.for.active.process=Waiting for an active process maven.post.processing=Configuring Maven projects @@ -50,13 +50,13 @@ maven.import.incompatible.modules.ignore=Ignore These Projects maven.import.message.delete.obsolete=These modules have been removed from Maven structure:\n{0}\n\nDo you want them to be removed from the project too? maven.navigator.nothing.to.display=There are no Maven projects to display.\n\n\ - You may use {0} to add a project or {1} to let the plugin find all pom.xml files under the project roots and import them + You may use {0} to add a project or {1} to let the plugin find all pom.xml files under the project roots and reload them maven.tab.importing=Importing maven.tab.downloading=Downloading maven.download.never=Never maven.download.ondemand=On demand -maven.download.always=On import +maven.download.always=On project reload maven.tab.ignored.files=Ignored Files maven.testRunning=Running Tests @@ -111,7 +111,7 @@ maven.directory.contribution.description=Maven Source Directories maven.notification.nonmanaged.pom.will.be.disabled.message=Notification will be disabled for all projects.\n\nSettings | Appearance & Behavior | Notifications | {0}\ncan be used to configure the notification. maven.notification.nonmanaged.pom.disable.title=Non-Managed Maven Project Detection maven.notification.disable=Disable Notification -maven.notification.unable.to.import=Unable to import Maven project +maven.notification.unable.to.import=Unable to reload Maven project maven.notification.see.logs.for.details=See logs for details maven.notification.choose.file.to.open=Choose file to open @@ -129,9 +129,9 @@ maven.run.configuration.remove.confirm=Delete "{0}"? maven.toggle.offline.search.title=Toggle Maven Offline Mode -action.Maven.Reimport.text=Reimport All Maven Projects -action.Maven.ReimportProject.text=Reimport -action.Maven.ReimportProject.description=Reimport selected Maven projects +action.Maven.Reimport.text=Reload All Maven Projects +action.Maven.ReimportProject.text=Reload project +action.Maven.ReimportProject.description=Reload selected Maven projects action.Maven.ShowEffectivePom.text=Show Effective POM action.Maven.ShowEffectivePom.description=Generate and show effective POM action.Maven.UpdateFolders.text=Generate Sources and Update Folders For All Projects @@ -149,9 +149,9 @@ action.Maven.DownloadSelectedSources.description=Download sources for all depend action.Maven.DownloadSelectedDocs.text=Download Documentation action.Maven.DownloadSelectedDocs.description=Download documentation for all dependencies for selected projects action.Maven.AddManagedFiles.text=Add Maven Projects -action.Maven.AddManagedFiles.description=Add and import Maven projects to the projects tree +action.Maven.AddManagedFiles.description=Add and reload Maven projects to the projects tree action.Maven.AddFileAsMavenProject.text=Add as Maven Project -action.Maven.AddFileAsMavenProject.description=Add and import Maven project to the projects tree +action.Maven.AddFileAsMavenProject.description=Add and reload Maven project to the projects tree action.Maven.RemoveManagedFiles.text=Unlink Maven Projects action.Maven.RemoveManagedFiles.description=Unlink selected Maven projects and their subprojects from the project tree action.Maven.OpenSettingsXml.text=Open settings.xml diff --git a/resources-en/src/search/searchableOptions.xml b/resources-en/src/search/searchableOptions.xml index 990fa87d6e78..448b80debcc7 100644 --- a/resources-en/src/search/searchableOptions.xml +++ b/resources-en/src/search/searchableOptions.xml @@ -8636,29 +8636,29 @@