From 4235731d825083cbeb80aea15820fe1840f47613 Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Fri, 20 Dec 2019 00:12:44 +0300 Subject: [PATCH] rename mvn bundles GitOrigin-RevId: 8b7b52d331ac6ce71e83308fd6f5e0f1d81b5021 --- .../execution/MavenRunConfiguration.java | 4 ++-- .../idea/maven/execution/RunnerBundle.java | 2 +- .../idea/maven/execution/SyncBundle.java | 2 +- .../maven/importing/MavenProjectImporter.java | 20 +++++++++---------- .../idea/maven/indices/IndicesBundle.java | 2 +- .../navigator/MavenProjectsNavigator.java | 2 +- .../navigator/MavenProjectsStructure.java | 2 +- .../project/MavenArtifactDownloader.java | 6 +++--- .../maven/project/MavenEnvironmentForm.java | 6 +++--- .../idea/maven/project/MavenGeneralPanel.java | 2 +- .../MavenIgnoredFilesConfigurable.java | 4 ++-- .../project/MavenImportingConfigurable.java | 2 +- .../project/MavenImportingSettingsForm.form | 6 +++--- .../project/MavenImportingSettingsForm.java | 2 +- .../idea/maven/project/MavenProject.java | 14 ++++++------- ...ectBundle.java => MavenProjectBundle.java} | 8 ++++---- .../maven/project/MavenProjectReader.java | 8 ++++---- .../maven/project/MavenProjectResolver.java | 6 +++--- .../maven/project/MavenProjectsManager.java | 18 ++++++++--------- .../idea/maven/project/MavenProjectsTree.java | 3 +-- .../project/MavenTestRunningConfigurable.java | 2 +- .../actions/ToggleIgnoredProjectsAction.java | 8 ++++---- .../project/actions/ToggleProfileAction.java | 8 ++++---- .../idea/maven/tasks/TasksBundle.java | 2 +- .../utils/MavenAttachSourcesProvider.java | 6 +++--- .../maven/wizards/MavenProjectBuilder.java | 8 ++++---- .../src/main/resources/META-INF/plugin.xml | 10 +++++----- ...operties => MavenIndicesBundle.properties} | 0 ...operties => MavenProjectBundle.properties} | 0 ...roperties => MavenRunnerBundle.properties} | 0 ....properties => MavenSyncBundle.properties} | 0 ...properties => MavenTasksBundle.properties} | 0 32 files changed, 81 insertions(+), 82 deletions(-) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/project/{ProjectBundle.java => MavenProjectBundle.java} (79%) rename plugins/maven/src/main/resources/messages/{IndicesBundle.properties => MavenIndicesBundle.properties} (100%) rename plugins/maven/src/main/resources/messages/{ProjectBundle.properties => MavenProjectBundle.properties} (100%) rename plugins/maven/src/main/resources/messages/{RunnerBundle.properties => MavenRunnerBundle.properties} (100%) rename plugins/maven/src/main/resources/messages/{SyncBundle.properties => MavenSyncBundle.properties} (100%) rename plugins/maven/src/main/resources/messages/{TasksBundle.properties => MavenTasksBundle.properties} (100%) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java index f9b1db8a7b6b..ec27fb092bde 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java @@ -45,8 +45,8 @@ import org.jetbrains.idea.maven.externalSystemIntegration.output.MavenParsingCon import org.jetbrains.idea.maven.model.MavenConstants; import org.jetbrains.idea.maven.project.MavenGeneralSettings; import org.jetbrains.idea.maven.project.MavenGeneralSettingsEditor; +import org.jetbrains.idea.maven.project.MavenProjectBundle; import org.jetbrains.idea.maven.project.MavenProjectsManager; -import org.jetbrains.idea.maven.project.ProjectBundle; import org.jetbrains.idea.maven.utils.MavenLog; import org.jetbrains.idea.maven.utils.MavenUtil; @@ -83,7 +83,7 @@ public class MavenRunConfiguration extends LocatableConfigurationBase implements group.addEditor(RunnerBundle.message("maven.runner.parameters.title"), new MavenRunnerParametersSettingEditor(getProject())); - group.addEditor(ProjectBundle.message("maven.tab.general"), new MavenGeneralSettingsEditor(getProject())); + group.addEditor(MavenProjectBundle.message("maven.tab.general"), new MavenGeneralSettingsEditor(getProject())); group.addEditor(RunnerBundle.message("maven.tab.runner"), new MavenRunnerSettingsEditor(getProject())); group.addEditor(ExecutionBundle.message("logs.tab.title"), new LogConfigurationPanel<>()); return group; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/RunnerBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/RunnerBundle.java index 87947516a32e..1c449fa3ebb8 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/RunnerBundle.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/RunnerBundle.java @@ -26,7 +26,7 @@ public class RunnerBundle extends DynamicBundle { return ourInstance.getMessage(key, params); } - private static final String PATH_TO_BUNDLE = "messages.RunnerBundle"; + private static final String PATH_TO_BUNDLE = "messages.MavenRunnerBundle"; private static final AbstractBundle ourInstance = new RunnerBundle(); private RunnerBundle() { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/SyncBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/SyncBundle.java index d3784db73483..36f239f8c151 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/SyncBundle.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/SyncBundle.java @@ -12,7 +12,7 @@ public class SyncBundle extends DynamicBundle { return ourInstance.getMessage(key, params); } - private static final String PATH_TO_BUNDLE = "messages.SyncBundle"; + private static final String PATH_TO_BUNDLE = "messages.MavenSyncBundle"; private static final AbstractBundle ourInstance = new SyncBundle(); private SyncBundle() { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java index 91e0b0488bcf..4bd88b6a69dc 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java @@ -380,16 +380,16 @@ public class MavenProjectImporter { final int[] result = new int[1]; MavenUtil.invokeAndWait(myProject, myModelsProvider.getModalityStateForQuestionDialogs(), () -> { - String message = ProjectBundle.message("maven.import.incompatible.modules", - incompatibleNotMavenized.size(), - formatProjectsWithModules(incompatibleNotMavenized)); + String message = MavenProjectBundle.message("maven.import.incompatible.modules", + incompatibleNotMavenized.size(), + formatProjectsWithModules(incompatibleNotMavenized)); String[] options = { - ProjectBundle.message("maven.import.incompatible.modules.recreate"), - ProjectBundle.message("maven.import.incompatible.modules.ignore") + MavenProjectBundle.message("maven.import.incompatible.modules.recreate"), + MavenProjectBundle.message("maven.import.incompatible.modules.ignore") }; result[0] = Messages.showOkCancelDialog(myProject, message, - ProjectBundle.message("maven.project.import.title"), + MavenProjectBundle.message("maven.project.import.title"), options[0], options[1], Messages.getQuestionIcon()); }); @@ -449,9 +449,9 @@ public class MavenProjectImporter { final int[] result = new int[1]; MavenUtil.invokeAndWait(myProject, myModelsProvider.getModalityStateForQuestionDialogs(), () -> result[0] = Messages.showYesNoDialog(myProject, - ProjectBundle.message("maven.import.message.delete.obsolete", - formatModules(obsoleteModules)), - ProjectBundle.message("maven.project.import.title"), + MavenProjectBundle.message("maven.import.message.delete.obsolete", + formatModules(obsoleteModules)), + MavenProjectBundle.message("maven.project.import.title"), Messages.getQuestionIcon())); if (result[0] == Messages.NO) return false;// NO @@ -687,7 +687,7 @@ public class MavenProjectImporter { String name = myMavenProjectToModuleName.get(each); if (shouldCreateGroup(each)) { - groups.push(ProjectBundle.message("module.group.name", name)); + groups.push(MavenProjectBundle.message("module.group.name", name)); } if (!shouldCreateModuleFor(each)) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java index 023f9eb6b122..f15f75fd3872 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; public class IndicesBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.IndicesBundle"; + @NonNls private static final String BUNDLE = "messages.MavenIndicesBundle"; private static final IndicesBundle INSTANCE = new IndicesBundle(); private IndicesBundle() { super(BUNDLE); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java index d680660d714e..b3e540f5911f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java @@ -273,7 +273,7 @@ public final class MavenProjectsNavigator extends MavenSimpleProjectComponent im myPane.setOpaque(false); String addIconText = "'+'"; String refreshIconText = "'Reimport'"; - String message = ProjectBundle.message("maven.navigator.nothing.to.display", addIconText, refreshIconText); + String message = MavenProjectBundle.message("maven.navigator.nothing.to.display", addIconText, refreshIconText); int firstEol = message.indexOf("\n"); int addIconMarkerIndex = message.indexOf(addIconText); myPane.replaceSelection(message.substring(0, addIconMarkerIndex)); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsStructure.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsStructure.java index 4f1f2c526dba..977ba47b6d81 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsStructure.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsStructure.java @@ -64,7 +64,7 @@ import java.util.concurrent.ExecutorService; import static icons.ExternalSystemIcons.Task; import static org.jetbrains.idea.maven.navigator.MavenProjectsNavigator.TOOL_WINDOW_PLACE_ID; -import static org.jetbrains.idea.maven.project.ProjectBundle.message; +import static org.jetbrains.idea.maven.project.MavenProjectBundle.message; public class MavenProjectsStructure extends SimpleTreeStructure { private static final URL ERROR_ICON_URL = MavenProjectsStructure.class.getResource("/general/error.png"); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java index 702e510d2df4..39c25e83c2fe 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java @@ -90,10 +90,10 @@ public class MavenArtifactDownloader { if (downloadDocs) types.add(MavenExtraArtifactType.DOCS); String caption = downloadSources && downloadDocs - ? ProjectBundle.message("maven.downloading") + ? MavenProjectBundle.message("maven.downloading") : (downloadSources - ? ProjectBundle.message("maven.downloading.sources") - : ProjectBundle.message("maven.downloading.docs")); + ? MavenProjectBundle.message("maven.downloading.sources") + : MavenProjectBundle.message("maven.downloading.docs")); myProgress.setText(caption); Map artifacts = collectArtifactsToDownload(types); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java index 7e371be3567e..87ccb3c6082f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java @@ -174,7 +174,7 @@ public class MavenEnvironmentForm implements PanelWithAnchor { public JComponent createComponent() { // all listeners will be removed when dialog is closed - mavenHomeComponent.getComponent().addBrowseFolderListener(ProjectBundle.message("maven.select.maven.home.directory"), + mavenHomeComponent.getComponent().addBrowseFolderListener(MavenProjectBundle.message("maven.select.maven.home.directory"), "", null, BrowseFilesListener.SINGLE_DIRECTORY_DESCRIPTOR, TextComponentAccessor.TEXT_FIELD_WITH_HISTORY_WHOLE_TEXT); @@ -185,9 +185,9 @@ public class MavenEnvironmentForm implements PanelWithAnchor { } }); - settingsFileComponent.getComponent().addBrowseFolderListener(ProjectBundle.message("maven.select.maven.settings.file"), "", null, + settingsFileComponent.getComponent().addBrowseFolderListener(MavenProjectBundle.message("maven.select.maven.settings.file"), "", null, FileChooserDescriptorFactory.createSingleFileNoJarsDescriptor()); - localRepositoryComponent.getComponent().addBrowseFolderListener(ProjectBundle.message("maven.select.local.repository"), "", null, + localRepositoryComponent.getComponent().addBrowseFolderListener(MavenProjectBundle.message("maven.select.local.repository"), "", null, FileChooserDescriptorFactory.createSingleFolderDescriptor()); return panel; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.java index fb79767d01ed..d0a7ba30ab63 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.java @@ -131,7 +131,7 @@ public class MavenGeneralPanel implements PanelWithAnchor { @Nls public String getDisplayName() { - return ProjectBundle.message("maven.tab.general"); + return MavenProjectBundle.message("maven.tab.general"); } @Override diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java index f5a5b5037e2a..640719bf32f1 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java @@ -59,7 +59,7 @@ public class MavenIgnoredFilesConfigurable implements SearchableConfigurable, Co private void createUIComponents() { myIgnoredFilesPathsChooser = new ElementsChooser<>(true); - myIgnoredFilesPathsChooser.getEmptyText().setText(ProjectBundle.message("maven.ingored.no.file")); + myIgnoredFilesPathsChooser.getEmptyText().setText(MavenProjectBundle.message("maven.ingored.no.file")); } @Override @@ -98,7 +98,7 @@ public class MavenIgnoredFilesConfigurable implements SearchableConfigurable, Co @Override @Nls public String getDisplayName() { - return ProjectBundle.message("maven.tab.ignored.files"); + return MavenProjectBundle.message("maven.tab.ignored.files"); } @Override diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java index ceefbc9e6e9f..6ab8192839cd 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java @@ -114,7 +114,7 @@ public class MavenImportingConfigurable implements SearchableConfigurable { @Override @Nls public String getDisplayName() { - return ProjectBundle.message("maven.tab.importing"); + return MavenProjectBundle.message("maven.tab.importing"); } @Override diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form index 1a775232298a..bab9facc05a5 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form @@ -280,7 +280,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -302,7 +302,7 @@ - + diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java index c3277dd4c2d7..eb71a875290c 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java @@ -68,7 +68,7 @@ public class MavenImportingSettingsForm { }; mySeparateModulesDirCheckBox.addActionListener(listener); - mySeparateModulesDirChooser.addBrowseFolderListener(ProjectBundle.message("maven.import.title.module.dir"), "", null, + mySeparateModulesDirChooser.addBrowseFolderListener(MavenProjectBundle.message("maven.import.title.module.dir"), "", null, FileChooserDescriptorFactory.createSingleFolderDescriptor()); myUpdateFoldersOnImportPhaseComboBox.setModel(new DefaultComboBoxModel<>(MavenImportingSettings.UPDATE_FOLDERS_PHASES)); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java index e0976069eba9..2b2e3e966dfc 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java @@ -753,7 +753,7 @@ public class MavenProject { for (Map.Entry each : state.myModulesPathsAndNames.entrySet()) { if (LocalFileSystem.getInstance().findFileByPath(each.getKey()) == null) { - result.add(createDependencyProblem(file, ProjectBundle.message("maven.project.problem.moduleNotFound", each.getValue()))); + result.add(createDependencyProblem(file, MavenProjectBundle.message("maven.project.problem.moduleNotFound", each.getValue()))); } } @@ -766,27 +766,27 @@ public class MavenProject { private static void validateParent(VirtualFile file, State state, List result) { if (!isParentResolved(state)) { - result.add(createDependencyProblem(file, ProjectBundle.message("maven.project.problem.parentNotFound", state.myParentId))); + result.add(createDependencyProblem(file, MavenProjectBundle.message("maven.project.problem.parentNotFound", state.myParentId))); } } private static void validateDependencies(VirtualFile file, State state, List result) { for (MavenArtifact each : getUnresolvedDependencies(state)) { - result.add(createDependencyProblem(file, ProjectBundle.message("maven.project.problem.unresolvedDependency", - each.getDisplayStringWithType()))); + result.add(createDependencyProblem(file, MavenProjectBundle.message("maven.project.problem.unresolvedDependency", + each.getDisplayStringWithType()))); } } private static void validateExtensions(VirtualFile file, State state, List result) { for (MavenArtifact each : getUnresolvedExtensions(state)) { - result.add(createDependencyProblem(file, ProjectBundle.message("maven.project.problem.unresolvedExtension", - each.getDisplayStringSimple()))); + result.add(createDependencyProblem(file, MavenProjectBundle.message("maven.project.problem.unresolvedExtension", + each.getDisplayStringSimple()))); } } private static void validatePlugins(VirtualFile file, State state, List result) { for (MavenPlugin each : getUnresolvedPlugins(state)) { - result.add(createDependencyProblem(file, ProjectBundle.message("maven.project.problem.unresolvedPlugin", each))); + result.add(createDependencyProblem(file, MavenProjectBundle.message("maven.project.problem.unresolvedPlugin", each))); } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/ProjectBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectBundle.java similarity index 79% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/project/ProjectBundle.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectBundle.java index c5fe41c69594..fb3c440e5c12 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/ProjectBundle.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectBundle.java @@ -20,11 +20,11 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; -public class ProjectBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.ProjectBundle"; - private static final ProjectBundle INSTANCE = new ProjectBundle(); +public class MavenProjectBundle extends DynamicBundle { + @NonNls private static final String BUNDLE = "messages.MavenProjectBundle"; + private static final MavenProjectBundle INSTANCE = new MavenProjectBundle(); - private ProjectBundle() { super(BUNDLE); } + private MavenProjectBundle() { super(BUNDLE); } @NotNull public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, @NotNull Object... params) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java index fb9354d92884..ce2731fe5f3f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java @@ -393,7 +393,7 @@ public class MavenProjectReader { final MavenProjectReaderProjectLocator locator, Collection problems) { if (recursionGuard.contains(file)) { - problems.add(MavenProjectProblem.createProblem(file.getPath(), ProjectBundle.message("maven.project.problem.recursiveInheritance"), + problems.add(MavenProjectProblem.createProblem(file.getPath(), MavenProjectBundle.message("maven.project.problem.recursiveInheritance"), MavenProjectProblem.ProblemType.PARENT)); return model; } @@ -404,7 +404,7 @@ public class MavenProjectReader { MavenParent parent = model.getParent(); if (parent != null) { if (model.getMavenId().equals(parent.getMavenId())) { - problems.add(MavenProjectProblem.createProblem(file.getPath(), ProjectBundle.message("maven.project.problem.selfInheritance"), + problems.add(MavenProjectProblem.createProblem(file.getPath(), MavenProjectBundle.message("maven.project.problem.selfInheritance"), MavenProjectProblem.ProblemType.PARENT)); return model; } @@ -446,8 +446,8 @@ public class MavenProjectReader { MavenModel parentModel = parentModelWithProblems.second.model; if (!parentModelWithProblems.second.problems.isEmpty()) { problems.add(MavenProjectProblem.createProblem(parentModelWithProblems.first.getPath(), - ProjectBundle.message("maven.project.problem.parentHasProblems", - parentModel.getMavenId()), + MavenProjectBundle.message("maven.project.problem.parentHasProblems", + parentModel.getMavenId()), MavenProjectProblem.ProblemType.PARENT)); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectResolver.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectResolver.java index f51fc9468f7c..8f1b41f575d8 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectResolver.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectResolver.java @@ -127,7 +127,7 @@ public class MavenProjectResolver { process.checkCanceled(); final List names = ContainerUtil.mapNotNull(mavenProjects, p -> p.getDisplayName()); final String text = StringUtil.shortenPathWithEllipsis(StringUtil.join(names, ", "), 200); - process.setText(ProjectBundle.message("maven.resolving.pom", text)); + process.setText(MavenProjectBundle.message("maven.resolving.pom", text)); process.setText2(""); final MavenExplicitProfiles explicitProfiles = new MavenExplicitProfiles(new LinkedHashSet<>(), new LinkedHashSet<>()); @@ -176,7 +176,7 @@ public class MavenProjectResolver { Set filesToRefresh = new HashSet<>(); try { - process.setText(ProjectBundle.message("maven.downloading.pom.plugins", mavenProject.getDisplayName())); + process.setText(MavenProjectBundle.message("maven.downloading.pom.plugins", mavenProject.getDisplayName())); for (MavenPlugin each : mavenProject.getDeclaredPlugins()) { process.checkCanceled(); @@ -222,7 +222,7 @@ public class MavenProjectResolver { @Override public void run(MavenEmbedderWrapper embedder) throws MavenProcessCanceledException { process.checkCanceled(); - process.setText(ProjectBundle.message("maven.updating.folders.pom", mavenProject.getDisplayName())); + process.setText(MavenProjectBundle.message("maven.updating.folders.pom", mavenProject.getDisplayName())); process.setText2(""); Pair resolveResult = mavenProject.resolveFolders(embedder, diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java index e1ede8eb5a88..0a1a9c50f742 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java @@ -221,8 +221,8 @@ public class MavenProjectsManager extends MavenSimpleProjectComponent for (VirtualFile file : pomFiles) { showBalloon( - ProjectBundle.message("maven.orphan.notification.title"), - ProjectBundle.message("maven.orphan.notification.msg", file.getPresentableUrl()), + MavenProjectBundle.message("maven.orphan.notification.title"), + MavenProjectBundle.message("maven.orphan.notification.msg", file.getPresentableUrl()), NON_MANAGED_POM_NOTIFICATION_GROUP, NotificationType.INFORMATION, new NotificationListener.Adapter() { @Override protected void hyperlinkActivated(@NotNull Notification notification, @NotNull HyperlinkEvent e) { @@ -372,15 +372,15 @@ public class MavenProjectsManager extends MavenSimpleProjectComponent } private void initWorkers() { - myReadingProcessor = new MavenProjectsProcessor(myProject, ProjectBundle.message("maven.reading"), false, myEmbeddersManager); - myResolvingProcessor = new MavenProjectsProcessor(myProject, ProjectBundle.message("maven.resolving"), true, myEmbeddersManager); + myReadingProcessor = new MavenProjectsProcessor(myProject, MavenProjectBundle.message("maven.reading"), false, myEmbeddersManager); + myResolvingProcessor = new MavenProjectsProcessor(myProject, MavenProjectBundle.message("maven.resolving"), true, myEmbeddersManager); myPluginsResolvingProcessor = - new MavenProjectsProcessor(myProject, ProjectBundle.message("maven.downloading.plugins"), true, myEmbeddersManager); + new MavenProjectsProcessor(myProject, MavenProjectBundle.message("maven.downloading.plugins"), true, myEmbeddersManager); myFoldersResolvingProcessor = - new MavenProjectsProcessor(myProject, ProjectBundle.message("maven.updating.folders"), true, myEmbeddersManager); + new MavenProjectsProcessor(myProject, MavenProjectBundle.message("maven.updating.folders"), true, myEmbeddersManager); myArtifactsDownloadingProcessor = - new MavenProjectsProcessor(myProject, ProjectBundle.message("maven.downloading"), true, myEmbeddersManager); - myPostProcessor = new MavenProjectsProcessor(myProject, ProjectBundle.message("maven.post.processing"), true, myEmbeddersManager); + new MavenProjectsProcessor(myProject, MavenProjectBundle.message("maven.downloading"), true, myEmbeddersManager); + myPostProcessor = new MavenProjectsProcessor(myProject, MavenProjectBundle.message("maven.post.processing"), true, myEmbeddersManager); myWatcher = new MavenProjectsManagerWatcher(myProject, this, myProjectsTree, getGeneralSettings(), myReadingProcessor); @@ -1284,7 +1284,7 @@ public class MavenProjectsManager extends MavenSimpleProjectComponent r.run(); } else { - MavenUtil.runInBackground(myProject, ProjectBundle.message("maven.project.importing"), false, new MavenTask() { + MavenUtil.runInBackground(myProject, MavenProjectBundle.message("maven.project.importing"), false, new MavenTask() { @Override public void run(MavenProgressIndicator indicator) { r.run(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java index f5b6d476d3be..ed066aa4b363 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java @@ -26,7 +26,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.idea.maven.dom.references.MavenFilteredPropertyPsiReferenceProvider; import org.jetbrains.idea.maven.model.*; -import org.jetbrains.idea.maven.server.MavenEmbedderWrapper; import org.jetbrains.idea.maven.server.NativeMavenProjectHolder; import org.jetbrains.idea.maven.utils.MavenJDOMUtil; import org.jetbrains.idea.maven.utils.*; @@ -517,7 +516,7 @@ public class MavenProjectsTree { return; } updateStack.push(mavenProject); - process.setText(ProjectBundle.message("maven.reading.pom", mavenProject.getPath())); + process.setText(MavenProjectBundle.message("maven.reading.pom", mavenProject.getPath())); process.setText2(""); List prevModules = getModules(mavenProject); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenTestRunningConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenTestRunningConfigurable.java index 98d517326e39..3c2ce17298f2 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenTestRunningConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenTestRunningConfigurable.java @@ -31,7 +31,7 @@ public class MavenTestRunningConfigurable implements SearchableConfigurable, Con @Nls @Override public String getDisplayName() { - return ProjectBundle.message("maven.testRunning"); + return MavenProjectBundle.message("maven.testRunning"); } @Nullable diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleIgnoredProjectsAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleIgnoredProjectsAction.java index e7fd8eb5fe93..b5b938c922fb 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleIgnoredProjectsAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleIgnoredProjectsAction.java @@ -22,8 +22,8 @@ import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.maven.project.MavenIgnoredFilesConfigurable; import org.jetbrains.idea.maven.project.MavenProject; +import org.jetbrains.idea.maven.project.MavenProjectBundle; import org.jetbrains.idea.maven.project.MavenProjectsManager; -import org.jetbrains.idea.maven.project.ProjectBundle; import org.jetbrains.idea.maven.utils.actions.MavenAction; import org.jetbrains.idea.maven.utils.actions.MavenActionUtil; @@ -41,13 +41,13 @@ public class ToggleIgnoredProjectsAction extends MavenAction { List projects = MavenActionUtil.getMavenProjects(context); if (isIgnoredInSettings(projectsManager, projects)) { - e.getPresentation().setText(ProjectBundle.message("maven.ignore.edit")); + e.getPresentation().setText(MavenProjectBundle.message("maven.ignore.edit")); } else if (isIgnored(projectsManager, projects)) { - e.getPresentation().setText(ProjectBundle.message("maven.unignore")); + e.getPresentation().setText(MavenProjectBundle.message("maven.unignore")); } else { - e.getPresentation().setText(ProjectBundle.message("maven.ignore")); + e.getPresentation().setText(MavenProjectBundle.message("maven.ignore")); } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleProfileAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleProfileAction.java index 2175d8aeeb53..24e1888d417d 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleProfileAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleProfileAction.java @@ -20,8 +20,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.model.MavenExplicitProfiles; import org.jetbrains.idea.maven.model.MavenProfileKind; +import org.jetbrains.idea.maven.project.MavenProjectBundle; import org.jetbrains.idea.maven.project.MavenProjectsManager; -import org.jetbrains.idea.maven.project.ProjectBundle; import org.jetbrains.idea.maven.utils.MavenDataKeys; import org.jetbrains.idea.maven.utils.actions.MavenAction; import org.jetbrains.idea.maven.utils.actions.MavenActionUtil; @@ -40,14 +40,14 @@ public class ToggleProfileAction extends MavenAction { String text; switch (targetState) { case NONE: - text = ProjectBundle.message("maven.profile.deactivate"); + text = MavenProjectBundle.message("maven.profile.deactivate"); break; case EXPLICIT: - text = ProjectBundle.message("maven.profile.activate"); + text = MavenProjectBundle.message("maven.profile.activate"); break; case IMPLICIT: default: - text = ProjectBundle.message("maven.profile.default"); + text = MavenProjectBundle.message("maven.profile.default"); break; } e.getPresentation().setText(text); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java index d89c54ffc983..54c18e7e8f94 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; public class TasksBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.TasksBundle"; + @NonNls private static final String BUNDLE = "messages.MavenTasksBundle"; private static final TasksBundle INSTANCE = new TasksBundle(); private TasksBundle() { super(BUNDLE); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenAttachSourcesProvider.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenAttachSourcesProvider.java index 0932818152e2..405d447d99c5 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenAttachSourcesProvider.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenAttachSourcesProvider.java @@ -19,8 +19,8 @@ import org.jetbrains.idea.maven.model.MavenArtifact; import org.jetbrains.idea.maven.model.MavenId; import org.jetbrains.idea.maven.project.MavenArtifactDownloader; import org.jetbrains.idea.maven.project.MavenProject; +import org.jetbrains.idea.maven.project.MavenProjectBundle; import org.jetbrains.idea.maven.project.MavenProjectsManager; -import org.jetbrains.idea.maven.project.ProjectBundle; import java.util.ArrayList; import java.util.Collection; @@ -38,12 +38,12 @@ public class MavenAttachSourcesProvider implements AttachSourcesProvider { return Collections.singleton(new AttachSourcesAction() { @Override public String getName() { - return ProjectBundle.message("maven.action.download.sources"); + return MavenProjectBundle.message("maven.action.download.sources"); } @Override public String getBusyText() { - return ProjectBundle.message("maven.action.download.sources.busy.text"); + return MavenProjectBundle.message("maven.action.download.sources.busy.text"); } @Override diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.java index bf87ba1b98e4..9d7ce11623c6 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.java @@ -72,7 +72,7 @@ public class MavenProjectBuilder extends ProjectImportBuilder impl @Override @NotNull public String getName() { - return ProjectBundle.message("maven.name"); + return MavenProjectBundle.message("maven.name"); } @Override @@ -223,10 +223,10 @@ public class MavenProjectBuilder extends ProjectImportBuilder impl // We cannot determinate project in non-EDT thread. getParameters().myProjectToUpdate = projectToUpdate != null ? projectToUpdate : ProjectManager.getInstance().getDefaultProject(); - return runConfigurationProcess(ProjectBundle.message("maven.scanning.projects"), new MavenTask() { + return runConfigurationProcess(MavenProjectBundle.message("maven.scanning.projects"), new MavenTask() { @Override public void run(MavenProgressIndicator indicator) throws MavenProcessCanceledException { - indicator.setText(ProjectBundle.message("maven.locating.files")); + indicator.setText(MavenProjectBundle.message("maven.locating.files")); getParameters().myImportRoot = LocalFileSystem.getInstance().refreshAndFindFileByPath(root); if (getParameters().myImportRoot == null) throw new MavenProcessCanceledException(); @@ -249,7 +249,7 @@ public class MavenProjectBuilder extends ProjectImportBuilder impl @Deprecated @ApiStatus.ScheduledForRemoval public boolean setSelectedProfiles(MavenExplicitProfiles profiles) { - return runConfigurationProcess(ProjectBundle.message("maven.scanning.projects"), new MavenTask() { + return runConfigurationProcess(MavenProjectBundle.message("maven.scanning.projects"), new MavenTask() { @Override public void run(MavenProgressIndicator indicator) { readMavenProjectTree(indicator); diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml index a60de4d32a8c..655cd7b552f4 100644 --- a/plugins/maven/src/main/resources/META-INF/plugin.xml +++ b/plugins/maven/src/main/resources/META-INF/plugin.xml @@ -65,16 +65,16 @@ + key="maven.tab.importing" bundle="messages.MavenProjectBundle"/> + id="reference.settings.project.maven.ignored.files" key="maven.tab.ignored.files" bundle="messages.MavenProjectBundle"/> + id="reference.settings.project.maven.runner" key="maven.tab.runner" bundle="messages.MavenRunnerBundle"/> diff --git a/plugins/maven/src/main/resources/messages/IndicesBundle.properties b/plugins/maven/src/main/resources/messages/MavenIndicesBundle.properties similarity index 100% rename from plugins/maven/src/main/resources/messages/IndicesBundle.properties rename to plugins/maven/src/main/resources/messages/MavenIndicesBundle.properties diff --git a/plugins/maven/src/main/resources/messages/ProjectBundle.properties b/plugins/maven/src/main/resources/messages/MavenProjectBundle.properties similarity index 100% rename from plugins/maven/src/main/resources/messages/ProjectBundle.properties rename to plugins/maven/src/main/resources/messages/MavenProjectBundle.properties diff --git a/plugins/maven/src/main/resources/messages/RunnerBundle.properties b/plugins/maven/src/main/resources/messages/MavenRunnerBundle.properties similarity index 100% rename from plugins/maven/src/main/resources/messages/RunnerBundle.properties rename to plugins/maven/src/main/resources/messages/MavenRunnerBundle.properties diff --git a/plugins/maven/src/main/resources/messages/SyncBundle.properties b/plugins/maven/src/main/resources/messages/MavenSyncBundle.properties similarity index 100% rename from plugins/maven/src/main/resources/messages/SyncBundle.properties rename to plugins/maven/src/main/resources/messages/MavenSyncBundle.properties diff --git a/plugins/maven/src/main/resources/messages/TasksBundle.properties b/plugins/maven/src/main/resources/messages/MavenTasksBundle.properties similarity index 100% rename from plugins/maven/src/main/resources/messages/TasksBundle.properties rename to plugins/maven/src/main/resources/messages/MavenTasksBundle.properties