mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
[i18n] move properties used in java.coverage plugin to a separate bundle (IDEA-209382)
GitOrigin-RevId: d0058c30e653749e38315e29c4b5e57c7a27e958
This commit is contained in:
committed by
intellij-monorepo-bot
parent
0e8dab8875
commit
ad77d01a61
@@ -342,7 +342,6 @@ i18nize.error.message=You can only i18nize Java string literal or substring ther
|
|||||||
coverage.button.add.package=Add Package
|
coverage.button.add.package=Add Package
|
||||||
coverage.pattern.filter.editor.choose.package.title=Choose Package
|
coverage.pattern.filter.editor.choose.package.title=Choose Package
|
||||||
no.coverage=No coverage
|
no.coverage=No coverage
|
||||||
code.coverage.is.not.supported=Code coverage is supported for jre 5.0 or higher
|
|
||||||
title.popup.show.coverage=Coverage Suites
|
title.popup.show.coverage=Coverage Suites
|
||||||
prompt.remove.coverage=Do you want to remove ''{0}'' coverage data?
|
prompt.remove.coverage=Do you want to remove ''{0}'' coverage data?
|
||||||
title.remove.coverage.data=Remove Coverage Data
|
title.remove.coverage.data=Remove Coverage Data
|
||||||
|
|||||||
@@ -276,67 +276,12 @@ run.configuration.unknown.description=Configuration which cannot be loaded due t
|
|||||||
#code coverage
|
#code coverage
|
||||||
enable.coverage.with.emma=Record code &coverage information
|
enable.coverage.with.emma=Record code &coverage information
|
||||||
merge.coverage.data=&Merge gathered coverage with suite chosen below
|
merge.coverage.data=&Merge gathered coverage with suite chosen below
|
||||||
record.coverage.filters.title=Packages and classes to include in coverage data
|
|
||||||
exclude.coverage.filters.title=Packages and classes to exclude from coverage data
|
|
||||||
coverage.tab.title=Code Coverage
|
|
||||||
show.swing.inspector=&Enable capturing form snapshots
|
show.swing.inspector=&Enable capturing form snapshots
|
||||||
show.swing.inspector.disabled=&Enable capturing form snapshots (requires JRE 5.0 or higher)
|
show.swing.inspector.disabled=&Enable capturing form snapshots (requires JRE 5.0 or higher)
|
||||||
before.run.property.make=Make
|
before.run.property.make=Make
|
||||||
run.configuration.store.place.option=&Share through VCS
|
run.configuration.store.place.option=&Share through VCS
|
||||||
run.configuration.allow.running.parallel=Allow parallel r&un
|
run.configuration.allow.running.parallel=Allow parallel r&un
|
||||||
run.configuration.default.type.description=configuration
|
run.configuration.default.type.description=configuration
|
||||||
run.configuration.choose.coverage.runner=Choose coverage runner:
|
|
||||||
run.configuration.track.per.test.coverage=Track per test coverage
|
|
||||||
run.configuration.coverage.sampling=Sampling
|
|
||||||
run.configuration.coverage.tracing=Tracing
|
|
||||||
run.configuration.enable.coverage.in.test.folders=Enable coverage in test folders
|
|
||||||
coverage.view.title=Coverage
|
|
||||||
coverage.view.action.go.up=Go Up
|
|
||||||
coverage.view.action.go.up.description=Go to Upper Level
|
|
||||||
coverage.view.configuration.was.not.found=Configuration ''{0}'' was not found.
|
|
||||||
coverage.view.no.coverage.results=No coverage results.
|
|
||||||
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.column.class=Class, %
|
|
||||||
coverage.view.column.method=Method, %
|
|
||||||
coverage.view.column.line=Line, %
|
|
||||||
coverage.view.column.branch=Branch, %
|
|
||||||
generate.coverage.report.for=Generate Coverage Report for: ''{0}''
|
|
||||||
coverage.view.root.node.summary={0} in ''all classes in scope''
|
|
||||||
coverage.view.no.coverage=No coverage
|
|
||||||
coverage.view.node.summary={0} in package ''{1}''
|
|
||||||
coverage.report.building=Building coverage report...
|
|
||||||
coverage.view.loading.data=Loading Coverage Data
|
|
||||||
coverage.replace.active.suites=&Replace active suites
|
|
||||||
coverage.add.to.active.suites=&Add to active suites
|
|
||||||
coverage.do.not.apply.collected.coverage=Do not apply &collected coverage
|
|
||||||
coverage.view.text.covered=covered
|
|
||||||
coverage.view.text.lines.covered={0}% lines covered
|
|
||||||
coverage.view.text.classes.covered={0}% classes
|
|
||||||
coverage.view.text.files.covered={0}% files
|
|
||||||
coverage.view.text.methods.covered={0}% methods
|
|
||||||
coverage.edit.colors.description=Edit coverage colors
|
|
||||||
coverage.edit.colors.action.name=Edit Coverage Colors
|
|
||||||
coverage.next.place=Next {0}
|
|
||||||
coverage.next.mark=Next Coverage Mark
|
|
||||||
coverage.previous.place=Previous {0}
|
|
||||||
coverage.previous.mark=Previous Coverage Mark
|
|
||||||
coverage.next.change.uncovered=Uncovered
|
|
||||||
coverage.next.change.partial.covered=Partial Covered
|
|
||||||
coverage.next.change.fully.covered=Fully Covered
|
|
||||||
coverage.hide.coverage.action.name=Hide coverage
|
|
||||||
coverage.hide.coverage.action.description=Hide coverage data
|
|
||||||
run.with.coverage=Run with Co_verage
|
|
||||||
run.with.coverage.mnemonic=Run%s with Co_verage
|
|
||||||
no.coverage.runner.available.for=No coverage runner available for {0}
|
|
||||||
coverage.data.no.coverage.button=&No Coverage
|
|
||||||
cannot.show.coverage.reports.from.different.engines=Cannot show coverage reports from different engines.
|
|
||||||
choose.coverage.suite.to.display=Choose Coverage Suite to Display
|
|
||||||
coverage.data.show.selected.button=Show selected
|
|
||||||
coverage.data.runner.name={0} Coverage
|
|
||||||
|
|
||||||
#GeneralCommandLine
|
#GeneralCommandLine
|
||||||
run.configuration.error.no.jdk.specified=No JDK specified
|
run.configuration.error.no.jdk.specified=No JDK specified
|
||||||
run.configuration.cannot.find.vm.executable=Cannot find VM executable
|
run.configuration.cannot.find.vm.executable=Cannot find VM executable
|
||||||
@@ -499,9 +444,7 @@ no.tests.captured.for.0=No tests captured for {0}
|
|||||||
redirect.input.from=Redirect input from:
|
redirect.input.from=Redirect input from:
|
||||||
every.file.is.used=Every file is used
|
every.file.is.used=Every file is used
|
||||||
auto.restart=Auto restart
|
auto.restart=Auto restart
|
||||||
generating.coverage.report=Generating Coverage Report ...
|
|
||||||
project.is.out.of.date=Project Is out of Date
|
project.is.out.of.date=Project Is out of Date
|
||||||
project.class.files.are.out.of.date=Project class files are out of date. Would you like to recompile? The refusal to do it will result in incomplete coverage information
|
|
||||||
shows.a.file.chooser.dialog=Shows a file chooser dialog
|
shows.a.file.chooser.dialog=Shows a file chooser dialog
|
||||||
run.all.configurations.available.in.this.context=Run all configurations available in this context
|
run.all.configurations.available.in.this.context=Run all configurations available in this context
|
||||||
0.starting.1={0} starting ''{1}''
|
0.starting.1={0} starting ''{1}''
|
||||||
|
|||||||
@@ -1406,15 +1406,6 @@ github.accounts.add=Add account
|
|||||||
github.settings.clone.ssh=Clone git repositories using ssh
|
github.settings.clone.ssh=Clone git repositories using ssh
|
||||||
github.settings.timeout=Connection timeout:
|
github.settings.timeout=Connection timeout:
|
||||||
github.settings.seconds=seconds
|
github.settings.seconds=seconds
|
||||||
settings.coverage.when.new.coverage.is.gathered=When new coverage is gathered
|
|
||||||
settings.coverage.show.options.before.applying.coverage.to.the.editor=&Show options before applying coverage to the editor
|
|
||||||
settings.coverage.do.not.apply.collected.coverage=Do ¬ apply collected coverage
|
|
||||||
settings.coverage.replace.active.suites.with.the.new.one=&Replace active suites with the new one
|
|
||||||
settings.coverage.add.to.the.active.suites=A&dd to the active suites
|
|
||||||
settings.coverage.activate.coverage.view=Activate Coverage &View
|
|
||||||
settings.coverage.java.ignore.implicitly.declared.default.constructors=Ignore implicitly declared default constructors
|
|
||||||
settings.coverage.java.ignore.empty.private.constructors.of.utility.classes=Ignore empty private constructors of utility classes
|
|
||||||
settings.coverage.java.java.coverage=Java coverage
|
|
||||||
settings.required.plugins.title=Specify a list of plugins required for your project. {0} will notify you if a required plugin is missing or needs an update.
|
settings.required.plugins.title=Specify a list of plugins required for your project. {0} will notify you if a required plugin is missing or needs an update.
|
||||||
settings.terminal.smart.command.handling=Smart command handling
|
settings.terminal.smart.command.handling=Smart command handling
|
||||||
settings.terminal.project.settings=Project settings
|
settings.terminal.project.settings=Project settings
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
<content url="file://$MODULE_DIR$">
|
<content url="file://$MODULE_DIR$">
|
||||||
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
|
||||||
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
|
<sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
|
||||||
</content>
|
</content>
|
||||||
<orderEntry type="inheritedJdk" />
|
<orderEntry type="inheritedJdk" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
code.coverage.is.not.supported=Code coverage is supported for jre 5.0 or higher
|
||||||
|
coverage.button.add.package=Add Package
|
||||||
|
coverage.pattern.filter.editor.choose.package.title=Choose Package
|
||||||
|
coverage.view.column.branch=Branch, %
|
||||||
|
coverage.view.column.class=Class, %
|
||||||
|
coverage.view.column.line=Line, %
|
||||||
|
coverage.view.column.method=Method, %
|
||||||
|
coverage.view.no.coverage=No coverage
|
||||||
|
coverage.view.node.summary={0} in package ''{1}''
|
||||||
|
coverage.view.root.node.summary={0} in ''all classes in scope''
|
||||||
|
coverage.view.text.classes.covered={0}% classes
|
||||||
|
coverage.view.text.methods.covered={0}% methods
|
||||||
|
exclude.coverage.filters.title=Packages and classes to exclude from coverage data
|
||||||
|
generating.coverage.report=Generating Coverage Report ...
|
||||||
|
project.class.files.are.out.of.date=Project class files are out of date. Would you like to recompile? The refusal to do it will result in incomplete coverage information
|
||||||
|
project.is.out.of.date=Project Is out of Date
|
||||||
|
record.coverage.filters.title=Packages and classes to include in coverage data
|
||||||
|
run.configuration.choose.coverage.runner=Choose coverage runner:
|
||||||
|
run.configuration.coverage.sampling=Sampling
|
||||||
|
run.configuration.coverage.tracing=Tracing
|
||||||
|
run.configuration.enable.coverage.in.test.folders=Enable coverage in test folders
|
||||||
|
run.configuration.track.per.test.coverage=Track per test coverage
|
||||||
|
settings.coverage.java.ignore.empty.private.constructors.of.utility.classes=Ignore empty private constructors of utility classes
|
||||||
|
settings.coverage.java.ignore.implicitly.declared.default.constructors=Ignore implicitly declared default constructors
|
||||||
|
settings.coverage.java.java.coverage=Java coverage
|
||||||
@@ -35,4 +35,5 @@ To configure, open <b>Settings/Preferences | Build, Execution, Deployment | Cove
|
|||||||
<extensionPoints>
|
<extensionPoints>
|
||||||
<extensionPoint qualifiedName="com.intellij.javaCoverageEngineExtension" interface="com.intellij.coverage.JavaCoverageEngineExtension" dynamic="true"/>
|
<extensionPoint qualifiedName="com.intellij.javaCoverageEngineExtension" interface="com.intellij.coverage.JavaCoverageEngineExtension" dynamic="true"/>
|
||||||
</extensionPoints>
|
</extensionPoints>
|
||||||
|
<resource-bundle>messages.JavaCoverageBundle</resource-bundle>
|
||||||
</idea-plugin>
|
</idea-plugin>
|
||||||
|
|||||||
@@ -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.
|
// 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;
|
package com.intellij.coverage;
|
||||||
|
|
||||||
import com.intellij.execution.ExecutionBundle;
|
import com.intellij.java.coverage.JavaCoverageBundle;
|
||||||
import com.intellij.openapi.application.ApplicationManager;
|
import com.intellij.openapi.application.ApplicationManager;
|
||||||
import com.intellij.openapi.components.ServiceManager;
|
import com.intellij.openapi.components.ServiceManager;
|
||||||
import com.intellij.openapi.module.Module;
|
import com.intellij.openapi.module.Module;
|
||||||
@@ -157,8 +157,8 @@ public class JavaCoverageAnnotator extends BaseCoverageAnnotator {
|
|||||||
if (subCoverageActive) {
|
if (subCoverageActive) {
|
||||||
return info.coveredClassCount + info.getCoveredLineCount() > 0 ? CoverageBundle.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)) + ", " +
|
return JavaCoverageBundle.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));
|
CoverageBundle.message("coverage.view.text.lines.covered", (int)((double)info.getCoveredLineCount() / info.totalLineCount * 100));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -266,8 +266,8 @@ public class JavaCoverageAnnotator extends BaseCoverageAnnotator {
|
|||||||
if (coverageDataManager.isSubCoverageActive()){
|
if (coverageDataManager.isSubCoverageActive()){
|
||||||
return info.coveredMethodCount + info.fullyCoveredLineCount + info.partiallyCoveredLineCount > 0 ? CoverageBundle.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)) + ", " +
|
return JavaCoverageBundle.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));
|
CoverageBundle.message("coverage.view.text.lines.covered", (int)((double)(info.fullyCoveredLineCount + info.partiallyCoveredLineCount) / info.totalLineCount * 100));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
|
|||||||
@@ -9,13 +9,13 @@ import com.intellij.coverage.view.CoverageViewExtension;
|
|||||||
import com.intellij.coverage.view.CoverageViewManager;
|
import com.intellij.coverage.view.CoverageViewManager;
|
||||||
import com.intellij.coverage.view.JavaCoverageViewExtension;
|
import com.intellij.coverage.view.JavaCoverageViewExtension;
|
||||||
import com.intellij.execution.CommonJavaRunConfigurationParameters;
|
import com.intellij.execution.CommonJavaRunConfigurationParameters;
|
||||||
import com.intellij.execution.ExecutionBundle;
|
|
||||||
import com.intellij.execution.application.ApplicationConfiguration;
|
import com.intellij.execution.application.ApplicationConfiguration;
|
||||||
import com.intellij.execution.configurations.RunConfigurationBase;
|
import com.intellij.execution.configurations.RunConfigurationBase;
|
||||||
import com.intellij.execution.configurations.coverage.CoverageEnabledConfiguration;
|
import com.intellij.execution.configurations.coverage.CoverageEnabledConfiguration;
|
||||||
import com.intellij.execution.configurations.coverage.JavaCoverageEnabledConfiguration;
|
import com.intellij.execution.configurations.coverage.JavaCoverageEnabledConfiguration;
|
||||||
import com.intellij.execution.testframework.AbstractTestProxy;
|
import com.intellij.execution.testframework.AbstractTestProxy;
|
||||||
import com.intellij.ide.BrowserUtil;
|
import com.intellij.ide.BrowserUtil;
|
||||||
|
import com.intellij.java.coverage.JavaCoverageBundle;
|
||||||
import com.intellij.openapi.actionSystem.DataContext;
|
import com.intellij.openapi.actionSystem.DataContext;
|
||||||
import com.intellij.openapi.application.ApplicationManager;
|
import com.intellij.openapi.application.ApplicationManager;
|
||||||
import com.intellij.openapi.application.ReadAction;
|
import com.intellij.openapi.application.ReadAction;
|
||||||
@@ -310,8 +310,8 @@ public class JavaCoverageEngine extends CoverageEngine {
|
|||||||
suite.checkModule(module);
|
suite.checkModule(module);
|
||||||
final Runnable runnable = () -> {
|
final Runnable runnable = () -> {
|
||||||
if (Messages.showOkCancelDialog(
|
if (Messages.showOkCancelDialog(
|
||||||
ExecutionBundle.message("project.class.files.are.out.of.date"),
|
JavaCoverageBundle.message("project.class.files.are.out.of.date"),
|
||||||
ExecutionBundle.message("project.is.out.of.date"), Messages.getWarningIcon()) == Messages.OK) {
|
JavaCoverageBundle.message("project.is.out.of.date"), Messages.getWarningIcon()) == Messages.OK) {
|
||||||
final CompilerManager compilerManager = CompilerManager.getInstance(project);
|
final CompilerManager compilerManager = CompilerManager.getInstance(project);
|
||||||
compilerManager.make(compilerManager.createProjectCompileScope(project), (aborted, errors, warnings, compileContext) -> {
|
compilerManager.make(compilerManager.createProjectCompileScope(project), (aborted, errors, warnings, compileContext) -> {
|
||||||
if (aborted || errors != 0) return;
|
if (aborted || errors != 0) return;
|
||||||
@@ -664,7 +664,7 @@ public class JavaCoverageEngine extends CoverageEngine {
|
|||||||
@NotNull final CoverageSuitesBundle currentSuite) {
|
@NotNull final CoverageSuitesBundle currentSuite) {
|
||||||
|
|
||||||
final ExportToHTMLSettings settings = ExportToHTMLSettings.getInstance(project);
|
final ExportToHTMLSettings settings = ExportToHTMLSettings.getInstance(project);
|
||||||
ProgressManager.getInstance().run(new Task.Backgroundable(project, ExecutionBundle.message("generating.coverage.report")) {
|
ProgressManager.getInstance().run(new Task.Backgroundable(project, JavaCoverageBundle.message("generating.coverage.report")) {
|
||||||
final Exception[] myExceptions = new Exception[1];
|
final Exception[] myExceptions = new Exception[1];
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -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.
|
// 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;
|
package com.intellij.coverage;
|
||||||
|
|
||||||
import com.intellij.ide.IdeBundle;
|
import com.intellij.java.coverage.JavaCoverageBundle;
|
||||||
import com.intellij.openapi.project.Project;
|
import com.intellij.openapi.project.Project;
|
||||||
import com.intellij.openapi.ui.VerticalFlowLayout;
|
import com.intellij.openapi.ui.VerticalFlowLayout;
|
||||||
import com.intellij.ui.IdeBorderFactory;
|
import com.intellij.ui.IdeBorderFactory;
|
||||||
@@ -47,12 +47,12 @@ class JavaCoverageOptions extends CoverageOptions {
|
|||||||
|
|
||||||
private final JPanel myPanel = new JPanel(new VerticalFlowLayout());
|
private final JPanel myPanel = new JPanel(new VerticalFlowLayout());
|
||||||
private final JCheckBox myImplicitCheckBox =
|
private final JCheckBox myImplicitCheckBox =
|
||||||
new JCheckBox(IdeBundle.message("settings.coverage.java.ignore.implicitly.declared.default.constructors"), true);
|
new JCheckBox(JavaCoverageBundle.message("settings.coverage.java.ignore.implicitly.declared.default.constructors"), true);
|
||||||
private final JCheckBox myEmptyCheckBox =
|
private final JCheckBox myEmptyCheckBox =
|
||||||
new JCheckBox(IdeBundle.message("settings.coverage.java.ignore.empty.private.constructors.of.utility.classes"), true);
|
new JCheckBox(JavaCoverageBundle.message("settings.coverage.java.ignore.empty.private.constructors.of.utility.classes"), true);
|
||||||
|
|
||||||
JavaCoverageOptionsEditor() {
|
JavaCoverageOptionsEditor() {
|
||||||
myPanel.setBorder(IdeBorderFactory.createTitledBorder(IdeBundle.message("settings.coverage.java.java.coverage")));
|
myPanel.setBorder(IdeBorderFactory.createTitledBorder(JavaCoverageBundle.message("settings.coverage.java.java.coverage")));
|
||||||
myPanel.add(myImplicitCheckBox);
|
myPanel.add(myImplicitCheckBox);
|
||||||
myPanel.add(myEmptyCheckBox);
|
myPanel.add(myEmptyCheckBox);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ package com.intellij.coverage.view;
|
|||||||
|
|
||||||
import com.intellij.CommonBundle;
|
import com.intellij.CommonBundle;
|
||||||
import com.intellij.coverage.*;
|
import com.intellij.coverage.*;
|
||||||
import com.intellij.execution.ExecutionBundle;
|
|
||||||
import com.intellij.execution.configurations.RunConfigurationBase;
|
import com.intellij.execution.configurations.RunConfigurationBase;
|
||||||
import com.intellij.execution.configurations.coverage.JavaCoverageEnabledConfiguration;
|
import com.intellij.execution.configurations.coverage.JavaCoverageEnabledConfiguration;
|
||||||
import com.intellij.ide.util.treeView.AbstractTreeNode;
|
import com.intellij.ide.util.treeView.AbstractTreeNode;
|
||||||
|
import com.intellij.java.coverage.JavaCoverageBundle;
|
||||||
import com.intellij.openapi.application.ReadAction;
|
import com.intellij.openapi.application.ReadAction;
|
||||||
import com.intellij.openapi.project.Project;
|
import com.intellij.openapi.project.Project;
|
||||||
import com.intellij.openapi.vfs.VirtualFile;
|
import com.intellij.openapi.vfs.VirtualFile;
|
||||||
@@ -39,7 +39,7 @@ public class JavaCoverageViewExtension extends CoverageViewExtension {
|
|||||||
PsiPackage aPackage = (PsiPackage)node.getValue();
|
PsiPackage aPackage = (PsiPackage)node.getValue();
|
||||||
final String coverageInformationString = myAnnotator
|
final String coverageInformationString = myAnnotator
|
||||||
.getPackageCoverageInformationString(aPackage, null, myCoverageDataManager, myStateBean.myFlattenPackages);
|
.getPackageCoverageInformationString(aPackage, null, myCoverageDataManager, myStateBean.myFlattenPackages);
|
||||||
return ExecutionBundle.message("coverage.view.node.summary", getNotCoveredMessage(coverageInformationString),
|
return JavaCoverageBundle.message("coverage.view.node.summary", getNotCoveredMessage(coverageInformationString),
|
||||||
aPackage != null ? aPackage.getQualifiedName() : node.getName());
|
aPackage != null ? aPackage.getQualifiedName() : node.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -66,12 +66,12 @@ public class JavaCoverageViewExtension extends CoverageViewExtension {
|
|||||||
}
|
}
|
||||||
coverageInformationString = JavaCoverageAnnotator.getCoverageInformationString(info, false);
|
coverageInformationString = JavaCoverageAnnotator.getCoverageInformationString(info, false);
|
||||||
}
|
}
|
||||||
return ExecutionBundle.message("coverage.view.root.node.summary", getNotCoveredMessage(coverageInformationString));
|
return JavaCoverageBundle.message("coverage.view.root.node.summary", getNotCoveredMessage(coverageInformationString));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String getNotCoveredMessage(String coverageInformationString) {
|
private static String getNotCoveredMessage(String coverageInformationString) {
|
||||||
if (coverageInformationString == null) {
|
if (coverageInformationString == null) {
|
||||||
coverageInformationString = ExecutionBundle.message("coverage.view.no.coverage");
|
coverageInformationString = JavaCoverageBundle.message("coverage.view.no.coverage");
|
||||||
}
|
}
|
||||||
return coverageInformationString;
|
return coverageInformationString;
|
||||||
}
|
}
|
||||||
@@ -277,9 +277,9 @@ public class JavaCoverageViewExtension extends CoverageViewExtension {
|
|||||||
public ColumnInfo[] createColumnInfos() {
|
public ColumnInfo[] createColumnInfos() {
|
||||||
ArrayList<ColumnInfo> infos = new ArrayList<>();
|
ArrayList<ColumnInfo> infos = new ArrayList<>();
|
||||||
infos.add(new ElementColumnInfo());
|
infos.add(new ElementColumnInfo());
|
||||||
infos.add(new PercentageCoverageColumnInfo(1, ExecutionBundle.message("coverage.view.column.class"), mySuitesBundle, myStateBean));
|
infos.add(new PercentageCoverageColumnInfo(1, JavaCoverageBundle.message("coverage.view.column.class"), mySuitesBundle, myStateBean));
|
||||||
infos.add(new PercentageCoverageColumnInfo(2, ExecutionBundle.message("coverage.view.column.method"), mySuitesBundle, myStateBean));
|
infos.add(new PercentageCoverageColumnInfo(2, JavaCoverageBundle.message("coverage.view.column.method"), mySuitesBundle, myStateBean));
|
||||||
infos.add(new PercentageCoverageColumnInfo(3, ExecutionBundle.message("coverage.view.column.line"), mySuitesBundle, myStateBean));
|
infos.add(new PercentageCoverageColumnInfo(3, JavaCoverageBundle.message("coverage.view.column.line"), mySuitesBundle, myStateBean));
|
||||||
RunConfigurationBase runConfiguration = mySuitesBundle.getRunConfiguration();
|
RunConfigurationBase runConfiguration = mySuitesBundle.getRunConfiguration();
|
||||||
if (runConfiguration != null) {
|
if (runConfiguration != null) {
|
||||||
JavaCoverageEnabledConfiguration coverageEnabledConfiguration = JavaCoverageEnabledConfiguration.getFrom(runConfiguration);
|
JavaCoverageEnabledConfiguration coverageEnabledConfiguration = JavaCoverageEnabledConfiguration.getFrom(runConfiguration);
|
||||||
@@ -300,7 +300,7 @@ public class JavaCoverageViewExtension extends CoverageViewExtension {
|
|||||||
|
|
||||||
private boolean isBranchColumnAvailable(ArrayList<? super ColumnInfo> infos, CoverageRunner coverageRunner, boolean sampling) {
|
private boolean isBranchColumnAvailable(ArrayList<? super ColumnInfo> infos, CoverageRunner coverageRunner, boolean sampling) {
|
||||||
if (coverageRunner instanceof JavaCoverageRunner && ((JavaCoverageRunner)coverageRunner).isBranchInfoAvailable(sampling)) {
|
if (coverageRunner instanceof JavaCoverageRunner && ((JavaCoverageRunner)coverageRunner).isBranchInfoAvailable(sampling)) {
|
||||||
infos.add(new PercentageCoverageColumnInfo(4, ExecutionBundle.message("coverage.view.column.branch"), mySuitesBundle, myStateBean));
|
infos.add(new PercentageCoverageColumnInfo(4, JavaCoverageBundle.message("coverage.view.column.branch"), mySuitesBundle, myStateBean));
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
+11
-12
@@ -2,16 +2,15 @@
|
|||||||
|
|
||||||
package com.intellij.execution.configurations.coverage;
|
package com.intellij.execution.configurations.coverage;
|
||||||
|
|
||||||
import com.intellij.codeInsight.CodeInsightBundle;
|
|
||||||
import com.intellij.coverage.CoverageRunner;
|
import com.intellij.coverage.CoverageRunner;
|
||||||
import com.intellij.coverage.JavaCoverageEngine;
|
import com.intellij.coverage.JavaCoverageEngine;
|
||||||
import com.intellij.execution.CommonJavaRunConfigurationParameters;
|
import com.intellij.execution.CommonJavaRunConfigurationParameters;
|
||||||
import com.intellij.execution.ExecutionBundle;
|
|
||||||
import com.intellij.execution.configurations.ModuleBasedConfiguration;
|
import com.intellij.execution.configurations.ModuleBasedConfiguration;
|
||||||
import com.intellij.execution.configurations.RunConfigurationBase;
|
import com.intellij.execution.configurations.RunConfigurationBase;
|
||||||
import com.intellij.execution.util.JreVersionDetector;
|
import com.intellij.execution.util.JreVersionDetector;
|
||||||
import com.intellij.icons.AllIcons;
|
import com.intellij.icons.AllIcons;
|
||||||
import com.intellij.ide.util.PackageChooserDialog;
|
import com.intellij.ide.util.PackageChooserDialog;
|
||||||
|
import com.intellij.java.coverage.JavaCoverageBundle;
|
||||||
import com.intellij.openapi.diagnostic.Logger;
|
import com.intellij.openapi.diagnostic.Logger;
|
||||||
import com.intellij.openapi.options.SettingsEditor;
|
import com.intellij.openapi.options.SettingsEditor;
|
||||||
import com.intellij.openapi.project.Project;
|
import com.intellij.openapi.project.Project;
|
||||||
@@ -88,7 +87,7 @@ public class CoverageConfigurable extends SettingsEditor<RunConfigurationBase> {
|
|||||||
@Override
|
@Override
|
||||||
protected void addPatternFilter() {
|
protected void addPatternFilter() {
|
||||||
PackageChooser chooser =
|
PackageChooser chooser =
|
||||||
new PackageChooserDialog(CodeInsightBundle.message("coverage.pattern.filter.editor.choose.package.title"), myProject);
|
new PackageChooserDialog(JavaCoverageBundle.message("coverage.pattern.filter.editor.choose.package.title"), myProject);
|
||||||
if (chooser.showAndGet()) {
|
if (chooser.showAndGet()) {
|
||||||
List<PsiPackage> packages = chooser.getSelectedPackages();
|
List<PsiPackage> packages = chooser.getSelectedPackages();
|
||||||
if (!packages.isEmpty()) {
|
if (!packages.isEmpty()) {
|
||||||
@@ -107,7 +106,7 @@ public class CoverageConfigurable extends SettingsEditor<RunConfigurationBase> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected String getAddPatternButtonText() {
|
protected String getAddPatternButtonText() {
|
||||||
return CodeInsightBundle.message("coverage.button.add.package");
|
return JavaCoverageBundle.message("coverage.button.add.package");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -220,13 +219,13 @@ public class CoverageConfigurable extends SettingsEditor<RunConfigurationBase> {
|
|||||||
});
|
});
|
||||||
myRunnerPanel = new JPanel(new GridBagLayout());
|
myRunnerPanel = new JPanel(new GridBagLayout());
|
||||||
myRunnerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
|
myRunnerPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
|
||||||
myRunnerPanel.add(new JLabel(ExecutionBundle.message("run.configuration.choose.coverage.runner")), new GridBagConstraints(0, 0, 1, 1, 0, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, JBUI.insetsRight(10), 0, 0));
|
myRunnerPanel.add(new JLabel(JavaCoverageBundle.message("run.configuration.choose.coverage.runner")), new GridBagConstraints(0, 0, 1, 1, 0, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, JBUI.insetsRight(10), 0, 0));
|
||||||
myRunnerPanel.add(myCoverageRunnerCb, new GridBagConstraints(1, 0, 1, 1, 1, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, JBUI.emptyInsets(), 0, 0));
|
myRunnerPanel.add(myCoverageRunnerCb, new GridBagConstraints(1, 0, 1, 1, 1, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, JBUI.emptyInsets(), 0, 0));
|
||||||
final JPanel cPanel = new JPanel(new VerticalFlowLayout());
|
final JPanel cPanel = new JPanel(new VerticalFlowLayout());
|
||||||
|
|
||||||
mySamplingRb = new JRadioButton(ExecutionBundle.message("run.configuration.coverage.sampling"));
|
mySamplingRb = new JRadioButton(JavaCoverageBundle.message("run.configuration.coverage.sampling"));
|
||||||
cPanel.add(mySamplingRb);
|
cPanel.add(mySamplingRb);
|
||||||
myTracingRb = new JRadioButton(ExecutionBundle.message("run.configuration.coverage.tracing"));
|
myTracingRb = new JRadioButton(JavaCoverageBundle.message("run.configuration.coverage.tracing"));
|
||||||
cPanel.add(myTracingRb);
|
cPanel.add(myTracingRb);
|
||||||
|
|
||||||
final ButtonGroup group = new ButtonGroup();
|
final ButtonGroup group = new ButtonGroup();
|
||||||
@@ -244,7 +243,7 @@ public class CoverageConfigurable extends SettingsEditor<RunConfigurationBase> {
|
|||||||
mySamplingRb.addActionListener(samplingListener);
|
mySamplingRb.addActionListener(samplingListener);
|
||||||
myTracingRb.addActionListener(samplingListener);
|
myTracingRb.addActionListener(samplingListener);
|
||||||
|
|
||||||
myTrackPerTestCoverageCb = new JCheckBox(ExecutionBundle.message("run.configuration.track.per.test.coverage"));
|
myTrackPerTestCoverageCb = new JCheckBox(JavaCoverageBundle.message("run.configuration.track.per.test.coverage"));
|
||||||
final JBPanel tracingPanel = JBUI.Panels.simplePanel(myTrackPerTestCoverageCb).withBorder(JBUI.Borders.emptyLeft(15));
|
final JBPanel tracingPanel = JBUI.Panels.simplePanel(myTrackPerTestCoverageCb).withBorder(JBUI.Borders.emptyLeft(15));
|
||||||
cPanel.add(tracingPanel);
|
cPanel.add(tracingPanel);
|
||||||
myRunnerPanel.add(cPanel, new GridBagConstraints(0, 1, GridBagConstraints.REMAINDER, 1, 1, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, JBUI.emptyInsets(), 0, 0));
|
myRunnerPanel.add(cPanel, new GridBagConstraints(0, 1, GridBagConstraints.REMAINDER, 1, 1, 1, GridBagConstraints.WEST, GridBagConstraints.NONE, JBUI.emptyInsets(), 0, 0));
|
||||||
@@ -259,11 +258,11 @@ public class CoverageConfigurable extends SettingsEditor<RunConfigurationBase> {
|
|||||||
final GridBagConstraints bagConstraints =
|
final GridBagConstraints bagConstraints =
|
||||||
new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH,
|
new GridBagConstraints(0, GridBagConstraints.RELATIVE, 1, 1, 1, 1, GridBagConstraints.NORTHWEST, GridBagConstraints.BOTH,
|
||||||
JBUI.emptyInsets(), 0, 0);
|
JBUI.emptyInsets(), 0, 0);
|
||||||
panel.add(new TitledSeparator(ExecutionBundle.message("record.coverage.filters.title")), bagConstraints);
|
panel.add(new TitledSeparator(JavaCoverageBundle.message("record.coverage.filters.title")), bagConstraints);
|
||||||
myClassFilterEditor = new MyClassFilterEditor(myProject);
|
myClassFilterEditor = new MyClassFilterEditor(myProject);
|
||||||
panel.add(myClassFilterEditor, bagConstraints);
|
panel.add(myClassFilterEditor, bagConstraints);
|
||||||
|
|
||||||
panel.add(new TitledSeparator(ExecutionBundle.message("exclude.coverage.filters.title")), bagConstraints);
|
panel.add(new TitledSeparator(JavaCoverageBundle.message("exclude.coverage.filters.title")), bagConstraints);
|
||||||
myExcludeClassFilterEditor = new MyClassFilterEditor(myProject) {
|
myExcludeClassFilterEditor = new MyClassFilterEditor(myProject) {
|
||||||
@NotNull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
@@ -276,14 +275,14 @@ public class CoverageConfigurable extends SettingsEditor<RunConfigurationBase> {
|
|||||||
panel.add(myExcludeClassFilterEditor, bagConstraints);
|
panel.add(myExcludeClassFilterEditor, bagConstraints);
|
||||||
|
|
||||||
bagConstraints.weighty = 0;
|
bagConstraints.weighty = 0;
|
||||||
myTrackTestSourcesCb = new JCheckBox(ExecutionBundle.message("run.configuration.enable.coverage.in.test.folders"));
|
myTrackTestSourcesCb = new JCheckBox(JavaCoverageBundle.message("run.configuration.enable.coverage.in.test.folders"));
|
||||||
panel.add(myTrackTestSourcesCb, bagConstraints);
|
panel.add(myTrackTestSourcesCb, bagConstraints);
|
||||||
|
|
||||||
gc.weighty = 1;
|
gc.weighty = 1;
|
||||||
gc.fill = GridBagConstraints.BOTH;
|
gc.fill = GridBagConstraints.BOTH;
|
||||||
result.add(panel, gc);
|
result.add(panel, gc);
|
||||||
|
|
||||||
myCoverageNotSupportedLabel = new JLabel(CodeInsightBundle.message("code.coverage.is.not.supported"));
|
myCoverageNotSupportedLabel = new JLabel(JavaCoverageBundle.message("code.coverage.is.not.supported"));
|
||||||
myCoverageNotSupportedLabel.setIcon(AllIcons.General.WarningDialog);
|
myCoverageNotSupportedLabel.setIcon(AllIcons.General.WarningDialog);
|
||||||
result.add(myCoverageNotSupportedLabel, gc);
|
result.add(myCoverageNotSupportedLabel, gc);
|
||||||
return result;
|
return result;
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
// 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.java.coverage;
|
||||||
|
|
||||||
|
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 JavaCoverageBundle extends DynamicBundle {
|
||||||
|
@NonNls private static final String BUNDLE = "messages.JavaCoverageBundle";
|
||||||
|
private static final JavaCoverageBundle INSTANCE = new JavaCoverageBundle();
|
||||||
|
|
||||||
|
private JavaCoverageBundle() {
|
||||||
|
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<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
|
||||||
|
return INSTANCE.getLazyMessage(key, params);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user