From 98f374e5d2108ce410c7fd3e9cbdfc10c2000ae6 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 19 Feb 2020 11:13:45 +0300 Subject: [PATCH] [java] rename CompilerBundle to JavaCompilerBundle for consistency GitOrigin-RevId: 416cfbce74a6dc17bb19eef5fc67b06fbb288275 --- .../compiler/CompilerConfigurationImpl.java | 10 ++--- .../compiler/CompilerIconLayerProvider.java | 4 +- .../compiler/CompilerMessageImpl.java | 4 +- .../compiler/actions/BuildArtifactAction.java | 10 ++--- .../compiler/actions/CompileAction.java | 6 +-- .../actions/CompileProjectAction.java | 4 +- .../compiler/actions/MakeModuleAction.java | 4 +- .../impl/CleanStaleModuleOutputsActivity.kt | 23 +++++----- .../intellij/compiler/impl/CompileDriver.java | 34 ++++++++------- .../compiler/impl/CompilerCacheManager.java | 2 +- .../impl/CompilerPropertiesAction.java | 4 +- .../impl/ExcludeFromCompileAction.java | 4 +- .../FileProcessingCompilerAdapterTask.java | 2 +- .../compiler/impl/ProblemsViewPanel.java | 4 +- .../CompilerModuleOptionsComponent.java | 10 ++--- .../javaCompiler/eclipse/EclipseCompiler.java | 4 +- .../eclipse/EclipseCompilerConfigurable.form | 10 ++--- .../eclipse/EclipseCompilerConfigurable.java | 6 +-- .../javac/FilePathActionJavac.java | 4 +- .../javaCompiler/javac/JavacCompiler.java | 4 +- .../javaCompiler/javac/JavacConfigurable.java | 4 +- .../javaCompiler/javac/JavacOptionsPanel.form | 14 +++--- .../javaCompiler/javac/JavacOutputParser.java | 8 ++-- ...oadedModulesCompilationCheckinHandler.java | 13 +++--- .../inspection/ChangeSuperClassFix.java | 4 +- .../FrequentlyUsedInheritorInspection.java | 4 +- .../AnnotationProcessorsConfigurable.java | 4 +- .../options/AnnotationProcessorsPanel.java | 8 ++-- .../options/CompilerConfigurable.java | 4 +- .../options/CompilerOptionsPanel.form | 28 ++++++------ .../options/CompilerUIConfigurable.java | 13 +++--- .../options/ExcludeFromValidationAction.java | 4 +- .../compiler/options/JavaCompilersTab.form | 4 +- .../compiler/options/JavaCompilersTab.java | 4 +- .../options/ProcessorProfilePanel.java | 36 ++++++++-------- .../compiler/options/RmicConfigurable.java | 4 +- .../compiler/options/RmicOptionsPanel.form | 10 ++--- .../options/TargetOptionsComponent.java | 18 ++++---- .../options/ValidationConfigurable.form | 2 +- .../options/ValidationConfigurable.java | 10 ++--- .../compiler/progress/CompilerTask.java | 10 ++--- .../intellij/ide/macro/OutputPathMacro.java | 4 +- .../util/InspectionValidatorWrapper.java | 2 +- .../deployment/DeploymentUtilImpl.java | 12 +++--- .../JarArtifactFromModulesDialog.java | 6 +-- .../artifacts/JarFromModulesTemplate.java | 4 +- .../impl/artifacts/PlainArtifactType.java | 4 +- .../impl/elements/ArchiveElementType.java | 8 ++-- .../impl/elements/ArtifactElementType.java | 7 +-- .../elements/ArtifactRootElementImpl.java | 4 +- .../impl/elements/DirectoryElementType.java | 8 ++-- .../impl/elements/LibraryElementType.java | 6 +-- .../impl/elements/ManifestFileUtil.java | 4 +- .../impl/elements/ModuleElementTypeBase.java | 4 +- .../elements/ModuleOutputElementTypeBase.java | 4 +- .../ProductionModuleOutputElementType.java | 6 +-- .../ProductionModuleSourceElementType.kt | 6 +-- .../elements/TestModuleOutputElementType.java | 6 +-- .../BuildArtifactsBeforeRunTaskProvider.java | 10 ++--- ...ildArtifactsBeforeRunTaskProviderBase.java | 4 +- .../impl/ui/DirectoryCopyPresentation.java | 4 +- .../impl/ui/actions/PackageFileAction.java | 9 ++-- .../impl/ui/actions/PackageFileWorker.java | 8 ++-- .../ElementWithManifestPropertiesPanel.form | 4 +- .../ElementWithManifestPropertiesPanel.java | 10 ++--- .../openapi/compiler/CompilerBundle.java | 43 ++++--------------- .../compiler/CompilerMessageCategory.java | 8 ++-- .../openapi/compiler/JavaCompilerBundle.java | 40 +++++++++++++++++ .../options/ExcludedEntriesConfigurable.java | 10 ++--- .../ui/configuration/ClasspathEditor.java | 4 +- .../artifacts/ArtifactEditorImpl.java | 8 ++-- java/java-impl/src/META-INF/JavaPlugin.xml | 8 ++-- .../testFramework/CompilerTester.java | 2 +- ...operties => JavaCompilerBundle.properties} | 0 74 files changed, 324 insertions(+), 302 deletions(-) create mode 100644 java/compiler/openapi/src/com/intellij/openapi/compiler/JavaCompilerBundle.java rename resources-en/src/messages/{CompilerBundle.properties => JavaCompilerBundle.properties} (100%) diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java index 9ccb4ae3d823..46e730883ff8 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java @@ -9,7 +9,7 @@ import com.intellij.compiler.impl.javaCompiler.javac.JavacCompiler; import com.intellij.compiler.server.BuildManager; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ApplicationNamesInfo; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.compiler.CompilerManager; import com.intellij.openapi.compiler.options.ExcludeEntryDescription; import com.intellij.openapi.compiler.options.ExcludedEntriesConfiguration; @@ -945,7 +945,7 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements } if (!ok) { final String initialPatternString = patternsToString(getRegexpPatterns()); - final String message = CompilerBundle.message( + final String message = JavaCompilerBundle.message( "message.resource.patterns.format.changed", ApplicationNamesInfo.getInstance().getProductName(), initialPatternString, @@ -953,7 +953,7 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements CommonBundle.getCancelButtonText() ); final String wildcardPatterns = Messages.showInputDialog( - myProject, message, CompilerBundle.message("pattern.conversion.dialog.title"), Messages.getWarningIcon(), initialPatternString, new InputValidator() { + myProject, message, JavaCompilerBundle.message("pattern.conversion.dialog.title"), Messages.getWarningIcon(), initialPatternString, new InputValidator() { @Override public boolean checkInput(String inputString) { return true; @@ -977,8 +977,8 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements } if (malformedPatterns.length() > 0) { - Messages.showErrorDialog(CompilerBundle.message("error.bad.resource.patterns", malformedPatterns.toString()), - CompilerBundle.message("bad.resource.patterns.dialog.title")); + Messages.showErrorDialog(JavaCompilerBundle.message("error.bad.resource.patterns", malformedPatterns.toString()), + JavaCompilerBundle.message("bad.resource.patterns.dialog.title")); removeWildcardPatterns(); return false; } diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerIconLayerProvider.java b/java/compiler/impl/src/com/intellij/compiler/CompilerIconLayerProvider.java index 8579cbeab020..45db1b8cf368 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerIconLayerProvider.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerIconLayerProvider.java @@ -16,7 +16,7 @@ package com.intellij.compiler; import com.intellij.ide.IconLayerProvider; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.FileIndexFacade; @@ -56,7 +56,7 @@ public class CompilerIconLayerProvider implements IconLayerProvider { @NotNull @Override public String getLayerDescription() { - return CompilerBundle.message("node.excluded.flag.tooltip"); + return JavaCompilerBundle.message("node.excluded.flag.tooltip"); } public static boolean isExcluded(final VirtualFile vFile, final Project project) { diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerMessageImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerMessageImpl.java index d7879aea6732..ea2b4af4aa3a 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerMessageImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerMessageImpl.java @@ -15,7 +15,7 @@ */ package com.intellij.compiler; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.compiler.CompilerMessage; import com.intellij.openapi.compiler.CompilerMessageCategory; import com.intellij.openapi.fileEditor.OpenFileDescriptor; @@ -96,7 +96,7 @@ public final class CompilerMessageImpl implements CompilerMessage { @Override public String getExportTextPrefix() { if (getLine() >= 0) { - return CompilerBundle.message("compiler.results.export.text.prefix", getLine()); + return JavaCompilerBundle.message("compiler.results.export.text.prefix", getLine()); } return ""; } diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java index 49adc958cb1f..ffd92dc2eff5 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/BuildArtifactAction.java @@ -22,7 +22,7 @@ import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonShortcuts; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.progress.ProgressIndicator; @@ -201,13 +201,13 @@ public class BuildArtifactAction extends DumbAwareAction { message = "The output directories of the following artifacts contains source roots:\n" + info + "Do you want to continue and clear these directories?"; } - final int answer = Messages.showYesNoDialog(myProject, message, CompilerBundle.message("clean.artifacts"), null); + final int answer = Messages.showYesNoDialog(myProject, message, JavaCompilerBundle.message("clean.artifacts"), null); if (answer != Messages.YES) { return; } } - new Task.Backgroundable(myProject, CompilerBundle.message("cleaning.artifacts"), true) { + new Task.Backgroundable(myProject, JavaCompilerBundle.message("cleaning.artifacts"), true) { @Override public void run(@NotNull ProgressIndicator indicator) { List deleted = new ArrayList<>(); @@ -215,8 +215,8 @@ public class BuildArtifactAction extends DumbAwareAction { indicator.checkCanceled(); File file = pair.getFirst(); if (!FileUtil.delete(file)) { - Holder.NOTIFICATION_GROUP.createNotification(CompilerBundle.message("cannot.clean.0.artifact", pair.getSecond().getName()), - CompilerBundle.message("cannot.delete.0", file.getAbsolutePath()), NotificationType.ERROR, null).notify(myProject); + Holder.NOTIFICATION_GROUP.createNotification(JavaCompilerBundle.message("cannot.clean.0.artifact", pair.getSecond().getName()), + JavaCompilerBundle.message("cannot.delete.0", file.getAbsolutePath()), NotificationType.ERROR, null).notify(myProject); } else { deleted.add(file); diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java index 111289fccc7b..8595844f5a9e 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java @@ -4,7 +4,7 @@ package com.intellij.compiler.actions; import com.intellij.compiler.CompilerConfiguration; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.*; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.compiler.CompilerManager; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.module.Module; @@ -67,7 +67,7 @@ public class CompileAction extends CompileActionBase { String elementDescription = null; if (module != null) { - elementDescription = CompilerBundle.message("action.compile.description.module", module.getName()); + elementDescription = JavaCompilerBundle.message("action.compile.description.module", module.getName()); } else { PsiPackage aPackage = null; @@ -110,7 +110,7 @@ public class CompileAction extends CompileActionBase { } else { forFiles = true; - elementDescription = CompilerBundle.message("action.compile.description.selected.files"); + elementDescription = JavaCompilerBundle.message("action.compile.description.selected.files"); } } diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/CompileProjectAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/CompileProjectAction.java index fbaa54963482..f96c2e8ce632 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/CompileProjectAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/CompileProjectAction.java @@ -5,7 +5,7 @@ import com.intellij.history.LocalHistory; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.project.Project; import com.intellij.task.ProjectTaskManager; import org.jetbrains.annotations.NotNull; @@ -19,7 +19,7 @@ public class CompileProjectAction extends CompileActionBase { if (!result.isAborted() && !project.isDisposed()) { String text = getTemplatePresentation().getText(); LocalHistory.getInstance().putSystemLabel( - project, CompilerBundle.message(result.hasErrors() ? "rebuild.lvcs.label.with.errors" : "rebuild.lvcs.label.no.errors", text)); + project, JavaCompilerBundle.message(result.hasErrors() ? "rebuild.lvcs.label.with.errors" : "rebuild.lvcs.label.no.errors", text)); } }); } diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/MakeModuleAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/MakeModuleAction.java index fbc4410d341d..b052cb3452c1 100644 --- a/java/compiler/impl/src/com/intellij/compiler/actions/MakeModuleAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/actions/MakeModuleAction.java @@ -16,7 +16,7 @@ package com.intellij.compiler.actions; import com.intellij.openapi.actionSystem.*; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; @@ -64,7 +64,7 @@ public class MakeModuleAction extends CompileActionBase { String text = actionName; for (int i = 0; i < modules.length; i++) { if (text.length() > 30) { - text = CompilerBundle.message("action.make.selected.modules.text"); + text = JavaCompilerBundle.message("action.make.selected.modules.text"); break; } Module toMake = modules[i]; diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CleanStaleModuleOutputsActivity.kt b/java/compiler/impl/src/com/intellij/compiler/impl/CleanStaleModuleOutputsActivity.kt index 49604542daff..d7b2eb5d7ba1 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CleanStaleModuleOutputsActivity.kt +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CleanStaleModuleOutputsActivity.kt @@ -9,7 +9,7 @@ import com.intellij.notification.NotificationType import com.intellij.notification.Notifications import com.intellij.openapi.actionSystem.AnActionEvent import com.intellij.openapi.application.runReadAction -import com.intellij.openapi.compiler.CompilerBundle +import com.intellij.openapi.compiler.JavaCompilerBundle import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.progress.ProgressIndicator import com.intellij.openapi.progress.Task @@ -46,15 +46,15 @@ class CleanStaleModuleOutputsActivity : StartupActivity.DumbAware { runReadAction { val outputPath = CompilerProjectExtension.getInstance(project)!!.compilerOutput!!.presentableUrl val notification = Notification( - "Build", CompilerBundle.message("notification.title.delete.old.output.directories"), - CompilerBundle.message("notification.content.delete.old.output.directories", staleOutputs.size, outputPath), + "Build", JavaCompilerBundle.message("notification.title.delete.old.output.directories"), + JavaCompilerBundle.message("notification.content.delete.old.output.directories", staleOutputs.size, outputPath), NotificationType.INFORMATION - ).addAction(object : NotificationAction(CompilerBundle.message("notification.action.text.cleanup")) { + ).addAction(object : NotificationAction(JavaCompilerBundle.message("notification.action.text.cleanup")) { override fun actionPerformed(e: AnActionEvent, notification: Notification) { notification.expire() runCleanup(staleOutputs, project, ::createMarker) } - }).addAction(object : NotificationAction(CompilerBundle.message("notification.action.text.do.not.ask")) { + }).addAction(object : NotificationAction(JavaCompilerBundle.message("notification.action.text.do.not.ask")) { override fun actionPerformed(e: AnActionEvent, notification: Notification) { notification.expire() createMarker() @@ -79,23 +79,24 @@ class CleanStaleModuleOutputsActivity : StartupActivity.DumbAware { } //until IDEA-186296 is fixed we need to use IDEA's message dialog for potentially long messages - val answer = Messages.showIdeaMessageDialog(project, CompilerBundle.message("dialog.text.delete.old.outputs", outputs.size, outputsString), - CompilerBundle.message("dialog.title.delete.old.outputs"), - arrayOf(CompilerBundle.message("button.text.delete.old.outputs"), CommonBundle.getCancelButtonText()), 0,null, null) + val answer = Messages.showIdeaMessageDialog(project, JavaCompilerBundle.message("dialog.text.delete.old.outputs", outputs.size, outputsString), + JavaCompilerBundle.message("dialog.title.delete.old.outputs"), + arrayOf( + JavaCompilerBundle.message("button.text.delete.old.outputs"), CommonBundle.getCancelButtonText()), 0, null, null) if (answer == Messages.CANCEL) return val filesToDelete = outputs.map { VfsUtil.virtualToIoFile(it) } - object : Task.Backgroundable(project, CompilerBundle.message("dialog.title.delete.old.outputs")) { + object : Task.Backgroundable(project, JavaCompilerBundle.message("dialog.title.delete.old.outputs")) { override fun run(indicator: ProgressIndicator) { indicator.isIndeterminate = false filesToDelete.forEachIndexed { i, file -> indicator.checkCanceled() indicator.fraction = i.toDouble() / filesToDelete.size - indicator.text = CompilerBundle.message("progress.text.deleting.directory", file.absolutePath) + indicator.text = JavaCompilerBundle.message("progress.text.deleting.directory", file.absolutePath) FileUtil.delete(file) } onSuccess() - indicator.text = CompilerBundle.message("progress.text.synchronizing.output.directories") + indicator.text = JavaCompilerBundle.message("progress.text.synchronizing.output.directories") LocalFileSystem.getInstance().refreshIoFiles(filesToDelete, true, false, null) } }.queue() diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java index 9252ddf0e0e5..0b2c9f516618 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java @@ -372,7 +372,8 @@ public final class CompileDriver { ApplicationManager.getApplication().assertIsDispatchThread(); final boolean isUnitTestMode = ApplicationManager.getApplication().isUnitTestMode(); - final String name = CompilerBundle.message(isRebuild ? "compiler.content.name.rebuild" : forceCompile ? "compiler.content.name.recompile" : "compiler.content.name.make"); + final String name = JavaCompilerBundle + .message(isRebuild ? "compiler.content.name.rebuild" : forceCompile ? "compiler.content.name.recompile" : "compiler.content.name.make"); final CompilerTask compileTask = new CompilerTask( myProject, name, isUnitTestMode, !withModalProgress, true, isCompilationStartedAutomatically(scope), withModalProgress ); @@ -453,9 +454,9 @@ public final class CompileDriver { compileTask.start(compileWork, () -> { if (isRebuild) { final int rv = Messages.showOkCancelDialog( - myProject, CompilerBundle.message("you.are.about.to.rebuild.the.whole.project"), - CompilerBundle.message("confirm.project.rebuild"), - CommonBundle.message("button.build"), CompilerBundle.message("button.rebuild"), Messages.getQuestionIcon() + myProject, JavaCompilerBundle.message("you.are.about.to.rebuild.the.whole.project"), + JavaCompilerBundle.message("confirm.project.rebuild"), + CommonBundle.message("button.build"), JavaCompilerBundle.message("button.rebuild"), Messages.getQuestionIcon() ); if (rv == Messages.OK /*yes, please, do run make*/) { startup(scope, false, false, callback, null); @@ -483,7 +484,7 @@ public final class CompileDriver { Collection affectedRoots = ContainerUtil.newHashSet(CompilerPaths.getOutputPaths(affectedModules)); if (!affectedRoots.isEmpty()) { ProgressIndicator indicator = compileContext.getProgressIndicator(); - indicator.setText(CompilerBundle.message("synchronizing.output.directories")); + indicator.setText(JavaCompilerBundle.message("synchronizing.output.directories")); CompilerUtil.refreshOutputRoots(affectedRoots); indicator.setText(""); } @@ -531,19 +532,19 @@ public final class CompileDriver { private static String createStatusMessage(final ExitStatus status, final int warningCount, final int errorCount, long duration) { String message; if (status == ExitStatus.CANCELLED) { - message = CompilerBundle.message("status.compilation.aborted"); + message = JavaCompilerBundle.message("status.compilation.aborted"); } else if (status == ExitStatus.UP_TO_DATE) { - message = CompilerBundle.message("status.all.up.to.date"); + message = JavaCompilerBundle.message("status.all.up.to.date"); } else { if (status == ExitStatus.SUCCESS) { message = warningCount > 0 - ? CompilerBundle.message("status.compilation.completed.successfully.with.warnings", warningCount) - : CompilerBundle.message("status.compilation.completed.successfully"); + ? JavaCompilerBundle.message("status.compilation.completed.successfully.with.warnings", warningCount) + : JavaCompilerBundle.message("status.compilation.completed.successfully"); } else { - message = CompilerBundle.message("status.compilation.completed.successfully.with.warnings.and.errors", errorCount, warningCount); + message = JavaCompilerBundle.message("status.compilation.completed.successfully.with.warnings.and.errors", errorCount, warningCount); } message = message + " in " + StringUtil.formatDurationApproximate(duration); } @@ -588,7 +589,7 @@ public final class CompileDriver { List tasks = beforeTasks ? manager.getBeforeTasks() : manager.getAfterTaskList(); if (tasks.size() > 0) { progressIndicator.setText( - CompilerBundle.message(beforeTasks ? "progress.executing.precompile.tasks" : "progress.executing.postcompile.tasks")); + JavaCompilerBundle.message(beforeTasks ? "progress.executing.precompile.tasks" : "progress.executing.postcompile.tasks")); for (CompileTask task : tasks) { try { if (!task.execute(context)) { @@ -660,7 +661,8 @@ public final class CompileDriver { } } if (!modulesWithoutJdkAssigned.isEmpty()) { - showNotSpecifiedError("error.jdk.not.specified", projectSdkNotSpecified, modulesWithoutJdkAssigned, CompilerBundle.message("modules.classpath.title")); + showNotSpecifiedError("error.jdk.not.specified", projectSdkNotSpecified, modulesWithoutJdkAssigned, JavaCompilerBundle + .message("modules.classpath.title")); return false; } @@ -715,7 +717,7 @@ public final class CompileDriver { LOG.assertTrue(firstModule != null); String moduleNameToSelect = firstModule.getName(); final String moduleNames = getModulesString(modulesInChunk); - Messages.showMessageDialog(myProject, CompilerBundle.message("error.chunk.modules.must.have.same.language.level", moduleNames), + Messages.showMessageDialog(myProject, JavaCompilerBundle.message("error.chunk.modules.must.have.same.language.level", moduleNames), CommonBundle.getErrorTitle(), Messages.getErrorIcon()); showConfigurationDialog(moduleNameToSelect, null); } @@ -725,7 +727,7 @@ public final class CompileDriver { LOG.assertTrue(firstModule != null); String moduleNameToSelect = firstModule.getName(); final String moduleNames = getModulesString(modulesInChunk); - Messages.showMessageDialog(myProject, CompilerBundle.message("error.chunk.modules.must.have.same.jdk", moduleNames), + Messages.showMessageDialog(myProject, JavaCompilerBundle.message("error.chunk.modules.must.have.same.jdk", moduleNames), CommonBundle.getErrorTitle(), Messages.getErrorIcon()); showConfigurationDialog(moduleNameToSelect, null); } @@ -738,7 +740,7 @@ public final class CompileDriver { return !ModuleRootManager.getInstance(module).getSourceRoots(rootType).isEmpty(); } - private void showNotSpecifiedError(@PropertyKey(resourceBundle = CompilerBundle.BUNDLE) @NonNls String resourceId, boolean notSpecifiedValueInheritedFromProject, List modules, + private void showNotSpecifiedError(@PropertyKey(resourceBundle = JavaCompilerBundle.BUNDLE) @NonNls String resourceId, boolean notSpecifiedValueInheritedFromProject, List modules, String editorNameToSelect) { String nameToSelect = null; final StringBuilder names = new StringBuilder(); @@ -757,7 +759,7 @@ public final class CompileDriver { if (modules.size() > maxModulesToShow) { names.append(",\n..."); } - final String message = CompilerBundle.message(resourceId, modules.size(), names.toString()); + final String message = JavaCompilerBundle.message(resourceId, modules.size(), names.toString()); if (ApplicationManager.getApplication().isUnitTestMode()) { LOG.error(message); diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerCacheManager.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerCacheManager.java index 8f5f0e6e373e..01953c7201dd 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerCacheManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerCacheManager.java @@ -94,7 +94,7 @@ public final class CompilerCacheManager implements Disposable { for (final File child : children) { final boolean deleteOk = FileUtil.delete(child); if (!deleteOk) { - context.addMessage(CompilerMessageCategory.ERROR, CompilerBundle.message("compiler.error.failed.to.delete", child.getPath()), null, -1, -1); + context.addMessage(CompilerMessageCategory.ERROR, JavaCompilerBundle.message("compiler.error.failed.to.delete", child.getPath()), null, -1, -1); } } } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java index f3d2d382ccbd..fdf755037f92 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerPropertiesAction.java @@ -19,7 +19,7 @@ import com.intellij.compiler.options.CompilerConfigurable; import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; @@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull; */ class CompilerPropertiesAction extends AnAction { CompilerPropertiesAction() { - super(CompilerBundle.lazyMessage("action.compiler.properties.text"), AllIcons.General.Settings); + super(JavaCompilerBundle.lazyMessage("action.compiler.properties.text"), AllIcons.General.Settings); } @Override diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/ExcludeFromCompileAction.java b/java/compiler/impl/src/com/intellij/compiler/impl/ExcludeFromCompileAction.java index 1d53b1e28a1b..2cd27b40d5ad 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/ExcludeFromCompileAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/ExcludeFromCompileAction.java @@ -10,7 +10,7 @@ import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.compiler.options.ExcludeEntryDescription; import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.FileStatusManager; @@ -26,7 +26,7 @@ class ExcludeFromCompileAction extends AnAction { private final NewErrorTreeViewPanel myErrorTreeView; ExcludeFromCompileAction(Project project, NewErrorTreeViewPanel errorTreeView) { - super(CompilerBundle.message("actions.exclude.from.compile.text")); + super(JavaCompilerBundle.message("actions.exclude.from.compile.text")); myProject = project; myErrorTreeView = errorTreeView; } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/FileProcessingCompilerAdapterTask.java b/java/compiler/impl/src/com/intellij/compiler/impl/FileProcessingCompilerAdapterTask.java index 47caec2b76be..1a2456047bf6 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/FileProcessingCompilerAdapterTask.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/FileProcessingCompilerAdapterTask.java @@ -83,7 +83,7 @@ public class FileProcessingCompilerAdapterTask implements CompileTask { return true; } - CompilerUtil.runInContext(context, CompilerBundle.message("progress.updating.caches"), () -> { + CompilerUtil.runInContext(context, JavaCompilerBundle.message("progress.updating.caches"), () -> { final List vFiles = new ArrayList<>(processed.length); final List> toUpdate = new ArrayList<>(processed.length); ApplicationManager.getApplication().runReadAction(() -> { diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/ProblemsViewPanel.java b/java/compiler/impl/src/com/intellij/compiler/impl/ProblemsViewPanel.java index 694de2befacd..db1d0fb28c73 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/ProblemsViewPanel.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/ProblemsViewPanel.java @@ -3,7 +3,7 @@ package com.intellij.compiler.impl; import com.intellij.ide.errorTreeView.NewErrorTreeViewPanel; import com.intellij.openapi.actionSystem.DefaultActionGroup; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; @@ -11,7 +11,7 @@ public final class ProblemsViewPanel extends NewErrorTreeViewPanel { public ProblemsViewPanel(@NotNull Project project) { super(project, null, false, true, null); - myTree.getEmptyText().setText(CompilerBundle.message("no.compilation.problems.found")); + myTree.getEmptyText().setText(JavaCompilerBundle.message("no.compilation.problems.found")); setProgress("", 0.0f); // hack: this will pre-initialize progress UI } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/CompilerModuleOptionsComponent.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/CompilerModuleOptionsComponent.java index d43243882093..679a820dd253 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/CompilerModuleOptionsComponent.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/CompilerModuleOptionsComponent.java @@ -3,7 +3,7 @@ package com.intellij.compiler.impl.javaCompiler; import com.intellij.compiler.options.ModuleOptionsTableModel; import com.intellij.compiler.options.ModuleTableCellRenderer; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.project.Project; import com.intellij.ui.InsertPathAction; import com.intellij.ui.TableSpeedSearch; @@ -33,14 +33,14 @@ public class CompilerModuleOptionsComponent extends JPanel { myTable = new JBTable(new ModuleOptionsTableModel()); myTable.setRowHeight(JBUIScale.scale(22)); - myTable.getEmptyText().setText(CompilerBundle.message("settings.additional.compilation.options")); + myTable.getEmptyText().setText(JavaCompilerBundle.message("settings.additional.compilation.options")); TableColumn moduleColumn = myTable.getColumnModel().getColumn(0); - moduleColumn.setHeaderValue(CompilerBundle.message("settings.override.module.column")); + moduleColumn.setHeaderValue(JavaCompilerBundle.message("settings.override.module.column")); moduleColumn.setCellRenderer(new ModuleTableCellRenderer()); TableColumn optionsColumn = myTable.getColumnModel().getColumn(1); - String columnTitle = CompilerBundle.message("settings.override.compilation.options.column"); + String columnTitle = JavaCompilerBundle.message("settings.override.compilation.options.column"); optionsColumn.setHeaderValue(columnTitle); int width = myTable.getFontMetrics(myTable.getFont()).stringWidth(columnTitle) + 10; optionsColumn.setPreferredWidth(width); @@ -57,7 +57,7 @@ public class CompilerModuleOptionsComponent extends JPanel { .setRemoveAction(b -> removeSelectedModules()) .createPanel(); table.setPreferredSize(new Dimension(myTable.getWidth(), 150)); - JLabel header = new JLabel(CompilerBundle.message("settings.override.compiler.parameters.per.module")); + JLabel header = new JLabel(JavaCompilerBundle.message("settings.override.compiler.parameters.per.module")); add(header, new GridBagConstraints(0, 0, 1, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, JBUI.insets(5, 5, 0, 0), 0, 0)); add(table, new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0, GridBagConstraints.WEST, GridBagConstraints.BOTH, JBUI.insets(5, 5, 0, 0), 0, 0)); diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompiler.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompiler.java index 8208cdc28b50..486ca1d9f8d9 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompiler.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompiler.java @@ -16,7 +16,7 @@ package com.intellij.compiler.impl.javaCompiler.eclipse; import com.intellij.compiler.impl.javaCompiler.BackendCompiler; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.options.Configurable; @@ -49,7 +49,7 @@ public class EclipseCompiler implements BackendCompiler { @Override @NotNull public String getPresentableName() { - return CompilerBundle.message("compiler.eclipse.name"); + return JavaCompilerBundle.message("compiler.eclipse.name"); } @Override diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.form b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.form index 08d1d100c1d6..4ed988d99531 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.form +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.form @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -73,7 +73,7 @@ - + diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.java index 384f30d16623..ead0ae7d0111 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/eclipse/EclipseCompilerConfigurable.java @@ -4,7 +4,7 @@ package com.intellij.compiler.impl.javaCompiler.eclipse; import com.intellij.compiler.impl.javaCompiler.CompilerModuleOptionsComponent; import com.intellij.compiler.options.ComparingUtils; import com.intellij.ide.highlighter.ArchiveFileType; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileTypes.FileTypeRegistry; import com.intellij.openapi.options.Configurable; @@ -35,10 +35,10 @@ public class EclipseCompilerConfigurable implements Configurable { public EclipseCompilerConfigurable(Project project, EclipseCompilerOptions options) { myProject = project; myCompilerSettings = options; - myAdditionalOptionsField.setDialogCaption(CompilerBundle.message("java.compiler.option.additional.command.line.parameters")); + myAdditionalOptionsField.setDialogCaption(JavaCompilerBundle.message("java.compiler.option.additional.command.line.parameters")); myAdditionalOptionsField.setDescriptor(null, false); myPathToEcjField.addBrowseFolderListener( - CompilerBundle.message("path.to.ecj.compiler.tool"), null, project, + JavaCompilerBundle.message("path.to.ecj.compiler.tool"), null, project, new FileChooserDescriptor(true, false, true, true, false, false).withFileFilter(file -> FileTypeRegistry.getInstance().isFileOfType(file, ArchiveFileType.INSTANCE)) ); } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java index 9c4660fb4725..d21d939eb820 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/FilePathActionJavac.java @@ -16,7 +16,7 @@ package com.intellij.compiler.impl.javaCompiler.javac; import com.intellij.compiler.OutputParser; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeManager; @@ -54,7 +54,7 @@ public class FilePathActionJavac extends JavacParserAction { final FileType fileType = FileTypeManager.getInstance().getFileTypeByFileName(name); if (StdFileTypes.JAVA.equals(fileType)) { callback.fileProcessed(filePath); - callback.setProgressText(CompilerBundle.message("progress.parsing.file", name)); + callback.setProgressText(JavaCompilerBundle.message("progress.parsing.file", name)); } else if (StdFileTypes.CLASS.equals(fileType)) { callback.fileGenerated(filePath); diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacCompiler.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacCompiler.java index dfdca08ff6e8..a6444d36a7c9 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacCompiler.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacCompiler.java @@ -16,7 +16,7 @@ package com.intellij.compiler.impl.javaCompiler.javac; import com.intellij.compiler.impl.javaCompiler.BackendCompiler; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.options.Configurable; @@ -46,7 +46,7 @@ public class JavacCompiler implements BackendCompiler { @Override @NotNull public String getPresentableName() { - return CompilerBundle.message("compiler.javac.name"); + return JavaCompilerBundle.message("compiler.javac.name"); } @Override diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurable.java index f3270b3078bb..6187950bd0dd 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacConfigurable.java @@ -17,7 +17,7 @@ package com.intellij.compiler.impl.javaCompiler.javac; import com.intellij.compiler.impl.javaCompiler.CompilerModuleOptionsComponent; import com.intellij.compiler.options.ComparingUtils; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; @@ -44,7 +44,7 @@ public class JavacConfigurable implements Configurable{ public JavacConfigurable(Project project, final JpsJavaCompilerOptions javacSettings) { myProject = project; myJavacSettings = javacSettings; - myAdditionalOptionsField.setDialogCaption(CompilerBundle.message("java.compiler.option.additional.command.line.parameters")); + myAdditionalOptionsField.setDialogCaption(JavaCompilerBundle.message("java.compiler.option.additional.command.line.parameters")); myAdditionalOptionsField.setDescriptor(null, false); } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form index 88bbc4ac0930..e73a8c5372f9 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOutputParser.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOutputParser.java index 7e7a654a86e1..f8eaa9cad127 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOutputParser.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOutputParser.java @@ -19,7 +19,7 @@ import com.intellij.application.options.CodeStyle; import com.intellij.compiler.OutputParser; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.compiler.CompilerMessageCategory; import com.intellij.openapi.editor.ex.util.EditorUtil; import com.intellij.openapi.fileTypes.StdFileTypes; @@ -155,7 +155,7 @@ public class JavacOutputParser extends OutputParser { } if(line.endsWith("java.lang.OutOfMemoryError")) { - addMessage(callback, CompilerMessageCategory.ERROR, CompilerBundle.message("error.javac.out.of.memory")); + addMessage(callback, CompilerMessageCategory.ERROR, JavaCompilerBundle.message("error.javac.out.of.memory")); return true; } @@ -208,7 +208,7 @@ public class JavacOutputParser extends OutputParser { myParserActions.add(new JavacParserAction(createMatcher(resourceBundleValue)) { @Override protected void doExecute(final String line, String parsedData, final Callback callback) { - callback.setProgressText(CompilerBundle.message("progress.compiling.class", parsedData)); + callback.setProgressText(JavaCompilerBundle.message("progress.compiling.class", parsedData)); } }); } @@ -216,7 +216,7 @@ public class JavacOutputParser extends OutputParser { myParserActions.add(new JavacParserAction(createMatcher(resourceBundleValue)) { @Override protected void doExecute(final String line, @Nullable String parsedData, final Callback callback) { - callback.setProgressText(CompilerBundle.message("progress.loading.classes")); + callback.setProgressText(JavaCompilerBundle.message("progress.loading.classes")); } }); } diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/vcs/UnloadedModulesCompilationCheckinHandler.java b/java/compiler/impl/src/com/intellij/compiler/impl/vcs/UnloadedModulesCompilationCheckinHandler.java index 972fc9a8b702..433e1f116d72 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/vcs/UnloadedModulesCompilationCheckinHandler.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/vcs/UnloadedModulesCompilationCheckinHandler.java @@ -8,7 +8,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.compiler.CompileContext; import com.intellij.openapi.compiler.CompileStatusNotification; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.compiler.CompilerManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; @@ -53,7 +53,7 @@ public class UnloadedModulesCompilationCheckinHandler extends CheckinHandler { return null; } - return new BooleanCommitOption(myCheckinPanel, CompilerBundle.message("checkbox.text.compile.affected.unloaded.modules"), false, + return new BooleanCommitOption(myCheckinPanel, JavaCompilerBundle.message("checkbox.text.compile.affected.unloaded.modules"), false, () -> getSettings().COMPILE_AFFECTED_UNLOADED_MODULES_BEFORE_COMMIT, value -> getSettings().COMPILE_AFFECTED_UNLOADED_MODULES_BEFORE_COMMIT = value); } @@ -96,10 +96,11 @@ public class UnloadedModulesCompilationCheckinHandler extends CheckinHandler { if (result.get() == BuildResult.SUCCESSFUL) { return ReturnResult.COMMIT; } - String message = CompilerBundle.message("dialog.message.compilation.of.unloaded.modules.failed"); - int answer = Messages.showYesNoCancelDialog(myProject, XmlStringUtil.wrapInHtml(message), CompilerBundle.message("dialog.title.compilation.failed"), - CompilerBundle.message("button.text.checkin.handler.commit"), - CompilerBundle.message("button.text.checkin.handler.show.errors"), + String message = JavaCompilerBundle.message("dialog.message.compilation.of.unloaded.modules.failed"); + int answer = Messages.showYesNoCancelDialog(myProject, XmlStringUtil.wrapInHtml(message), JavaCompilerBundle + .message("dialog.title.compilation.failed"), + JavaCompilerBundle.message("button.text.checkin.handler.commit"), + JavaCompilerBundle.message("button.text.checkin.handler.show.errors"), CommonBundle.getCancelButtonText(), null); if (answer == Messages.CANCEL) { diff --git a/java/compiler/impl/src/com/intellij/compiler/inspection/ChangeSuperClassFix.java b/java/compiler/impl/src/com/intellij/compiler/inspection/ChangeSuperClassFix.java index 0eb51d0a6506..0d9cdb706934 100644 --- a/java/compiler/impl/src/com/intellij/compiler/inspection/ChangeSuperClassFix.java +++ b/java/compiler/impl/src/com/intellij/compiler/inspection/ChangeSuperClassFix.java @@ -9,7 +9,7 @@ import com.intellij.codeInspection.LocalQuickFix; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.WriteAction; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Pair; @@ -192,7 +192,7 @@ public class ChangeSuperClassFix implements LocalQuickFix, HighPriorityAction { { setOKButtonText(CommonBundle.message("button.without.mnemonic.remove")); - setTitle(CompilerBundle.message("choose.members")); + setTitle(JavaCompilerBundle.message("choose.members")); init(); } @NotNull diff --git a/java/compiler/impl/src/com/intellij/compiler/inspection/FrequentlyUsedInheritorInspection.java b/java/compiler/impl/src/com/intellij/compiler/inspection/FrequentlyUsedInheritorInspection.java index ee0b72adb789..42a308821bec 100644 --- a/java/compiler/impl/src/com/intellij/compiler/inspection/FrequentlyUsedInheritorInspection.java +++ b/java/compiler/impl/src/com/intellij/compiler/inspection/FrequentlyUsedInheritorInspection.java @@ -5,7 +5,7 @@ import com.intellij.codeInspection.*; import com.intellij.compiler.CompilerReferenceService; import com.intellij.compiler.backwardRefs.CompilerReferenceServiceEx; import com.intellij.compiler.backwardRefs.ReferenceIndexUnavailableException; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; @@ -85,7 +85,7 @@ public final class FrequentlyUsedInheritorInspection extends AbstractBaseJavaLoc return new ProblemDescriptor[]{manager .createProblemDescriptor(highlightingElement, - CompilerBundle.message("class.can.have.more.common.super.class"), + JavaCompilerBundle.message("class.can.have.more.common.super.class"), isOnTheFly, topInheritorsQuickFix.toArray(LocalQuickFix.EMPTY_ARRAY), ProblemHighlightType.GENERIC_ERROR_OR_WARNING)}; diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java index 277ce138646f..2f536a505193 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java @@ -18,7 +18,7 @@ package com.intellij.compiler.options; import com.intellij.compiler.CompilerConfiguration; import com.intellij.compiler.CompilerConfigurationImpl; import com.intellij.compiler.server.BuildManager; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; @@ -44,7 +44,7 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable, @Override public String getDisplayName() { - return CompilerBundle.message("configurable.AnnotationProcessorsConfigurable.display.name"); + return JavaCompilerBundle.message("configurable.AnnotationProcessorsConfigurable.display.name"); } @Override diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java index 9b05faa4bcbb..9f45d38b536f 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java @@ -19,7 +19,7 @@ import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ShortcutSet; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.project.Project; @@ -148,7 +148,7 @@ public class AnnotationProcessorsPanel extends JPanel { @Override public TreePath addNode(TreePath parentOrNeighbour) { final String newProfileName = Messages.showInputDialog( - myProject, CompilerBundle.message("dialog.message.profile.name"), CompilerBundle.message("title.create.new.profile"), null, "", + myProject, JavaCompilerBundle.message("dialog.message.profile.name"), JavaCompilerBundle.message("title.create.new.profile"), null, "", new InputValidatorEx() { @Override public boolean checkInput(String inputString) { @@ -329,7 +329,7 @@ public class AnnotationProcessorsPanel extends JPanel { private class MoveProfileAction extends AnActionButton { MoveProfileAction() { - super(CompilerBundle.lazyMessage("action.text.move.to"), AllIcons.Actions.Forward); + super(JavaCompilerBundle.lazyMessage("action.text.move.to"), AllIcons.Actions.Forward); } @Override @@ -343,7 +343,7 @@ public class AnnotationProcessorsPanel extends JPanel { profiles.remove(nodeProfile); final JBPopup popup = JBPopupFactory.getInstance() .createPopupChooserBuilder(profiles) - .setTitle(CompilerBundle.message("action.text.move.to")) + .setTitle(JavaCompilerBundle.message("action.text.move.to")) .setItemChosenCallback((chosenProfile) -> { final Module toSelect = (Module)node.getUserObject(); if (selectedNodes != null) { diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java index 73059fd801e7..5e9db7260a3d 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java @@ -2,7 +2,7 @@ package com.intellij.compiler.options; import com.intellij.compiler.CompilerSettingsFactory; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; @@ -26,7 +26,7 @@ public class CompilerConfigurable implements SearchableConfigurable.Parent, Conf @Override public String getDisplayName() { - return CompilerBundle.message("compiler.configurable.display.name"); + return JavaCompilerBundle.message("compiler.configurable.display.name"); } @Override diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form index b0b4c3365a78..3ba195beef23 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerOptionsPanel.form @@ -21,7 +21,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -178,7 +178,7 @@ - + diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java index 33e465a3ac76..a75474b0b3e2 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerUIConfigurable.java @@ -10,7 +10,7 @@ import com.intellij.compiler.MalformedPatternException; import com.intellij.compiler.impl.javaCompiler.javac.JavacConfiguration; import com.intellij.compiler.server.BuildManager; import com.intellij.ide.PowerSaveMode; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; @@ -82,7 +82,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura )); /*"All source files located in the generated sources output directory WILL BE EXCLUDED from annotation processing. " +*/ - myWarningLabel.setText(CompilerBundle.message("settings.warning")); + myWarningLabel.setText(JavaCompilerBundle.message("settings.warning")); myWarningLabel.setFont(myWarningLabel.getFont().deriveFont(Font.BOLD)); myPatternLegendLabel.setForeground(new JBColor(Gray._50, Gray._130)); @@ -172,11 +172,11 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura myResourcePatternsField.setText(patternsToString(configuration.getResourceFilePatterns())); if (PowerSaveMode.isEnabled()) { - myEnableAutomakeLegendLabel.setText(CompilerBundle.message("disabled.in.power.save.mode")); + myEnableAutomakeLegendLabel.setText(JavaCompilerBundle.message("disabled.in.power.save.mode")); myEnableAutomakeLegendLabel.setFont(myEnableAutomakeLegendLabel.getFont().deriveFont(Font.BOLD)); } else { - myEnableAutomakeLegendLabel.setText(CompilerBundle.message("only.works.while.not.running.debugging")); + myEnableAutomakeLegendLabel.setText(JavaCompilerBundle.message("only.works.while.not.running.debugging")); myEnableAutomakeLegendLabel.setFont(myEnableAutomakeLegendLabel.getFont().deriveFont(Font.PLAIN)); } } @@ -268,7 +268,8 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura } throw new ConfigurationException( - CompilerBundle.message("error.compiler.configurable.malformed.patterns", pattersnsWithErrors.toString()), CompilerBundle.message("bad.resource.patterns.dialog.title") + JavaCompilerBundle.message("error.compiler.configurable.malformed.patterns", pattersnsWithErrors.toString()), JavaCompilerBundle + .message("bad.resource.patterns.dialog.title") ); } } @@ -306,7 +307,7 @@ public class CompilerUIConfigurable implements SearchableConfigurable, Configura @Override public String getDisplayName() { - return CompilerBundle.message("configurable.CompilerUIConfigurable.display.name"); + return JavaCompilerBundle.message("configurable.CompilerUIConfigurable.display.name"); } @Override diff --git a/java/compiler/impl/src/com/intellij/compiler/options/ExcludeFromValidationAction.java b/java/compiler/impl/src/com/intellij/compiler/options/ExcludeFromValidationAction.java index e47524e4629a..66b4dd70f16b 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/ExcludeFromValidationAction.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/ExcludeFromValidationAction.java @@ -5,7 +5,7 @@ package com.intellij.compiler.options; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.compiler.options.ExcludeEntryDescription; import com.intellij.openapi.compiler.options.ExcludesConfiguration; import com.intellij.openapi.fileEditor.OpenFileDescriptor; @@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable; public class ExcludeFromValidationAction extends AnAction { public ExcludeFromValidationAction() { - super(CompilerBundle.lazyMessage("action.name.exclude.from.validation")); + super(JavaCompilerBundle.lazyMessage("action.name.exclude.from.validation")); } @Override diff --git a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.form b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.form index 4d2643d51d8b..84d51af5df7e 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.form +++ b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.form @@ -22,7 +22,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java index 60694fad29e9..b24128ba9038 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/JavaCompilersTab.java @@ -5,7 +5,7 @@ import com.intellij.compiler.CompilerConfiguration; import com.intellij.compiler.CompilerConfigurationImpl; import com.intellij.compiler.impl.javaCompiler.BackendCompiler; import com.intellij.compiler.server.BuildManager; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.options.CompositeConfigurable; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; @@ -74,7 +74,7 @@ public class JavaCompilersTab extends CompositeConfigurable implem @Override public String getDisplayName() { - return CompilerBundle.message("java.compiler.description"); + return JavaCompilerBundle.message("java.compiler.description"); } @NotNull diff --git a/java/compiler/impl/src/com/intellij/compiler/options/ProcessorProfilePanel.java b/java/compiler/impl/src/com/intellij/compiler/options/ProcessorProfilePanel.java index d6fc84a38c09..4515f8b91ca2 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/ProcessorProfilePanel.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/ProcessorProfilePanel.java @@ -15,7 +15,7 @@ */ package com.intellij.compiler.options; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; @@ -74,21 +74,21 @@ public class ProcessorProfilePanel extends JPanel { super(new GridBagLayout()); myProject = project; - myCbEnableProcessing = new JCheckBox(CompilerBundle.message("settings.enable.annotation.processing")); + myCbEnableProcessing = new JCheckBox(JavaCompilerBundle.message("settings.enable.annotation.processing")); { - myRbClasspath = new JRadioButton(CompilerBundle.message("settings.obtain.processors.from.project.classpath")); - myRbProcessorsPath = new JRadioButton(CompilerBundle.message("settings.processor.path")); + myRbClasspath = new JRadioButton(JavaCompilerBundle.message("settings.obtain.processors.from.project.classpath")); + myRbProcessorsPath = new JRadioButton(JavaCompilerBundle.message("settings.processor.path")); myCbProcessorModulePath = - new JCheckBox(CompilerBundle.message("settings.use.processor.module.path.compiler.option.for.java.9.and.later")); + new JCheckBox(JavaCompilerBundle.message("settings.use.processor.module.path.compiler.option.for.java.9.and.later")); ButtonGroup group = new ButtonGroup(); group.add(myRbClasspath); group.add(myRbProcessorsPath); } { - myRbRelativeToContentRoot = new JRadioButton(CompilerBundle.message("settings.module.content.root")); - myRbRelativeToOutputRoot = new JRadioButton(CompilerBundle.message("settings.module.output.directory")); + myRbRelativeToContentRoot = new JRadioButton(JavaCompilerBundle.message("settings.module.content.root")); + myRbRelativeToOutputRoot = new JRadioButton(JavaCompilerBundle.message("settings.module.output.directory")); final ButtonGroup group = new ButtonGroup(); group.add(myRbRelativeToContentRoot); group.add(myRbRelativeToOutputRoot); @@ -114,17 +114,17 @@ public class ProcessorProfilePanel extends JPanel { myProcessorTablePanel = new JPanel(new BorderLayout()); myProcessorsModel = new ProcessorTableModel(); - myProcessorTablePanel.setBorder(IdeBorderFactory.createTitledBorder(CompilerBundle.message("settings.annotation.processors"), false, JBUI.insetsTop(8)).setShowLine(false)); + myProcessorTablePanel.setBorder(IdeBorderFactory.createTitledBorder(JavaCompilerBundle.message("settings.annotation.processors"), false, JBUI.insetsTop(8)).setShowLine(false)); myProcessorTable = new JBTable(myProcessorsModel); - myProcessorTable.getEmptyText().setText(CompilerBundle.message("settings.compiler.will.run.all.automatically.discovered.processors")); + myProcessorTable.getEmptyText().setText(JavaCompilerBundle.message("settings.compiler.will.run.all.automatically.discovered.processors")); myProcessorPanel = createTablePanel(myProcessorTable); myProcessorTablePanel.add(myProcessorPanel, BorderLayout.CENTER); myOptionsTablePanel = new JPanel(new BorderLayout()); myOptionsModel = new OptionsTableModel(); - myOptionsTablePanel.setBorder(IdeBorderFactory.createTitledBorder(CompilerBundle.message("settings.annotation.processor.options"), false, JBUI.insetsTop(13)).setShowLine(false)); + myOptionsTablePanel.setBorder(IdeBorderFactory.createTitledBorder(JavaCompilerBundle.message("settings.annotation.processor.options"), false, JBUI.insetsTop(13)).setShowLine(false)); myOptionsTable = new JBTable(myOptionsModel); - myOptionsTable.getEmptyText().setText(CompilerBundle.message("settings.no.processor.specific.options.configured")); + myOptionsTable.getEmptyText().setText(JavaCompilerBundle.message("settings.no.processor.specific.options.configured")); myOptionsPanel = createTablePanel(myOptionsTable); myOptionsTablePanel.add(myOptionsPanel, BorderLayout.CENTER); @@ -142,11 +142,11 @@ public class ProcessorProfilePanel extends JPanel { add(myCbProcessorModulePath, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, JBUI.insets(2, 5, 0, 0), 0, 0)); - add(ContextHelpLabel.create(CompilerBundle.message("settings.module.path.warning")), + add(ContextHelpLabel.create(JavaCompilerBundle.message("settings.module.path.warning")), new GridBagConstraints(2, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.NONE, JBUI.insets(2, 2, 0, 0), 0, 0)); - myStoreGenSourcesLabel = new JLabel(CompilerBundle.message("settings.store.generated.sources.relative.to")); + myStoreGenSourcesLabel = new JLabel(JavaCompilerBundle.message("settings.store.generated.sources.relative.to")); add(myStoreGenSourcesLabel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, JBUI.insets(15, 5, 0, 0), 0, 0)); add(myRbRelativeToOutputRoot, @@ -154,13 +154,13 @@ public class ProcessorProfilePanel extends JPanel { add(myRbRelativeToContentRoot, new GridBagConstraints(2, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, JBUI.insets(15, 5, 0, 0), 0, 0)); - myProductionLabel = new JLabel(CompilerBundle.message("settings.production.sources.directory")); + myProductionLabel = new JLabel(JavaCompilerBundle.message("settings.production.sources.directory")); add(myProductionLabel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, JBUI.insets(10, 5, 0, 0), 0, 0)); add(myGeneratedProductionDirField, new GridBagConstraints(1, GridBagConstraints.RELATIVE, 2, 1, 1.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, JBUI.insets(10, 5, 0, 0), 0, 0)); - myTestLabel = new JLabel(CompilerBundle.message("settings.test.sources.directory")); + myTestLabel = new JLabel(JavaCompilerBundle.message("settings.test.sources.directory")); add(myTestLabel, new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 0.0, 0.0, GridBagConstraints.WEST, GridBagConstraints.HORIZONTAL, JBUI.insets(10, 5, 0, 0), 0, 0)); add(myGeneratedTestsDirField, @@ -292,8 +292,8 @@ public class ProcessorProfilePanel extends JPanel { @Override public String getColumnName(int column) { switch (column) { - case 0: return CompilerBundle.message("settings.column.option.name"); - case 1: return CompilerBundle.message("settings.column.value"); + case 0: return JavaCompilerBundle.message("settings.column.option.name"); + case 1: return JavaCompilerBundle.message("settings.column.value"); } return super.getColumnName(column); } @@ -412,7 +412,7 @@ public class ProcessorProfilePanel extends JPanel { @Override public String getColumnName(int column) { if (column == 0) { - return CompilerBundle.message("settings.processor.fq.name"); + return JavaCompilerBundle.message("settings.processor.fq.name"); } return super.getColumnName(column); } diff --git a/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java index 1ecda91dec56..5e3cc1457d53 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/RmicConfigurable.java @@ -17,7 +17,7 @@ package com.intellij.compiler.options; import com.intellij.compiler.impl.rmiCompiler.RmicConfiguration; import com.intellij.compiler.server.BuildManager; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; @@ -66,7 +66,7 @@ public class RmicConfigurable implements SearchableConfigurable, Configurable.No @Override public String getDisplayName() { - return CompilerBundle.message("rmi.compiler.description"); + return JavaCompilerBundle.message("rmi.compiler.description"); } @Override diff --git a/java/compiler/impl/src/com/intellij/compiler/options/RmicOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/options/RmicOptionsPanel.form index a5a4aafe6385..e4885eb0cc8b 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/RmicOptionsPanel.form +++ b/java/compiler/impl/src/com/intellij/compiler/options/RmicOptionsPanel.form @@ -21,7 +21,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/java/compiler/impl/src/com/intellij/compiler/options/TargetOptionsComponent.java b/java/compiler/impl/src/com/intellij/compiler/options/TargetOptionsComponent.java index db0b9889323a..4eda55fbbc96 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/TargetOptionsComponent.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/TargetOptionsComponent.java @@ -1,7 +1,7 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.compiler.options; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.ComboBox; import com.intellij.pom.java.LanguageLevel; @@ -59,14 +59,14 @@ public class TargetOptionsComponent extends JPanel { myTable = new JBTable(new ModuleOptionsTableModel()); myTable.setRowHeight(JBUIScale.scale(22)); - myTable.getEmptyText().setText(CompilerBundle.message("settings.all.modules.will.be.compiled.with.project.bytecode.version")); + myTable.getEmptyText().setText(JavaCompilerBundle.message("settings.all.modules.will.be.compiled.with.project.bytecode.version")); TableColumn moduleColumn = myTable.getColumnModel().getColumn(0); - moduleColumn.setHeaderValue(CompilerBundle.message("settings.module.column")); + moduleColumn.setHeaderValue(JavaCompilerBundle.message("settings.module.column")); moduleColumn.setCellRenderer(new ModuleTableCellRenderer()); TableColumn targetLevelColumn = myTable.getColumnModel().getColumn(1); - String columnTitle = CompilerBundle.message("settings.target.bytecode.version"); + String columnTitle = JavaCompilerBundle.message("settings.target.bytecode.version"); targetLevelColumn.setHeaderValue(columnTitle); targetLevelColumn.setCellEditor(new TargetLevelCellEditor()); targetLevelColumn.setCellRenderer(new TargetLevelCellRenderer()); @@ -77,9 +77,9 @@ public class TargetOptionsComponent extends JPanel { new TableSpeedSearch(myTable); - add(new JLabel(CompilerBundle.message("settings.project.bytecode.version")), constraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.NONE)); + add(new JLabel(JavaCompilerBundle.message("settings.project.bytecode.version")), constraints(0, 0, 1, 1, 0.0, 0.0, GridBagConstraints.NONE)); add(myCbProjectTargetLevel, constraints(1, 0, 1, 1, 1.0, 0.0, GridBagConstraints.NONE)); - add(new JLabel(CompilerBundle.message("settings.per.module.bytecode.version")), constraints(0, 1, 2, 1, 1.0, 0.0, GridBagConstraints.NONE)); + add(new JLabel(JavaCompilerBundle.message("settings.per.module.bytecode.version")), constraints(0, 1, 2, 1, 1.0, 0.0, GridBagConstraints.NONE)); JPanel tableComp = ToolbarDecorator.createDecorator(myTable) .disableUpAction() .disableDownAction() @@ -96,8 +96,8 @@ public class TargetOptionsComponent extends JPanel { combo.setEditor(new BasicComboBoxEditor() { @Override protected JTextField createEditorComponent() { - JBTextField editor = new JBTextField(CompilerBundle.message("settings.same.as.language.level"), 12); - editor.getEmptyText().setText(CompilerBundle.message("settings.same.as.language.level")); + JBTextField editor = new JBTextField(JavaCompilerBundle.message("settings.same.as.language.level"), 12); + editor.getEmptyText().setText(JavaCompilerBundle.message("settings.same.as.language.level")); editor.setBorder(null); return editor; } @@ -158,7 +158,7 @@ public class TargetOptionsComponent extends JPanel { comp.setHorizontalAlignment(SwingConstants.CENTER); if ("".equals(value)) { comp.setForeground(JBColor.GRAY); - comp.setText(CompilerBundle.message("settings.same.as.language.level")); + comp.setText(JavaCompilerBundle.message("settings.same.as.language.level")); } else { comp.setForeground(table.getForeground()); diff --git a/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.form b/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.form index 7195bef0a258..8309d8b2ea00 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.form +++ b/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.form @@ -13,7 +13,7 @@ - + diff --git a/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.java index 74412e285560..bb0029bda66a 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/ValidationConfigurable.java @@ -2,7 +2,7 @@ package com.intellij.compiler.options; import com.intellij.ide.util.ElementsChooser; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.compiler.CompilerManager; import com.intellij.openapi.compiler.Validator; import com.intellij.openapi.compiler.options.ExcludedEntriesConfigurable; @@ -49,10 +49,10 @@ public class ValidationConfigurable implements SearchableConfigurable, Configura myConfiguration = ValidationConfiguration.getInstance(myProject); myExcludedConfigurable = createExcludedConfigurable(project); - myValidatorsPanel.setBorder(IdeBorderFactory.createTitledBorder(CompilerBundle.message("settings.validators"), false, JBUI.insetsTop(8)).setShowLine(false)); - myValidators.getEmptyText().setText(CompilerBundle.message("no.validators")); + myValidatorsPanel.setBorder(IdeBorderFactory.createTitledBorder(JavaCompilerBundle.message("settings.validators"), false, JBUI.insetsTop(8)).setShowLine(false)); + myValidators.getEmptyText().setText(JavaCompilerBundle.message("no.validators")); - myExcludedEntriesPanel.setBorder(IdeBorderFactory.createTitledBorder(CompilerBundle.message("settings.exclude.from.validation"), false, JBUI.insetsTop(8)).setShowLine(false)); + myExcludedEntriesPanel.setBorder(IdeBorderFactory.createTitledBorder(JavaCompilerBundle.message("settings.exclude.from.validation"), false, JBUI.insetsTop(8)).setShowLine(false)); } private static ExcludedEntriesConfigurable createExcludedConfigurable(@NotNull Project project) { @@ -81,7 +81,7 @@ public class ValidationConfigurable implements SearchableConfigurable, Configura @Override public String getDisplayName() { - return CompilerBundle.message("validation.display.name"); + return JavaCompilerBundle.message("validation.display.name"); } @Override diff --git a/java/compiler/impl/src/com/intellij/compiler/progress/CompilerTask.java b/java/compiler/impl/src/com/intellij/compiler/progress/CompilerTask.java index 7c03b9a4ef31..acf7044d4ae0 100644 --- a/java/compiler/impl/src/com/intellij/compiler/progress/CompilerTask.java +++ b/java/compiler/impl/src/com/intellij/compiler/progress/CompilerTask.java @@ -14,7 +14,7 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.application.ReadAction; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.compiler.CompilerManager; import com.intellij.openapi.compiler.CompilerMessage; import com.intellij.openapi.compiler.CompilerMessageCategory; @@ -146,8 +146,8 @@ public final class CompilerTask extends Task.Backgroundable { @Override public NotificationInfo getNotificationInfo() { return new NotificationInfo(myErrorCount > 0? "Compiler (errors)" : "Compiler (success)", - CompilerBundle.message("compilation.finished"), - CompilerBundle.message("0.errors.1.warnings", myErrorCount, myWarningCount), true); + JavaCompilerBundle.message("compilation.finished"), + JavaCompilerBundle.message("0.errors.1.warnings", myErrorCount, myWarningCount), true); } private CloseListener myCloseListener; @@ -613,8 +613,8 @@ public final class CompilerTask extends Task.Backgroundable { if (!myIndicator.isCanceled() && shouldAskUser()) { int result = Messages.showOkCancelDialog( myProject, - CompilerBundle.message("warning.compiler.running.on.toolwindow.close"), - CompilerBundle.message("compiler.running.dialog.title"), + JavaCompilerBundle.message("warning.compiler.running.on.toolwindow.close"), + JavaCompilerBundle.message("compiler.running.dialog.title"), Messages.getQuestionIcon() ); if (result != Messages.OK) { diff --git a/java/compiler/impl/src/com/intellij/ide/macro/OutputPathMacro.java b/java/compiler/impl/src/com/intellij/ide/macro/OutputPathMacro.java index aee4788c269e..5b84f0d21735 100644 --- a/java/compiler/impl/src/com/intellij/ide/macro/OutputPathMacro.java +++ b/java/compiler/impl/src/com/intellij/ide/macro/OutputPathMacro.java @@ -3,7 +3,7 @@ package com.intellij.ide.macro; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.compiler.CompilerPaths; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; @@ -27,7 +27,7 @@ public final class OutputPathMacro extends Macro { @NotNull @Override public String getDescription() { - return CompilerBundle.message("macro.output.path"); + return JavaCompilerBundle.message("macro.output.path"); } @Override diff --git a/java/compiler/impl/src/com/intellij/openapi/compiler/util/InspectionValidatorWrapper.java b/java/compiler/impl/src/com/intellij/openapi/compiler/util/InspectionValidatorWrapper.java index 12b5437e2a68..9153ec76d1c4 100644 --- a/java/compiler/impl/src/com/intellij/openapi/compiler/util/InspectionValidatorWrapper.java +++ b/java/compiler/impl/src/com/intellij/openapi/compiler/util/InspectionValidatorWrapper.java @@ -262,7 +262,7 @@ public class InspectionValidatorWrapper implements Validator { final Document document = myPsiDocumentManager.getCachedDocument(file); if (document != null && myPsiDocumentManager.isUncommited(document)) { final String url = file.getViewProvider().getVirtualFile().getUrl(); - context.addMessage(CompilerMessageCategory.WARNING, CompilerBundle.message("warning.text.file.has.been.changed"), url, -1, -1); + context.addMessage(CompilerMessageCategory.WARNING, JavaCompilerBundle.message("warning.text.file.has.been.changed"), url, -1, -1); return false; } diff --git a/java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java b/java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java index 6c5dce3e155d..8e2b052184b7 100644 --- a/java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java +++ b/java/compiler/impl/src/com/intellij/openapi/deployment/DeploymentUtilImpl.java @@ -1,7 +1,7 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.openapi.deployment; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VfsUtilCore; @@ -33,8 +33,8 @@ public class DeploymentUtilImpl extends DeploymentUtil { } private static String createCopyErrorMessage(final File fromFile, final File toFile) { - return CompilerBundle.message("message.text.error.copying.file.to.file", FileUtil.toSystemDependentName(fromFile.getPath()), - FileUtil.toSystemDependentName(toFile.getPath())); + return JavaCompilerBundle.message("message.text.error.copying.file.to.file", FileUtil.toSystemDependentName(fromFile.getPath()), + FileUtil.toSystemDependentName(toFile.getPath())); } @Override @@ -42,17 +42,17 @@ public class DeploymentUtilImpl extends DeploymentUtil { public String getConfigFileErrorMessage(final ConfigFile configFile) { if (configFile.getVirtualFile() == null) { String path = FileUtil.toSystemDependentName(VfsUtilCore.urlToPath(configFile.getUrl())); - return CompilerBundle.message("mesage.text.deployment.descriptor.file.not.exist", path); + return JavaCompilerBundle.message("mesage.text.deployment.descriptor.file.not.exist", path); } PsiFile psiFile = configFile.getPsiFile(); if (psiFile == null || !psiFile.isValid()) { - return CompilerBundle.message("message.text.deployment.description.invalid.file"); + return JavaCompilerBundle.message("message.text.deployment.description.invalid.file"); } if (psiFile instanceof XmlFile) { XmlDocument document = ((XmlFile)psiFile).getDocument(); if (document == null || document.getRootTag() == null) { - return CompilerBundle.message("message.text.xml.file.invalid", FileUtil.toSystemDependentName( + return JavaCompilerBundle.message("message.text.xml.file.invalid", FileUtil.toSystemDependentName( VfsUtilCore.urlToPath(configFile.getUrl()))); } } diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java index b04cabd2e458..34dd9bee23ea 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactFromModulesDialog.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.packaging.impl.artifacts; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; @@ -39,7 +39,7 @@ public class JarArtifactFromModulesDialog extends DialogWrapper { public JarArtifactFromModulesDialog(PackagingElementResolvingContext context) { super(context.getProject()); myContext = context; - setTitle(CompilerBundle.message("create.jar.from.modules")); + setTitle(JavaCompilerBundle.message("create.jar.from.modules")); myMainClassLabel.setLabelFor(myMainClassField.getTextField()); myManifestDirLabel.setLabelFor(myManifestDirField.getTextField()); @@ -78,7 +78,7 @@ public class JarArtifactFromModulesDialog extends DialogWrapper { } myModuleComboBox.setRenderer(SimpleListCellRenderer.create((label, value, index) -> { label.setIcon(value != null ? ModuleType.get(value).getIcon() : null); - label.setText(value != null ? value.getName() : CompilerBundle.message("all.modules")); + label.setText(value != null ? value.getName() : JavaCompilerBundle.message("all.modules")); })); new ComboboxSpeedSearch(myModuleComboBox) { @Override diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarFromModulesTemplate.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarFromModulesTemplate.java index ab54aa538e0b..5d77da903fe2 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarFromModulesTemplate.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarFromModulesTemplate.java @@ -17,7 +17,7 @@ package com.intellij.packaging.impl.artifacts; import com.intellij.CommonBundle; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; @@ -78,7 +78,7 @@ public class JarFromModulesTemplate extends ArtifactTemplate { } catch (IOException e) { LOG.info(e); - Messages.showErrorDialog(project, CompilerBundle.message("cannot.create.directory.0.1", directoryForManifest, e.getMessage()), + Messages.showErrorDialog(project, JavaCompilerBundle.message("cannot.create.directory.0.1", directoryForManifest, e.getMessage()), CommonBundle.getErrorTitle()); return null; } diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PlainArtifactType.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PlainArtifactType.java index fe5294c03601..62bb9330868f 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PlainArtifactType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PlainArtifactType.java @@ -16,7 +16,7 @@ package com.intellij.packaging.impl.artifacts; import com.intellij.icons.AllIcons; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.packaging.artifacts.ArtifactType; import com.intellij.packaging.elements.CompositePackagingElement; import com.intellij.packaging.elements.PackagingElementOutputKind; @@ -34,7 +34,7 @@ public class PlainArtifactType extends ArtifactType { } public PlainArtifactType() { - super(ID, CompilerBundle.message("artifact.type.plain")); + super(ID, JavaCompilerBundle.message("artifact.type.plain")); } @NotNull diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArchiveElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArchiveElementType.java index 4fa316e2a984..e0c160bb5aad 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArchiveElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArchiveElementType.java @@ -15,7 +15,7 @@ */ package com.intellij.packaging.impl.elements; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.packaging.elements.CompositePackagingElement; @@ -32,7 +32,7 @@ import javax.swing.*; class ArchiveElementType extends CompositePackagingElementType { ArchiveElementType() { - super("archive", CompilerBundle.message("element.type.name.archive")); + super("archive", JavaCompilerBundle.message("element.type.name.archive")); } @Override @@ -59,8 +59,8 @@ class ArchiveElementType extends CompositePackagingElementType createComposite(CompositePackagingElement parent, @Nullable String baseName, @NotNull ArtifactEditorContext context) { final String initialValue = PackagingElementFactoryImpl.suggestFileName(parent, baseName != null ? baseName : "archive", ".jar"); - final String path = Messages.showInputDialog(context.getProject(), CompilerBundle.message("enter.archive.name"), - CompilerBundle.message("title.new.archive"), null, initialValue, new FilePathValidator()); + final String path = Messages.showInputDialog(context.getProject(), JavaCompilerBundle.message("enter.archive.name"), + JavaCompilerBundle.message("title.new.archive"), null, initialValue, new FilePathValidator()); if (path == null) return null; return PackagingElementFactoryImpl.createDirectoryOrArchiveWithParents(path, true); } diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactElementType.java index f2bfc43401e7..6bef0823cfff 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactElementType.java @@ -16,7 +16,7 @@ package com.intellij.packaging.impl.elements; import com.intellij.icons.AllIcons; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.project.Project; import com.intellij.packaging.artifacts.Artifact; import com.intellij.packaging.artifacts.ArtifactManager; @@ -35,7 +35,7 @@ public class ArtifactElementType extends ComplexPackagingElementType chooseAndCreate(@NotNull ArtifactEditorContext context, @NotNull Artifact artifact, @NotNull CompositePackagingElement parent) { final Project project = context.getProject(); - List artifacts = context.chooseArtifacts(getAvailableArtifacts(context, artifact, false), CompilerBundle.message("dialog.title.choose.artifacts")); + List artifacts = context.chooseArtifacts(getAvailableArtifacts(context, artifact, false), JavaCompilerBundle + .message("dialog.title.choose.artifacts")); final List elements = new ArrayList<>(); for (Artifact selected : artifacts) { elements.add(new ArtifactPackagingElement(project, ArtifactPointerManager.getInstance(project).createPointer(selected, context.getArtifactModel()))); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactRootElementImpl.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactRootElementImpl.java index 8588011af222..ef3f5dd2ebb6 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactRootElementImpl.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactRootElementImpl.java @@ -3,7 +3,7 @@ package com.intellij.packaging.impl.elements; import com.intellij.icons.AllIcons; import com.intellij.ide.projectView.PresentationData; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.packaging.elements.ArtifactRootElement; import com.intellij.packaging.ui.ArtifactEditorContext; import com.intellij.packaging.ui.PackagingElementPresentation; @@ -21,7 +21,7 @@ public class ArtifactRootElementImpl extends ArtifactRootElement { return new PackagingElementPresentation() { @Override public String getPresentableName() { - return CompilerBundle.message("packaging.element.text.output.root"); + return JavaCompilerBundle.message("packaging.element.text.output.root"); } @Override diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryElementType.java index 4a88f60d0dd0..81a794e97e42 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryElementType.java @@ -16,7 +16,7 @@ package com.intellij.packaging.impl.elements; import com.intellij.icons.AllIcons; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.packaging.elements.CompositePackagingElement; @@ -32,7 +32,7 @@ import javax.swing.*; class DirectoryElementType extends CompositePackagingElementType { DirectoryElementType() { - super("directory", CompilerBundle.message("element.type.name.directory")); + super("directory", JavaCompilerBundle.message("element.type.name.directory")); } @Override @@ -58,8 +58,8 @@ class DirectoryElementType extends CompositePackagingElementType createComposite(CompositePackagingElement parent, String baseName, @NotNull ArtifactEditorContext context) { final String initialValue = PackagingElementFactoryImpl.suggestFileName(parent, baseName != null ? baseName : "folder", ""); - String path = Messages.showInputDialog(context.getProject(), CompilerBundle.message("dialog.message.enter.directory.name"), - CompilerBundle.message("title.new.directory"), null, initialValue, new FilePathValidator()); + String path = Messages.showInputDialog(context.getProject(), JavaCompilerBundle.message("dialog.message.enter.directory.name"), + JavaCompilerBundle.message("title.new.directory"), null, initialValue, new FilePathValidator()); if (path == null) return null; return PackagingElementFactoryImpl.createDirectoryOrArchiveWithParents(path, false); } diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java index a963b524397f..a5c917549ea4 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java @@ -15,7 +15,7 @@ */ package com.intellij.packaging.impl.elements; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; @@ -35,7 +35,7 @@ public class LibraryElementType extends ComplexPackagingElementType chooseAndCreate(@NotNull ArtifactEditorContext context, @NotNull Artifact artifact, @NotNull CompositePackagingElement parent) { - final List selected = context.chooseLibraries(CompilerBundle.message("dialog.title.packaging.choose.library")); + final List selected = context.chooseLibraries(JavaCompilerBundle.message("dialog.title.packaging.choose.library")); final List elements = new ArrayList<>(); for (Library library : selected) { elements.add(new LibraryPackagingElement(library.getTable().getTableLevel(), library.getName(), null)); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java index dd07962095df..4a95fd03d749 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ManifestFileUtil.java @@ -8,7 +8,7 @@ import com.intellij.ide.util.TreeClassChooserFactory; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.application.WriteAction; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.compiler.make.ManifestBuilder; import com.intellij.openapi.deployment.DeploymentUtil; import com.intellij.openapi.diagnostic.Logger; @@ -269,7 +269,7 @@ public class ManifestFileUtil { public static FileChooserDescriptor createDescriptorForManifestDirectory() { FileChooserDescriptor descriptor = FileChooserDescriptorFactory.createSingleFolderDescriptor(); - descriptor.setTitle(CompilerBundle.message("select.directory.for.meta.inf.manifest.mf.file")); + descriptor.setTitle(JavaCompilerBundle.message("select.directory.for.meta.inf.manifest.mf.file")); return descriptor; } diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ModuleElementTypeBase.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ModuleElementTypeBase.java index 96a9fceed9bf..a3acdf10e507 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ModuleElementTypeBase.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ModuleElementTypeBase.java @@ -16,7 +16,7 @@ package com.intellij.packaging.impl.elements; import com.intellij.icons.AllIcons; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModulePointer; import com.intellij.openapi.module.ModulePointerManager; @@ -50,7 +50,7 @@ public abstract class ModuleElementTypeBase> chooseAndCreate(@NotNull ArtifactEditorContext context, @NotNull Artifact artifact, @NotNull CompositePackagingElement parent) { List suitableModules = getSuitableModules(context); - List selected = context.chooseModules(suitableModules, CompilerBundle.message("dialog.title.packaging.choose.module")); + List selected = context.chooseModules(suitableModules, JavaCompilerBundle.message("dialog.title.packaging.choose.module")); final List> elements = new ArrayList<>(); final ModulePointerManager pointerManager = ModulePointerManager.getInstance(context.getProject()); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ModuleOutputElementTypeBase.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ModuleOutputElementTypeBase.java index 37c60c44b954..ef35015eece8 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ModuleOutputElementTypeBase.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ModuleOutputElementTypeBase.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.packaging.impl.elements; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import org.jetbrains.annotations.NotNull; public abstract class ModuleOutputElementTypeBase extends ModuleElementTypeBase { @@ -12,6 +12,6 @@ public abstract class ModuleOutputElementTypeBase( - "module-source", CompilerBundle.message("element.type.name.module.source")) { + "module-source", JavaCompilerBundle.message("element.type.name.module.source")) { override fun isSuitableModule(modulesProvider: ModulesProvider, module: Module): Boolean { return modulesProvider.getRootModel(module).getSourceRootUrls(false).isNotEmpty() @@ -20,7 +20,7 @@ class ProductionModuleSourceElementType private constructor() : ModuleElementTyp override fun createEmpty(project: Project) = ProductionModuleSourcePackagingElement(project) override fun getCreateElementIcon(): Icon = AllIcons.Nodes.Package override fun getElementIcon(module: Module?): Icon = AllIcons.Nodes.Package - override fun getElementText(moduleName: String) = CompilerBundle.message("node.text.0.module.sources", moduleName) + override fun getElementText(moduleName: String) = JavaCompilerBundle.message("node.text.0.module.sources", moduleName) companion object { @JvmField diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/TestModuleOutputElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/TestModuleOutputElementType.java index 8b4cd6f48ddb..a48660d6b328 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/TestModuleOutputElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/TestModuleOutputElementType.java @@ -2,7 +2,7 @@ package com.intellij.packaging.impl.elements; import com.intellij.icons.AllIcons; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModulePointer; import com.intellij.openapi.project.Project; @@ -17,7 +17,7 @@ public class TestModuleOutputElementType extends ModuleOutputElementTypeBase pointers = task.getArtifactPointers(); if (pointers.isEmpty()) { - return CompilerBundle.message("build.artifacts.before.run.description.empty"); + return JavaCompilerBundle.message("build.artifacts.before.run.description.empty"); } if (pointers.size() == 1) { - return CompilerBundle.message("build.artifacts.before.run.description.single", pointers.get(0).getArtifactName()); + return JavaCompilerBundle.message("build.artifacts.before.run.description.single", pointers.get(0).getArtifactName()); } - return CompilerBundle.message("build.artifacts.before.run.description.multiple", pointers.size()); + return JavaCompilerBundle.message("build.artifacts.before.run.description.multiple", pointers.size()); } public static void setBuildArtifactBeforeRunOption(@NotNull JComponent runConfigurationEditorComponent, diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskProviderBase.java b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskProviderBase.java index e24da46a1da7..9b2fec4c021e 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskProviderBase.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskProviderBase.java @@ -10,7 +10,7 @@ import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.application.ReadAction; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogBuilder; import com.intellij.openapi.ui.DialogWrapper; @@ -78,7 +78,7 @@ public abstract class BuildArtifactsBeforeRunTaskProviderBase files = getFilesToPackage(e, project); if (!files.isEmpty()) { visible = true; - e.getPresentation().setText(files.size() == 1 ? CompilerBundle.message("action.name.package.file") : CompilerBundle.message("action.name.package.files")); + e.getPresentation().setText(files.size() == 1 ? JavaCompilerBundle.message("action.name.package.file") : JavaCompilerBundle + .message("action.name.package.files")); } } @@ -109,7 +110,7 @@ public class PackageFileAction extends AnAction { fileNames.append("'").append(file.getName()).append("'"); } String time = Holder.TIME_FORMAT.format(Clock.getTime()); - final String statusText = CompilerBundle.message("status.text.file.has.been.packaged", files.size(), fileNames, time); + final String statusText = JavaCompilerBundle.message("status.text.file.has.been.packaged", files.size(), fileNames, time); final StatusBar statusBar = WindowManager.getInstance().getStatusBar(project); if (statusBar != null) { statusBar.setInfo(statusText); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileWorker.java b/java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileWorker.java index 68a52b30adf6..c564bda43714 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileWorker.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileWorker.java @@ -20,7 +20,7 @@ import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.deployment.DeploymentUtil; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; @@ -71,7 +71,7 @@ public class PackageFileWorker { public static ActionCallback startPackagingFiles(final Project project, final List files, final Artifact[] artifacts, final boolean packIntoArchives) { final ActionCallback callback = new ActionCallback(); - ProgressManager.getInstance().run(new Task.Backgroundable(project, CompilerBundle.message("packaging.files")) { + ProgressManager.getInstance().run(new Task.Backgroundable(project, JavaCompilerBundle.message("packaging.files")) { @Override public void run(@NotNull ProgressIndicator indicator) { try { @@ -83,8 +83,8 @@ public class PackageFileWorker { } catch (IOException e) { LOG.info(e); - String message = CompilerBundle.message("message.tect.package.file.io.error", e.toString()); - Notifications.Bus.notify(new Notification("Package File", CompilerBundle.message("cannot.package.file"), message, NotificationType.ERROR)); + String message = JavaCompilerBundle.message("message.tect.package.file.io.error", e.toString()); + Notifications.Bus.notify(new Notification("Package File", JavaCompilerBundle.message("cannot.package.file"), message, NotificationType.ERROR)); } }); callback.setDone(); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/ui/properties/ElementWithManifestPropertiesPanel.form b/java/compiler/impl/src/com/intellij/packaging/impl/ui/properties/ElementWithManifestPropertiesPanel.form index f1e893049b3c..d5f57ad7c26b 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/ui/properties/ElementWithManifestPropertiesPanel.form +++ b/java/compiler/impl/src/com/intellij/packaging/impl/ui/properties/ElementWithManifestPropertiesPanel.form @@ -33,7 +33,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/ui/properties/ElementWithManifestPropertiesPanel.java b/java/compiler/impl/src/com/intellij/packaging/impl/ui/properties/ElementWithManifestPropertiesPanel.java index 85ba838f72eb..c3fe50d54136 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/ui/properties/ElementWithManifestPropertiesPanel.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/ui/properties/ElementWithManifestPropertiesPanel.java @@ -1,7 +1,7 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.packaging.impl.ui.properties; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.ui.Messages; @@ -49,7 +49,7 @@ public abstract class ElementWithManifestPropertiesPanel lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { - return INSTANCE.getLazyMessage(key, params); - } -} \ No newline at end of file +} diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerMessageCategory.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerMessageCategory.java index 36a1acba7c60..bbe451bca7fd 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerMessageCategory.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/CompilerMessageCategory.java @@ -24,7 +24,7 @@ package com.intellij.openapi.compiler; public enum CompilerMessageCategory { ERROR { public String toString() { - return CompilerBundle.message("message.category.error"); + return JavaCompilerBundle.message("message.category.error"); } @Override public String getPresentableText() { @@ -33,7 +33,7 @@ public enum CompilerMessageCategory { }, WARNING { public String toString() { - return CompilerBundle.message("message.category.warning"); + return JavaCompilerBundle.message("message.category.warning"); } @Override public String getPresentableText() { @@ -42,7 +42,7 @@ public enum CompilerMessageCategory { }, INFORMATION { public String toString() { - return CompilerBundle.message("message.category.information"); + return JavaCompilerBundle.message("message.category.information"); } @Override public String getPresentableText() { @@ -51,7 +51,7 @@ public enum CompilerMessageCategory { }, STATISTICS { public String toString() { - return CompilerBundle.message("message.category.statistics"); + return JavaCompilerBundle.message("message.category.statistics"); } @Override public String getPresentableText() { diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/JavaCompilerBundle.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/JavaCompilerBundle.java new file mode 100644 index 000000000000..5211a397d577 --- /dev/null +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/JavaCompilerBundle.java @@ -0,0 +1,40 @@ +/* + * Copyright 2000-2013 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.openapi.compiler; + +import com.intellij.DynamicBundle; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.PropertyKey; + +import java.util.function.Supplier; + +public class JavaCompilerBundle extends DynamicBundle { + @NonNls public static final String BUNDLE = "messages.JavaCompilerBundle"; + private static final JavaCompilerBundle INSTANCE = new JavaCompilerBundle(); + + private JavaCompilerBundle() { super(BUNDLE); } + + @NotNull + public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + return INSTANCE.getMessage(key, params); + } + + @NotNull + public static Supplier lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + return INSTANCE.getLazyMessage(key, params); + } +} \ No newline at end of file diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/options/ExcludedEntriesConfigurable.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/options/ExcludedEntriesConfigurable.java index c05f2d4d1188..4795a82a2748 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/options/ExcludedEntriesConfigurable.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/options/ExcludedEntriesConfigurable.java @@ -4,7 +4,7 @@ package com.intellij.openapi.compiler.options; import com.intellij.compiler.CompilerConfiguration; import com.intellij.ide.IdeBundle; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.options.Configurable.NoScroll; @@ -123,7 +123,7 @@ public final class ExcludedEntriesConfigurable implements UnnamedConfigurable, N @Override protected JButton[] createButtons(){ - final JButton addButton = new JButton(CompilerBundle.message("button.add")); + final JButton addButton = new JButton(JavaCompilerBundle.message("button.add")); addButton.addActionListener( new ActionListener() { @Override @@ -231,8 +231,8 @@ public final class ExcludedEntriesConfigurable implements UnnamedConfigurable, N @Override protected JComponent createMainComponent(){ final String[] names = { - CompilerBundle.message("exclude.from.compile.table.path.column.name"), - CompilerBundle.message("exclude.from.compile.table.recursively.column.name") + JavaCompilerBundle.message("exclude.from.compile.table.path.column.name"), + JavaCompilerBundle.message("exclude.from.compile.table.recursively.column.name") }; // Create a model of the data. TableModel dataModel = new AbstractTableModel() { @@ -303,7 +303,7 @@ public final class ExcludedEntriesConfigurable implements UnnamedConfigurable, N myExcludedTable = new JBTable(dataModel); myExcludedTable.setEnableAntialiasing(true); - myExcludedTable.getEmptyText().setText(CompilerBundle.message("no.excludes")); + myExcludedTable.getEmptyText().setText(JavaCompilerBundle.message("no.excludes")); myExcludedTable.setPreferredScrollableViewportSize(new Dimension(300, myExcludedTable.getRowHeight() * 6)); myExcludedTable.setDefaultRenderer(Boolean.class, new BooleanRenderer()); myExcludedTable.setDefaultRenderer(Object.class, new MyObjectRenderer()); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java index ffdddb909d78..3f945a2ea883 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java @@ -18,7 +18,7 @@ package com.intellij.openapi.roots.ui.configuration; import com.intellij.ProjectTopics; import com.intellij.ide.JavaUiBundle; import com.intellij.openapi.Disposable; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ModifiableRootModel; @@ -207,6 +207,6 @@ public class ClasspathEditor extends ModuleElementsEditor implements ModuleRootL } public static String getName() { - return CompilerBundle.message("modules.classpath.title"); + return JavaCompilerBundle.message("modules.classpath.title"); } } \ No newline at end of file diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java index 7f97b3138d53..7a8808ca8cc0 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java @@ -10,7 +10,7 @@ import com.intellij.ide.DefaultTreeExpander; import com.intellij.ide.JavaUiBundle; import com.intellij.ide.impl.TypeSafeDataProviderAdapter; import com.intellij.openapi.actionSystem.*; -import com.intellij.openapi.compiler.CompilerBundle; +import com.intellij.openapi.compiler.JavaCompilerBundle; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; @@ -95,9 +95,9 @@ public class ArtifactEditorImpl implements ArtifactEditorEx { myTopPanel.setBorder(JBUI.Borders.empty(0, 10)); myBuildOnMakeCheckBox.setSelected(artifact.isBuildOnMake()); final String outputPath = artifact.getOutputPath(); - myOutputDirectoryField.addBrowseFolderListener(CompilerBundle.message("dialog.title.output.directory.for.artifact"), - CompilerBundle.message("chooser.description.select.output.directory.for.0.artifact", - getArtifact().getName()), myProject, + myOutputDirectoryField.addBrowseFolderListener(JavaCompilerBundle.message("dialog.title.output.directory.for.artifact"), + JavaCompilerBundle.message("chooser.description.select.output.directory.for.0.artifact", + getArtifact().getName()), myProject, FileChooserDescriptorFactory.createSingleFolderDescriptor()); myOutputDirectoryField.getTextField().getDocument().addDocumentListener(new DocumentAdapter() { @Override diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml index 3e183223cf45..d352ec4f9846 100644 --- a/java/java-impl/src/META-INF/JavaPlugin.xml +++ b/java/java-impl/src/META-INF/JavaPlugin.xml @@ -479,19 +479,19 @@ + key="java.compiler.description" bundle="messages.JavaCompilerBundle"/> + bundle="messages.JavaCompilerBundle"/> + key="rmi.compiler.description" bundle="messages.JavaCompilerBundle"/> diff --git a/java/testFramework/src/com/intellij/testFramework/CompilerTester.java b/java/testFramework/src/com/intellij/testFramework/CompilerTester.java index 2e4c4093f220..4a22df39e113 100644 --- a/java/testFramework/src/com/intellij/testFramework/CompilerTester.java +++ b/java/testFramework/src/com/intellij/testFramework/CompilerTester.java @@ -318,7 +318,7 @@ public class CompilerTester { } private static boolean isSpamMessage(String text) { - return text.contains(CompilerBundle.message("status.compilation.completed.successfully")) || + return text.contains(JavaCompilerBundle.message("status.compilation.completed.successfully")) || text.contains("used to compile") || text.contains("illegal reflective") || text.contains("Picked up") || diff --git a/resources-en/src/messages/CompilerBundle.properties b/resources-en/src/messages/JavaCompilerBundle.properties similarity index 100% rename from resources-en/src/messages/CompilerBundle.properties rename to resources-en/src/messages/JavaCompilerBundle.properties