MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

[i18n] move properties used in platform.coverage module to CoverageBundle (IDEA-209382)

Browse Source 
GitOrigin-RevId: b273a2a9f178ce1d01bbe2a8538e87d2ec4cbc69
This commit is contained in:
nik
2020-02-19 17:55:39 +03:00
committed by intellij-monorepo-bot
parent 3dcd77f14f
commit 0e8dab8875
23 changed files with 130 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
platform/platform-resources-en/src/messages/CodeInsightBundle.properties
View File

@@ -339,8 +339,6 @@ inspection.i18n.option.ignore.enum=Ignore enum constants
i18nize.jsp.error=Please select JSP text to I18nize.\nMake sure you have not selected any scriptlets, custom tags or other foreign languages elements.\nAlso, HTML tags inside selection must be balanced.
i18nize.error.title=Cannot I18nize Selection
i18nize.error.message=You can only i18nize Java string literal or substring thereof.\nPlease point the caret inside Java string literal or select part of it.
display.coverage.prompt=Do you want to display coverage data for ''{0}''?
code.coverage=Code Coverage
coverage.button.add.package=Add Package
coverage.pattern.filter.editor.choose.package.title=Choose Package
no.coverage=No coverage
@@ -348,8 +346,6 @@ code.coverage.is.not.supported=Code coverage is supported for jre 5.0 or higher
title.popup.show.coverage=Coverage Suites
prompt.remove.coverage=Do you want to remove ''{0}'' coverage data?
title.remove.coverage.data=Remove Coverage Data
coverage.data.outdated=Coverage data outdated
coverage.data.not.found=Coverage data not found
error.cannot.resolve.class=Cannot resolve class ''{0}''
implementation.view.title=Definition of {0}
show.implementations.index.not.ready=Quick Definition can't be found without index

11
platform/platform-resources-en/src/messages/ExecutionBundle.properties
View File

@@ -532,13 +532,4 @@ insert.macros=Insert Macros
don.t.ask.again=Don't ask again
are.you.sure.you.want.to.delete.0=Are you sure you want to delete {0}?
select.next.tab=Select Next Tab
select.previous.tab=Select Previous Tab
delete.file=Delete File
following.test.0.could.not.be.found.1=Following test{0} could not be found: {1}
extract.information.about.tests=Extract Information About Tests
action.description.show.tests.covering.line=Show tests covering line
action.text.show.tests.covering.line=Show Tests Covering Line
no.coverage.suites.configured=No coverage suites configured.
marker.code.coverage=marker: code coverage
action.name.cover=Cover
run.selected.configuration.with.coverage.enabled=Run selected configuration with coverage enabled
select.previous.tab=Select Previous Tab

1
platform/platform-resources-en/src/messages/UIBundle.properties
View File

@@ -210,7 +210,6 @@ io.error.dialog.retry=Try again
master.detail.err.empty.name=Name should contain non-space characters
master.detail.err.duplicate={0} with the name ''{1}'' already exists
configurable.CoverageOptionsConfigurable.display.name=Coverage
configurable.CertificateConfigurable.display.name=Server Certificates
action.DesignerToolWindow.Anonymous.text.expand.all=Expand All
action.DesignerToolWindow.Anonymous.text.collapse.all=Collapse All

62
plugins/coverage-common/resources/messages/CoverageBundle.properties
View File

