MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

rename mvn bundles

Browse Source 
GitOrigin-RevId: 8b7b52d331ac6ce71e83308fd6f5e0f1d81b5021
This commit is contained in:
Sergey Ignatov
2019-12-19 22:06:01 +00:00
committed by intellij-monorepo-bot
parent 08cd97fec3
commit 4235731d82
32 changed files with 81 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunConfiguration.java
+2 -2
View File
@@ -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;
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/RunnerBundle.java
+1 -1
View File
@@ -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() {
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/SyncBundle.java
+1 -1
View File
@@ -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() {
plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenProjectImporter.java
+10 -10
View File
@@ -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)) {
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java
+1 -1
View File
@@ -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); }
plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsNavigator.java
+1 -1
View File
@@ -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));
plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenProjectsStructure.java
+1 -1
View File
@@ -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");
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java
+3 -3
View File
@@ -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<MavenId, DownloadData> artifacts = collectArtifactsToDownload(types);
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java
+3 -3
View File
@@ -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;
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralPanel.java
+1 -1
View File
@@ -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
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenIgnoredFilesConfigurable.java
+2 -2
View File
@@ -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
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java
+1 -1
View File
@@ -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
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
+3 -3
View File
@@ -280,7 +280,7 @@
<properties>
<labelFor value="83bca"/>
<text value="Dependency types:"/>
<toolTipText resource-bundle="messages/ProjectBundle" key="maven.import.dependency.type.description"/>
<toolTipText resource-bundle="messages/MavenProjectBundle" key="maven.import.dependency.type.description"/>
</properties>
</component>
<component id="83bca" class="javax.swing.JTextField" binding="myDependencyTypes">
@@ -291,7 +291,7 @@
</constraints>
<properties>
<columns value="0"/>
<toolTipText resource-bundle="ProjectBundle" key="maven.import.dependency.type.description"/>
<toolTipText resource-bundle="messages/MavenProjectBundle" key="maven.import.dependency.type.description"/>
</properties>
</component>
<component id="d634c" class="com.intellij.ui.components.JBLabel">
@@ -302,7 +302,7 @@
<componentStyle value="SMALL"/>
<fontColor value="BRIGHTER"/>
<labelFor value="83bca"/>
<text resource-bundle="ProjectBundle" key="maven.import.dependency.type.description"/>
<text resource-bundle="messages/MavenProjectBundle" key="maven.import.dependency.type.description"/>
</properties>
</component>
<vspacer id="e1c6c">
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java
+1 -1
View File
@@ -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));
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProject.java
+7 -7
View File
@@ -753,7 +753,7 @@ public class MavenProject {
for (Map.Entry<String, String> 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<MavenProjectProblem> 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<MavenProjectProblem> 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<MavenProjectProblem> 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<MavenProjectProblem> 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)));
}
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/ProjectBundle.java → plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectBundle.java
+4 -4
View File
@@ -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) {
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java
+4 -4
View File
@@ -393,7 +393,7 @@ public class MavenProjectReader {
final MavenProjectReaderProjectLocator locator,
Collection<MavenProjectProblem> 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));
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectResolver.java
+3 -3
View File
@@ -127,7 +127,7 @@ public class MavenProjectResolver {
process.checkCanceled();
final List<String> 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<File> 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<Boolean, MavenProjectChanges> resolveResult = mavenProject.resolveFolders(embedder,
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
+9 -9
View File
@@ -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();
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java
+1 -2
View File
@@ -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<MavenProject> prevModules = getModules(mavenProject);
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenTestRunningConfigurable.java
+1 -1
View File
@@ -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
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleIgnoredProjectsAction.java
+4 -4
View File
@@ -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<MavenProject> 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"));
}
}
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/actions/ToggleProfileAction.java
+4 -4
View File
@@ -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);
plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java
+1 -1
View File
@@ -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); }
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenAttachSourcesProvider.java
+3 -3
View File
@@ -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
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.java
+4 -4
View File
@@ -72,7 +72,7 @@ public class MavenProjectBuilder extends ProjectImportBuilder<MavenProject> 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<MavenProject> 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<MavenProject> 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);
plugins/maven/src/main/resources/META-INF/plugin.xml
+5 -5
View File
@@ -65,16 +65,16 @@
<projectConfigurable groupId="build.tools" groupWeight="120" instance="org.jetbrains.idea.maven.utils.MavenSettings" id="MavenSettings"
displayName="Maven" order="last">
<configurable instance="org.jetbrains.idea.maven.project.MavenImportingConfigurable" id="reference.settings.project.maven.importing"
key="maven.tab.importing" bundle="ProjectBundle"/>
key="maven.tab.importing" bundle="messages.MavenProjectBundle"/>
<configurable instance="org.jetbrains.idea.maven.project.MavenIgnoredFilesConfigurable"
id="reference.settings.project.maven.ignored.files" key="maven.tab.ignored.files" bundle="ProjectBundle"/>
id="reference.settings.project.maven.ignored.files" key="maven.tab.ignored.files" bundle="messages.MavenProjectBundle"/>
<configurable instance="org.jetbrains.idea.maven.utils.MavenSettings$MyMavenRunnerConfigurable"
id="reference.settings.project.maven.runner" key="maven.tab.runner" bundle="RunnerBundle"/>
id="reference.settings.project.maven.runner" key="maven.tab.runner" bundle="messages.MavenRunnerBundle"/>
<configurable instance="org.jetbrains.idea.maven.project.MavenTestRunningConfigurable"
id="reference.settings.project.maven.testRunning" key="maven.testRunning" bundle="ProjectBundle"
id="reference.settings.project.maven.testRunning" key="maven.testRunning" bundle="messages.MavenProjectBundle"
nonDefaultProject="true"/>
<configurable instance="org.jetbrains.idea.maven.indices.MavenRepositoriesConfigurable"
id="reference.settings.project.maven.repository.indices" key="maven.repositories.title" bundle="IndicesBundle"
id="reference.settings.project.maven.repository.indices" key="maven.repositories.title" bundle="messages.MavenIndicesBundle"
nonDefaultProject="true"/>
</projectConfigurable>
plugins/maven/src/main/resources/messages/IndicesBundle.properties → plugins/maven/src/main/resources/messages/MavenIndicesBundle.properties
View File
plugins/maven/src/main/resources/messages/ProjectBundle.properties → plugins/maven/src/main/resources/messages/MavenProjectBundle.properties
View File
plugins/maven/src/main/resources/messages/RunnerBundle.properties → plugins/maven/src/main/resources/messages/MavenRunnerBundle.properties
View File
plugins/maven/src/main/resources/messages/SyncBundle.properties → plugins/maven/src/main/resources/messages/MavenSyncBundle.properties
View File
plugins/maven/src/main/resources/messages/TasksBundle.properties → plugins/maven/src/main/resources/messages/MavenTasksBundle.properties
View File