@@ -1,4 +1,62 @@
action.description.show.tests.covering.line=Show tests covering line
action.name.cover=Cover
action.text.show.tests.covering.line=Show Tests Covering Line
cannot.show.coverage.reports.from.different.engines=Cannot show coverage reports from different engines.
choose.coverage.suite.to.display=Choose Coverage Suite to Display
code.coverage=Code Coverage
configurable.CoverageOptionsConfigurable.display.name=Coverage
coverage.add.to.active.suites=&Add to active suites
coverage.data.no.coverage.button=&No Coverage
coverage.data.not.found=Coverage data not found
coverage.data.outdated=Coverage data outdated
coverage.data.runner.name={0} Coverage
coverage.data.show.selected.button=Show selected
coverage.do.not.apply.collected.coverage=Do not apply &collected coverage
coverage.edit.colors.action.name=Edit Coverage Colors
coverage.edit.colors.description=Edit coverage colors
coverage.hide.coverage.action.description=Hide coverage data
coverage.hide.coverage.action.name=Hide coverage
coverage.next.change.fully.covered=Fully Covered
coverage.next.change.partial.covered=Partial Covered
coverage.next.change.uncovered=Uncovered
coverage.next.mark=Next Coverage Mark
coverage.next.place=Next {0}
coverage.previous.mark=Previous Coverage Mark
coverage.previous.place=Previous {0}
coverage.replace.active.suites=&Replace active suites
coverage.report.building=Building coverage report...
coverage.tab.title=Code Coverage
coverage.view.action.go.up.description=Go to Upper Level
coverage.view.action.go.up=Go Up
coverage.view.configuration.was.not.found=Configuration ''{0}'' was not found.
coverage.view.edit.run.configuration.0=Click
coverage.view.edit.run.configuration.1=Edit
coverage.view.edit.run.configuration.2=to fix configuration settings.
coverage.view.element=Element
coverage.view.loading.data=Loading Coverage Data
coverage.view.no.coverage.results=No coverage results.
coverage.view.text.covered=covered
coverage.view.text.files.covered={0}% files
coverage.view.text.lines.covered={0}% lines covered
coverage.view.title=Coverage
delete.file=Delete File
display.coverage.prompt=Do you want to display coverage data for ''{0}''?
extract.information.about.tests=Extract Information About Tests
following.test.0.could.not.be.found.1=Following test{0} could not be found: {1}
generate.coverage.report.for=Generate Coverage Report for: ''{0}''
lines.covered.info.less.than.one.percent=<1% lines covered
lines.covered.info.no.lines.covered=no lines covered
lines.covered.info.not.covered=not covered
lines.covered.info.less.than.one.percent=<1% lines covered
lines.covered.info.percent.lines.covered=% lines covered
lines.covered.info.percent.lines.covered=% lines covered
marker.code.coverage=marker: code coverage
no.coverage.runner.available.for=No coverage runner available for {0}
no.coverage.suites.configured=No coverage suites configured.
run.selected.configuration.with.coverage.enabled=Run selected configuration with coverage enabled
run.with.coverage.mnemonic=Run%s with Co_verage
run.with.coverage=Run with Co_verage
settings.coverage.activate.coverage.view=Activate Coverage &View
settings.coverage.add.to.the.active.suites=A&dd to the active suites
settings.coverage.do.not.apply.collected.coverage=Do &not apply collected coverage
settings.coverage.replace.active.suites.with.the.new.one=&Replace active suites with the new one
settings.coverage.show.options.before.applying.coverage.to.the.editor=&Show options before applying coverage to the editor
settings.coverage.when.new.coverage.is.gathered=When new coverage is gathered

2
plugins/coverage-common/src/META-INF/coverage-common-plugin.xml
View File

@@ -11,7 +11,7 @@
<testActionProvider implementation="com.intellij.coverage.actions.TrackCoverageActionProvider"/>
<projectViewNodeDecorator implementation="com.intellij.coverage.CoverageProjectViewDirectoryNodeDecorator"/>
<projectConfigurable groupId="build" instance="com.intellij.coverage.CoverageOptionsConfigurable" id="coverage"
bundle="messages.UIBundle" key="configurable.CoverageOptionsConfigurable.display.name"/>
bundle="messages.CoverageBundle" key="configurable.CoverageOptionsConfigurable.display.name"/>
<projectService serviceImplementation="com.intellij.coverage.CoverageOptionsProvider"/>
<projectService serviceImplementation="com.intellij.coverage.view.CoverageViewManager"/>

3
plugins/coverage-common/src/com/intellij/coverage/BaseCoverageAnnotator.java
View File

@@ -2,7 +2,6 @@ package com.intellij.coverage;
import com.intellij.coverage.view.CoverageView;
import com.intellij.coverage.view.CoverageViewManager;
import com.intellij.execution.ExecutionBundle;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.Task;
@@ -33,7 +32,7 @@ public abstract class BaseCoverageAnnotator implements CoverageAnnotator {
final Runnable request = createRenewRequest(suite, dataManager);
if (request != null) {
if (myProject.isDisposed()) return;
ProgressManager.getInstance().run(new Task.Backgroundable(myProject, ExecutionBundle.message("coverage.view.loading.data"), false) {
ProgressManager.getInstance().run(new Task.Backgroundable(myProject, CoverageBundle.message("coverage.view.loading.data"), false) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
request.run();

16
plugins/coverage-common/src/com/intellij/coverage/CoverageDataManagerImpl.java
View File

@@ -1,10 +1,8 @@
// 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.coverage;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.coverage.view.CoverageViewManager;
import com.intellij.coverage.view.CoverageViewSuiteListener;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.RunManager;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.configurations.RunConfigurationBase;
@@ -354,7 +352,7 @@ public class CoverageDataManagerImpl extends CoverageDataManager {
ApplicationManager.getApplication().invokeLater(() -> {
if (myProject.isDisposed()) return;
if (myCurrentSuitesBundle != null) {
final String message = CodeInsightBundle.message("display.coverage.prompt", suite.getPresentableName());
final String message = CoverageBundle.message("display.coverage.prompt", suite.getPresentableName());
final CoverageOptionsProvider coverageOptionsProvider = CoverageOptionsProvider.getInstance(myProject);
final DialogWrapper.DoNotAskOption doNotAskOption = new DialogWrapper.DoNotAskOption() {
@@ -386,13 +384,13 @@ public class CoverageDataManagerImpl extends CoverageDataManager {
};
final String[] options = myCurrentSuitesBundle.getCoverageEngine() == suite.getCoverageEngine() ?
new String[] {
ExecutionBundle.message("coverage.replace.active.suites"),
ExecutionBundle.message("coverage.add.to.active.suites"),
ExecutionBundle.message("coverage.do.not.apply.collected.coverage")} :
CoverageBundle.message("coverage.replace.active.suites"),
CoverageBundle.message("coverage.add.to.active.suites"),
CoverageBundle.message("coverage.do.not.apply.collected.coverage")} :
new String[] {
ExecutionBundle.message("coverage.replace.active.suites"),
ExecutionBundle.message("coverage.do.not.apply.collected.coverage")};
final int answer = doNotAskOption.isToBeShown() ? Messages.showDialog(message, CodeInsightBundle.message("code.coverage"),
CoverageBundle.message("coverage.replace.active.suites"),
CoverageBundle.message("coverage.do.not.apply.collected.coverage")};
final int answer = doNotAskOption.isToBeShown() ? Messages.showDialog(message, CoverageBundle.message("code.coverage"),
options, 1, Messages.getQuestionIcon(),
doNotAskOption) : coverageOptionsProvider.getOptionToReplace();
if (answer == DialogWrapper.OK_EXIT_CODE) {

5
plugins/coverage-common/src/com/intellij/coverage/CoverageEngine.java
View File

@@ -3,7 +3,6 @@ package com.intellij.coverage;
import com.intellij.codeInspection.export.ExportToHTMLDialog;
import com.intellij.coverage.view.CoverageViewExtension;
import com.intellij.coverage.view.CoverageViewManager;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.configurations.RunConfigurationBase;
import com.intellij.execution.configurations.coverage.CoverageEnabledConfiguration;
import com.intellij.execution.testframework.AbstractTestProxy;
@@ -310,7 +309,7 @@ public abstract class CoverageEngine {
@NotNull final DataContext dataContext,
@NotNull final CoverageSuitesBundle currentSuite) {
final ExportToHTMLDialog dialog = new ExportToHTMLDialog(project, true);
dialog.setTitle(ExecutionBundle.message("generate.coverage.report.for", currentSuite.getPresentableName()));
dialog.setTitle(CoverageBundle.message("generate.coverage.report.for", currentSuite.getPresentableName()));
return dialog;
}
@@ -350,7 +349,7 @@ public abstract class CoverageEngine {
}
public static String getEditorTitle() {
return ExecutionBundle.message("coverage.tab.title");
return CoverageBundle.message("coverage.tab.title");
}
public CoverageViewExtension createCoverageViewExtension(Project project,

9
plugins/coverage-common/src/com/intellij/coverage/CoverageExecutor.java
View File

@@ -1,6 +1,5 @@
package com.intellij.coverage;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.Executor;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.util.text.StringUtil;
@@ -17,14 +16,14 @@ public class CoverageExecutor extends Executor {
@Override
@NotNull
public String getStartActionText() {
return ExecutionBundle.message("run.with.coverage");
return CoverageBundle.message("run.with.coverage");
}
@NotNull
@Override
public String getStartActionText(@NotNull String configurationName) {
String configName = StringUtil.isEmpty(configurationName) ? "" : " '" + shortenNameIfNeeded(configurationName) + "'";
return TextWithMnemonic.parse(ExecutionBundle.message("run.with.coverage.mnemonic")).replaceFirst("%s", configName).toString();
return TextWithMnemonic.parse(CoverageBundle.message("run.with.coverage.mnemonic")).replaceFirst("%s", configName).toString();
}
@NotNull
@@ -52,13 +51,13 @@ public class CoverageExecutor extends Executor {
@Override
public String getDescription() {
return ExecutionBundle.message("run.selected.configuration.with.coverage.enabled");
return CoverageBundle.message("run.selected.configuration.with.coverage.enabled");
}
@Override
@NotNull
public String getActionName() {
return ExecutionBundle.message("action.name.cover");
return CoverageBundle.message("action.name.cover");
}
@Override

19
plugins/coverage-common/src/com/intellij/coverage/CoverageLineMarkerRenderer.java
View File

@@ -25,7 +25,6 @@ import com.intellij.codeInsight.hint.HintManager;
import com.intellij.codeInsight.hint.HintManagerImpl;
import com.intellij.coverage.actions.HideCoverageInfoAction;
import com.intellij.coverage.actions.ShowCoveringTestsAction;
import com.intellij.execution.ExecutionBundle;
import com.intellij.icons.AllIcons;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
@@ -300,7 +299,7 @@ public class CoverageLineMarkerRenderer implements ActiveGutterRenderer, LineMar
GotoPreviousCoveredLineAction(final Editor editor, final int lineNumber) {
super(editor, lineNumber);
ActionUtil.copyFrom(this, IdeActions.ACTION_PREVIOUS_OCCURENCE);
getTemplatePresentation().setText(ExecutionBundle.message("coverage.previous.mark"));
getTemplatePresentation().setText(CoverageBundle.message("coverage.previous.mark"));
}
@Override
@@ -314,7 +313,7 @@ public class CoverageLineMarkerRenderer implements ActiveGutterRenderer, LineMar
super.update(e);
final String nextChange = getNextChange();
if (nextChange != null) {
e.getPresentation().setText(ExecutionBundle.message("coverage.previous.place", nextChange));
e.getPresentation().setText(CoverageBundle.message("coverage.previous.place", nextChange));
}
}
}
@@ -324,7 +323,7 @@ public class CoverageLineMarkerRenderer implements ActiveGutterRenderer, LineMar
GotoNextCoveredLineAction(final Editor editor, final int lineNumber) {
super(editor, lineNumber);
copyFrom(ActionManager.getInstance().getAction(IdeActions.ACTION_NEXT_OCCURENCE));
getTemplatePresentation().setText(ExecutionBundle.message("coverage.next.mark"));
getTemplatePresentation().setText(CoverageBundle.message("coverage.next.mark"));
}
@Override
@@ -338,7 +337,7 @@ public class CoverageLineMarkerRenderer implements ActiveGutterRenderer, LineMar
super.update(e);
final String nextChange = getNextChange();
if (nextChange != null) {
e.getPresentation().setText(ExecutionBundle.message("coverage.next.place", nextChange));
e.getPresentation().setText(CoverageBundle.message("coverage.next.place", nextChange));
}
}
}
@@ -399,11 +398,11 @@ public class CoverageLineMarkerRenderer implements ActiveGutterRenderer, LineMar
if (lineData != null) {
switch (lineData.getStatus()) {
case LineCoverage.NONE:
return ExecutionBundle.message("coverage.next.change.uncovered");
return CoverageBundle.message("coverage.next.change.uncovered");
case LineCoverage.PARTIAL:
return ExecutionBundle.message("coverage.next.change.partial.covered");
return CoverageBundle.message("coverage.next.change.partial.covered");
case LineCoverage.FULL:
return ExecutionBundle.message("coverage.next.change.fully.covered");
return CoverageBundle.message("coverage.next.change.fully.covered");
}
}
}
@@ -421,7 +420,7 @@ public class CoverageLineMarkerRenderer implements ActiveGutterRenderer, LineMar
private final int myLineNumber;
private EditCoverageColorsAction(Editor editor, int lineNumber) {
super(ExecutionBundle.message("coverage.edit.colors.action.name"), ExecutionBundle.message("coverage.edit.colors.description"), AllIcons.General.Settings);
super(CoverageBundle.message("coverage.edit.colors.action.name"), CoverageBundle.message("coverage.edit.colors.description"), AllIcons.General.Settings);
myEditor = editor;
myLineNumber = lineNumber;
}
@@ -477,6 +476,6 @@ public class CoverageLineMarkerRenderer implements ActiveGutterRenderer, LineMar
@NotNull
@Override
public String getAccessibleName() {
return ExecutionBundle.message("marker.code.coverage");
return CoverageBundle.message("marker.code.coverage");
}
}

12
plugins/coverage-common/src/com/intellij/coverage/CoverageOptionsConfigurable.form
View File

@@ -17,14 +17,14 @@
<clientProperties>
<BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent"/>
</clientProperties>
<border type="none" title-resource-bundle="messages/IdeBundle" title-key="settings.coverage.when.new.coverage.is.gathered"/>
<border type="none" title-resource-bundle="messages/CoverageBundle" title-key="settings.coverage.when.new.coverage.is.gathered"/>
<children>
<component id="752a8" class="javax.swing.JRadioButton" binding="myShowOptionsRB" default-binding="true">
<constraints>
<grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/IdeBundle" key="settings.coverage.show.options.before.applying.coverage.to.the.editor"/>
<text resource-bundle="messages/CoverageBundle" key="settings.coverage.show.options.before.applying.coverage.to.the.editor"/>
</properties>
</component>
<component id="f4cb4" class="javax.swing.JRadioButton" binding="myReplaceRB" default-binding="true">
@@ -32,7 +32,7 @@
<grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/IdeBundle" key="settings.coverage.replace.active.suites.with.the.new.one"/>
<text resource-bundle="messages/CoverageBundle" key="settings.coverage.replace.active.suites.with.the.new.one"/>
</properties>
</component>
<component id="61030" class="javax.swing.JRadioButton" binding="myAddRB" default-binding="true">
@@ -40,7 +40,7 @@
<grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/IdeBundle" key="settings.coverage.add.to.the.active.suites"/>
<text resource-bundle="messages/CoverageBundle" key="settings.coverage.add.to.the.active.suites"/>
</properties>
</component>
<component id="20e67" class="javax.swing.JRadioButton" binding="myDoNotApplyRB" default-binding="true">
@@ -48,7 +48,7 @@
<grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
</constraints>
<properties>
<text resource-bundle="messages/IdeBundle" key="settings.coverage.do.not.apply.collected.coverage"/>
<text resource-bundle="messages/CoverageBundle" key="settings.coverage.do.not.apply.collected.coverage"/>
</properties>
</component>
<component id="a9b9e" class="javax.swing.JCheckBox" binding="myActivateCoverageViewCB">
@@ -57,7 +57,7 @@
</constraints>
<properties>
<margin top="8" left="3" bottom="2" right="3"/>
<text resource-bundle="messages/IdeBundle" key="settings.coverage.activate.coverage.view"/>
<text resource-bundle="messages/CoverageBundle" key="settings.coverage.activate.coverage.view"/>
</properties>
</component>
</children>

3
plugins/coverage-common/src/com/intellij/coverage/CoverageOptionsConfigurable.java
View File

@@ -7,7 +7,6 @@ import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurationException;
import com.intellij.openapi.options.SearchableConfigurable;
import com.intellij.openapi.project.Project;
import com.intellij.ui.UIBundle;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NotNull;
@@ -38,7 +37,7 @@ public class CoverageOptionsConfigurable extends CompositeConfigurable<CoverageO
@Nls
@Override
public String getDisplayName() {
return UIBundle.message("configurable.CoverageOptionsConfigurable.display.name");
return CoverageBundle.message("configurable.CoverageOptionsConfigurable.display.name");
}
@Override

3
plugins/coverage-common/src/com/intellij/coverage/CoverageSuite.java
View File

@@ -1,6 +1,5 @@
package com.intellij.coverage;
import com.intellij.execution.ExecutionBundle;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.Messages;
@@ -67,7 +66,7 @@ public interface CoverageSuite extends JDOMExternalizable {
final String fileName = getCoverageDataFileName();
if (!FileUtil.isAncestor(PathManager.getSystemPath(), fileName, false)) {
String message = "Would you like to delete file \'" + fileName + "\' " + "on disk?";
if (Messages.showYesNoDialog(getProject(), message, ExecutionBundle.message("delete.file"), Messages.getWarningIcon()) != Messages.YES) {
if (Messages.showYesNoDialog(getProject(), message, CoverageBundle.message("delete.file"), Messages.getWarningIcon()) != Messages.YES) {
return;
}
}

9
plugins/coverage-common/src/com/intellij/coverage/SimpleCoverageAnnotator.java
View File

@@ -1,7 +1,6 @@
// Copyright 2000-2020 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.coverage;
import com.intellij.execution.ExecutionBundle;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
@@ -70,7 +69,7 @@ public abstract class SimpleCoverageAnnotator extends BaseCoverageAnnotator {
}
if (manager.isSubCoverageActive()) {
return coverageInfo.coveredLineCount > 0 ? ExecutionBundle.message("coverage.view.text.covered") : null;
return coverageInfo.coveredLineCount > 0 ? CoverageBundle.message("coverage.view.text.covered") : null;
}
final String filesCoverageInfo = getFilesCoverageInformationString(coverageInfo);
@@ -120,7 +119,7 @@ public abstract class SimpleCoverageAnnotator extends BaseCoverageAnnotator {
}
if (manager.isSubCoverageActive()) {
return coverageInfo.coveredLineCount > 0 ? ExecutionBundle.message("coverage.view.text.covered") : null;
return coverageInfo.coveredLineCount > 0 ? CoverageBundle.message("coverage.view.text.covered") : null;
}
return getLinesCoverageInformationString(coverageInfo);
@@ -400,7 +399,7 @@ public abstract class SimpleCoverageAnnotator extends BaseCoverageAnnotator {
@Nullable
protected String getLinesCoverageInformationString(@NotNull final FileCoverageInfo info) {
return ExecutionBundle.message("coverage.view.text.lines.covered", calcCoveragePercentage(info));
return CoverageBundle.message("coverage.view.text.lines.covered", calcCoveragePercentage(info));
}
protected static int calcCoveragePercentage(FileCoverageInfo info) {
@@ -414,7 +413,7 @@ public abstract class SimpleCoverageAnnotator extends BaseCoverageAnnotator {
@Nullable
@Nls
protected String getFilesCoverageInformationString(@NotNull final DirCoverageInfo info) {
return ExecutionBundle.message("coverage.view.text.files.covered", calcPercent(info.coveredFilesCount, info.totalFilesCount));
return CoverageBundle.message("coverage.view.text.files.covered", calcPercent(info.coveredFilesCount, info.totalFilesCount));
}
@Nullable

7
plugins/coverage-common/src/com/intellij/coverage/SrcFileAnnotator.java
View File

@@ -2,7 +2,6 @@
package com.intellij.coverage;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.history.FileRevisionTimestampComparator;
import com.intellij.history.LocalHistory;
import com.intellij.icons.AllIcons;
@@ -291,7 +290,7 @@ public class SrcFileAnnotator implements Disposable {
if (engine.isInLibrarySource(myProject, file)) {
// compare file and coverage timestamps
if (fileTimeStamp > coverageTimeStamp) {
showEditorWarningMessage(CodeInsightBundle.message("coverage.data.outdated"));
showEditorWarningMessage(CoverageBundle.message("coverage.data.outdated"));
return;
}
oldToNewLineMapping = null;
@@ -303,7 +302,7 @@ public class SrcFileAnnotator implements Disposable {
// if history for file isn't available let's check timestamps
if (fileTimeStamp > coverageTimeStamp && classesArePresentInCoverageData(data, qualifiedNames)) {
showEditorWarningMessage(CodeInsightBundle.message("coverage.data.outdated"));
showEditorWarningMessage(CoverageBundle.message("coverage.data.outdated"));
return;
}
}
@@ -606,7 +605,7 @@ public class SrcFileAnnotator implements Disposable {
private void coverageDataNotFound(final CoverageSuitesBundle suite) {
showEditorWarningMessage(CodeInsightBundle.message("coverage.data.not.found"));
showEditorWarningMessage(CoverageBundle.message("coverage.data.not.found"));
for (CoverageSuite coverageSuite : suite.getSuites()) {
CoverageDataManager.getInstance(myProject).removeCoverageSuite(coverageSuite);
}

15
plugins/coverage-common/src/com/intellij/coverage/actions/CoverageSuiteChooserDialog.java
View File

@@ -3,7 +3,6 @@ package com.intellij.coverage.actions;
import com.intellij.CommonBundle;
import com.intellij.coverage.*;
import com.intellij.execution.ExecutionBundle;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.actionSystem.ex.ComboBoxAction;
import com.intellij.openapi.fileChooser.FileChooser;
@@ -63,16 +62,16 @@ public class CoverageSuiteChooserDialog extends DialogWrapper {
});
}
};
mySuitesTree.getEmptyText().appendText(ExecutionBundle.message("no.coverage.suites.configured"));
mySuitesTree.getEmptyText().appendText(CoverageBundle.message("no.coverage.suites.configured"));
mySuitesTree.setRootVisible(false);
mySuitesTree.setShowsRootHandles(false);
TreeUtil.installActions(mySuitesTree);
TreeUtil.expandAll(mySuitesTree);
TreeUtil.promiseSelectFirst(mySuitesTree);
mySuitesTree.setMinimumSize(new Dimension(25, -1));
setOKButtonText(ExecutionBundle.message("coverage.data.show.selected.button"));
setOKButtonText(CoverageBundle.message("coverage.data.show.selected.button"));
init();
setTitle(ExecutionBundle.message("choose.coverage.suite.to.display"));
setTitle(CoverageBundle.message("choose.coverage.suite.to.display"));
}
@Override
@@ -112,7 +111,7 @@ public class CoverageSuiteChooserDialog extends DialogWrapper {
continue;
}
if (!Comparing.equal(engine, suite.getCoverageEngine())) {
return Collections.singletonList(new ValidationInfo(ExecutionBundle.message("cannot.show.coverage.reports.from.different.engines"), mySuitesTree));
return Collections.singletonList(new ValidationInfo(CoverageBundle.message("cannot.show.coverage.reports.from.different.engines"), mySuitesTree));
}
}
return super.doValidateAll();
@@ -132,7 +131,7 @@ public class CoverageSuiteChooserDialog extends DialogWrapper {
}
private static String getCoverageRunnerTitle(CoverageRunner coverageRunner) {
return ExecutionBundle.message("coverage.data.runner.name", coverageRunner.getPresentableName());
return CoverageBundle.message("coverage.data.runner.name", coverageRunner.getPresentableName());
}
@Nullable
@@ -259,7 +258,7 @@ public class CoverageSuiteChooserDialog extends DialogWrapper {
private class NoCoverageAction extends DialogWrapperAction {
NoCoverageAction() {
super(ExecutionBundle.message("coverage.data.no.coverage.button"));
super(CoverageBundle.message("coverage.data.no.coverage.button"));
}
@Override
@@ -290,7 +289,7 @@ public class CoverageSuiteChooserDialog extends DialogWrapper {
final CoverageRunner coverageRunner = getCoverageRunner(file);
if (coverageRunner == null) {
Messages.showErrorDialog(myProject, ExecutionBundle.message("no.coverage.runner.available.for", file.getName()), CommonBundle.getErrorTitle());
Messages.showErrorDialog(myProject, CoverageBundle.message("no.coverage.runner.available.for", file.getName()), CommonBundle.getErrorTitle());
return;
}

6
plugins/coverage-common/src/com/intellij/coverage/actions/HideCoverageInfoAction.java
View File

@@ -2,8 +2,8 @@
package com.intellij.coverage.actions;
import com.intellij.codeInsight.hint.HintManagerImpl;
import com.intellij.coverage.CoverageBundle;
import com.intellij.coverage.CoverageDataManager;
import com.intellij.execution.ExecutionBundle;
import com.intellij.ide.DataManager;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -18,8 +18,8 @@ import javax.swing.*;
public class HideCoverageInfoAction extends IconWithTextAction {
public HideCoverageInfoAction() {
super(ExecutionBundle.lazyMessage("coverage.hide.coverage.action.name"),
ExecutionBundle.lazyMessage("coverage.hide.coverage.action.description"), null);
super(CoverageBundle.lazyMessage("coverage.hide.coverage.action.name"),
CoverageBundle.lazyMessage("coverage.hide.coverage.action.description"), null);
}
@Override

10
plugins/coverage-common/src/com/intellij/coverage/actions/ShowCoveringTestsAction.java
View File

@@ -5,10 +5,10 @@ package com.intellij.coverage.actions;
import com.intellij.codeInsight.hint.HintManager;
import com.intellij.codeInsight.hint.ImplementationViewComponent;
import com.intellij.codeInsight.hint.PsiImplementationViewElement;
import com.intellij.coverage.CoverageBundle;
import com.intellij.coverage.CoverageDataManager;
import com.intellij.coverage.CoverageEngine;
import com.intellij.coverage.CoverageSuitesBundle;
import com.intellij.execution.ExecutionBundle;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -44,8 +44,8 @@ public class ShowCoveringTestsAction extends AnAction {
private final LineData myLineData;
public ShowCoveringTestsAction(final String classFQName, LineData lineData) {
super(ExecutionBundle.message("action.text.show.tests.covering.line"),
ExecutionBundle.message("action.description.show.tests.covering.line"), PlatformIcons.TEST_SOURCE_FOLDER);
super(CoverageBundle.message("action.text.show.tests.covering.line"),
CoverageBundle.message("action.description.show.tests.covering.line"), PlatformIcons.TEST_SOURCE_FOLDER);
myClassFQName = classFQName;
myLineData = lineData;
}
@@ -63,7 +63,7 @@ public class ShowCoveringTestsAction extends AnAction {
final Set<String> tests = new HashSet<>();
if (ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> tests.addAll(coverageEngine.getTestsForLine(project, myClassFQName, myLineData.getLineNumber())),
ExecutionBundle.message("extract.information.about.tests"), false, project)) { //todo cache them? show nothing found message
CoverageBundle.message("extract.information.about.tests"), false, project)) { //todo cache them? show nothing found message
final String[] testNames = ArrayUtilRt.toStringArray(tests);
Arrays.sort(testNames);
if (testNames.length == 0) {
@@ -85,7 +85,7 @@ public class ShowCoveringTestsAction extends AnAction {
});
} else {
component = null;
final JPanel panel = new PanelWithText(ExecutionBundle
final JPanel panel = new PanelWithText(CoverageBundle
.message("following.test.0.could.not.be.found.1", testNames.length > 1 ? "s" : "",
StringUtil.join(testNames, "<br/>").replace("_", ".")));
popupBuilder = JBPopupFactory.getInstance().createComponentPopupBuilder(panel, null);

13
plugins/coverage-common/src/com/intellij/coverage/view/CoverageView.java
View File

@@ -2,6 +2,7 @@
package com.intellij.coverage.view;
import com.intellij.CommonBundle;
import com.intellij.coverage.CoverageBundle;
import com.intellij.coverage.CoverageDataManager;
import com.intellij.coverage.CoverageSuitesBundle;
import com.intellij.execution.ExecutionBundle;
@@ -65,11 +66,11 @@ public class CoverageView extends BorderLayoutPanel implements DataProvider, Dis
myTable = new JBTable(myModel);
final StatusText emptyText = myTable.getEmptyText();
emptyText.setText(ExecutionBundle.message("coverage.view.no.coverage.results"));
emptyText.setText(CoverageBundle.message("coverage.view.no.coverage.results"));
final RunConfigurationBase configuration = suitesBundle.getRunConfiguration();
if (configuration != null) {
emptyText.appendText(" " + ExecutionBundle.message("coverage.view.edit.run.configuration.0") + " ");
emptyText.appendText(ExecutionBundle.message("coverage.view.edit.run.configuration.1"), SimpleTextAttributes.LINK_ATTRIBUTES, new ActionListener() {
emptyText.appendText(" " + CoverageBundle.message("coverage.view.edit.run.configuration.0") + " ");
emptyText.appendText(CoverageBundle.message("coverage.view.edit.run.configuration.1"), SimpleTextAttributes.LINK_ATTRIBUTES, new ActionListener() {
@Override
public void actionPerformed(final ActionEvent e) {
final RunnerAndConfigurationSettings configurationSettings = RunManager.getInstance(project).findSettings(configuration);
@@ -77,11 +78,11 @@ public class CoverageView extends BorderLayoutPanel implements DataProvider, Dis
RunDialog.editConfiguration(project, configurationSettings, ExecutionBundle.message("edit.run.configuration.for.item.dialog.title", configuration.getName()));
}
else {
Messages.showErrorDialog(project, ExecutionBundle.message("coverage.view.configuration.was.not.found", configuration.getName()), CommonBundle.getErrorTitle());
Messages.showErrorDialog(project, CoverageBundle.message("coverage.view.configuration.was.not.found", configuration.getName()), CommonBundle.getErrorTitle());
}
}
});
emptyText.appendText(" " + ExecutionBundle.message("coverage.view.edit.run.configuration.2"));
emptyText.appendText(" " + CoverageBundle.message("coverage.view.edit.run.configuration.2"));
}
TableColumnModel columnModel = myTable.getColumnModel();
TableColumn nameColumn = columnModel.getColumn(0);
@@ -299,7 +300,7 @@ public class CoverageView extends BorderLayoutPanel implements DataProvider, Dis
private final CoverageViewTreeStructure myTreeStructure;
GoUpAction(CoverageViewTreeStructure treeStructure) {
super(ExecutionBundle.message("coverage.view.action.go.up"), ExecutionBundle.message("coverage.view.action.go.up.description"), AllIcons.Nodes.UpLevel);
super(CoverageBundle.message("coverage.view.action.go.up"), CoverageBundle.message("coverage.view.action.go.up.description"), AllIcons.Nodes.UpLevel);
myTreeStructure = treeStructure;
registerCustomShortcutSet(KeyEvent.VK_BACK_SPACE, 0, myTable);
}

4
plugins/coverage-common/src/com/intellij/coverage/view/CoverageViewBuilder.java
View File

@@ -1,7 +1,7 @@
// Copyright 2000-2020 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.coverage.view;
import com.intellij.execution.ExecutionBundle;
import com.intellij.coverage.CoverageBundle;
import com.intellij.ide.commander.AbstractListBuilder;
import com.intellij.ide.util.treeView.AbstractTreeNode;
import com.intellij.ide.util.treeView.AbstractTreeStructure;
@@ -33,7 +33,7 @@ public class CoverageViewBuilder extends AbstractListBuilder {
final AbstractTreeStructure treeStructure, final JBTable table) {
super(project, list, model, treeStructure, AlphaComparator.INSTANCE, false);
myTable = table;
ProgressManager.getInstance().run(new Task.Backgroundable(project, ExecutionBundle.message("coverage.report.building")) {
ProgressManager.getInstance().run(new Task.Backgroundable(project, CoverageBundle.message("coverage.report.building")) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
buildRoot();

4
plugins/coverage-common/src/com/intellij/coverage/view/CoverageViewManager.java
View File

@@ -1,10 +1,10 @@
// Copyright 2000-2020 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.coverage.view;
import com.intellij.coverage.CoverageBundle;
import com.intellij.coverage.CoverageDataManager;
import com.intellij.coverage.CoverageOptionsProvider;
import com.intellij.coverage.CoverageSuitesBundle;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.configurations.RunConfigurationBase;
import com.intellij.icons.AllIcons;
import com.intellij.ide.impl.ContentManagerWatcher;
@@ -41,7 +41,7 @@ public final class CoverageViewManager implements PersistentStateComponent<Cover
RegisterToolWindowTask registerToolWindowTask = RegisterToolWindowTask.closableSecondary(
TOOLWINDOW_ID,
ExecutionBundle.lazyMessage("coverage.view.title"),
CoverageBundle.lazyMessage("coverage.view.title"),
AllIcons.Toolwindows.ToolWindowCoverage,
ToolWindowAnchor.RIGHT
);

4
plugins/coverage-common/src/com/intellij/coverage/view/ElementColumnInfo.java
View File

@@ -1,7 +1,7 @@
// Copyright 2000-2020 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.coverage.view;
import com.intellij.execution.ExecutionBundle;
import com.intellij.coverage.CoverageBundle;
import com.intellij.ide.util.treeView.AlphaComparator;
import com.intellij.ide.util.treeView.NodeDescriptor;
import com.intellij.util.ui.ColumnInfo;
@@ -10,7 +10,7 @@ import java.util.Comparator;
public final class ElementColumnInfo extends ColumnInfo<NodeDescriptor<?>, String> {
public ElementColumnInfo() {
super(ExecutionBundle.message("coverage.view.element"));
super(CoverageBundle.message("coverage.view.element"));
}
@Override

4
plugins/coverage/src/com/intellij/coverage/JavaCoverageAnnotator.java
View File

@@ -155,7 +155,7 @@ public class JavaCoverageAnnotator extends BaseCoverageAnnotator {
if (info == null) return null;
if (info.totalClassCount == 0 || info.totalLineCount == 0) return null;
if (subCoverageActive) {
return info.coveredClassCount + info.getCoveredLineCount() > 0 ? ExecutionBundle.message("coverage.view.text.covered") : null;
return info.coveredClassCount + info.getCoveredLineCount() > 0 ? CoverageBundle.message("coverage.view.text.covered") : null;
}
return ExecutionBundle.message("coverage.view.text.classes.covered", (int)((double)info.coveredClassCount / info.totalClassCount * 100)) + ", " +
ExecutionBundle.message("coverage.view.text.lines.covered", (int)((double)info.getCoveredLineCount() / info.totalLineCount * 100));
@@ -264,7 +264,7 @@ public class JavaCoverageAnnotator extends BaseCoverageAnnotator {
if (info == null) return null;
if (info.totalMethodCount == 0 || info.totalLineCount == 0) return null;
if (coverageDataManager.isSubCoverageActive()){
return info.coveredMethodCount + info.fullyCoveredLineCount + info.partiallyCoveredLineCount > 0 ? ExecutionBundle.message("coverage.view.text.covered") : null;
return info.coveredMethodCount + info.fullyCoveredLineCount + info.partiallyCoveredLineCount > 0 ? CoverageBundle.message("coverage.view.text.covered") : null;
}
return ExecutionBundle.message("coverage.view.text.methods.covered", (int)((double)info.coveredMethodCount / info.totalMethodCount * 100)) + ", " +
ExecutionBundle.message("coverage.view.text.lines.covered", (int)((double)(info.fullyCoveredLineCount + info.partiallyCoveredLineCount) / info.totalLineCount * 100));