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

[i18n] get rid of AnalysisScopeBundle

Browse Source 
Its name is too specific and most of the properties weren't related to analysis scope anyway. Now properties used in platform.analysis are moved to AnalysisBundle, properties used in platform.lang.impl are moved to CodeInsightBundle, properties used in java.dsm module are moved to DsmBundle.

GitOrigin-RevId: 504ddfb311e2c18b06b561ae3f6720687b3b35ea
This commit is contained in:
nik
2020-02-21 12:16:55 +03:00
committed by intellij-monorepo-bot
parent d82b94e331
commit 3f4d700e5c
42 changed files with 201 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/classpath/AnalyzeModuleDependencyAction.java
View File

@@ -3,7 +3,7 @@ package com.intellij.openapi.roots.ui.configuration.classpath;
import com.intellij.CommonBundle;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.ide.JavaUiBundle;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -118,7 +118,7 @@ class AnalyzeModuleDependencyAction extends AnAction {
private String generateSkipImportsWarning() {
if (DependencyVisitorFactory.VisitorOptions.fromSettings(myPanel.getProject()).skipImports()) {
return " " + AnalysisScopeBundle.message("dependencies.in.imports.message");
return " " + CodeInsightBundle.message("dependencies.in.imports.message");
}
return "";
}

2
java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
View File

@@ -143,6 +143,8 @@ suppress.for.statement.with.comment=Suppress for statement with comment
intention.add.annotation.family=Add Annotation
intention.text.remove.annotation=Remove
scope.package=Package {0}
0.field.is.always.initialized.not.null=@{0} field is always initialized not-null
access.can.be.0=Access can be {0}
access.to.field.code.ref.code.outside.of.declared.guards.loc=Access to field <code>#ref</code> outside of declared guards #loc

5
java/java-analysis-impl/src/com/intellij/analysis/JavaAnalysisScope.java
View File

@@ -16,6 +16,7 @@
package com.intellij.analysis;
import com.intellij.java.analysis.JavaAnalysisBundle;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
@@ -86,7 +87,7 @@ public class JavaAnalysisScope extends AnalysisScope {
@Override
public String getShortenName() {
if (myType == PACKAGE) {
return AnalysisScopeBundle.message("scope.package", ((PsiPackage)myElement).getQualifiedName());
return JavaAnalysisBundle.message("scope.package", ((PsiPackage)myElement).getQualifiedName());
}
return super.getShortenName();
}
@@ -95,7 +96,7 @@ public class JavaAnalysisScope extends AnalysisScope {
@Override
public String getDisplayName() {
if (myType == PACKAGE) {
return AnalysisScopeBundle.message("scope.package", ((PsiPackage)myElement).getQualifiedName());
return JavaAnalysisBundle.message("scope.package", ((PsiPackage)myElement).getQualifiedName());
}
return super.getDisplayName();
}

8
java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesAction.java
View File

@@ -16,8 +16,8 @@
package com.intellij.cyclicDependencies.actions;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.analysis.JavaAnalysisScope;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.java.JavaBundle;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.fileEditor.FileDocumentManager;
@@ -42,8 +42,8 @@ public class CyclicDependenciesAction extends AnAction{
private final String myTitle;
public CyclicDependenciesAction() {
myAnalysisVerb = AnalysisScopeBundle.message("action.analyze.verb");
myAnalysisNoun = AnalysisScopeBundle.message("action.analysis.noun");
myAnalysisVerb = CodeInsightBundle.message("action.analyze.verb");
myAnalysisNoun = CodeInsightBundle.message("action.analysis.noun");
myTitle = JavaBundle.message("action.cyclic.dependency.title");
}
@@ -180,7 +180,7 @@ public class CyclicDependenciesAction extends AnAction{
@Override
protected JComponent createCenterPanel() {
myScopePanel.setBorder(IdeBorderFactory.createTitledBorder(
AnalysisScopeBundle.message("analysis.scope.title", myAnalysisNoun)));
CodeInsightBundle.message("analysis.scope.title", myAnalysisNoun)));
myProjectButton.setText(JavaBundle.message("cyclic.dependencies.scope.dialog.project.button", myAnalysisVerb));
ButtonGroup group = new ButtonGroup();
group.add(myProjectButton);

4
java/java-impl/src/com/intellij/cyclicDependencies/actions/CyclicDependenciesHandler.java
View File

@@ -16,8 +16,8 @@
package com.intellij.cyclicDependencies.actions;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.analysis.PerformAnalysisInBackgroundOption;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.cyclicDependencies.CyclicDependenciesBuilder;
import com.intellij.cyclicDependencies.ui.CyclicDependenciesPanel;
import com.intellij.java.JavaBundle;
@@ -51,7 +51,7 @@ public class CyclicDependenciesHandler {
DependenciesToolWindow.getInstance(myProject).addContent(content);
});
ProgressManager.getInstance()
.runProcessWithProgressAsynchronously(myProject, AnalysisScopeBundle.message("package.dependencies.progress.title"),
.runProcessWithProgressAsynchronously(myProject, CodeInsightBundle.message("package.dependencies.progress.title"),
() -> builder.analyze(), successRunnable, null, new PerformAnalysisInBackgroundOption(myProject));
}
}

10
java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java
View File

@@ -2,7 +2,7 @@
package com.intellij.cyclicDependencies.ui;
import com.intellij.CommonBundle;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.cyclicDependencies.CyclicDependenciesBuilder;
import com.intellij.cyclicDependencies.actions.CyclicDependenciesHandler;
import com.intellij.icons.AllIcons;
@@ -393,7 +393,7 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
private final class CloseAction extends AnAction implements DumbAware {
CloseAction() {
super(CommonBundle.lazyMessage("action.close"), AnalysisScopeBundle.lazyMessage("action.close.dependency.description"),
super(CommonBundle.lazyMessage("action.close"), CodeInsightBundle.lazyMessage("action.close.dependency.description"),
AllIcons.Actions.Cancel);
}
@@ -407,7 +407,7 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
private final class ShowFilesAction extends ToggleAction {
ShowFilesAction() {
super(AnalysisScopeBundle.lazyMessage("action.show.files"), AnalysisScopeBundle.lazyMessage("action.show.files.description"),
super(CodeInsightBundle.lazyMessage("action.show.files"), CodeInsightBundle.lazyMessage("action.show.files.description"),
AllIcons.FileTypes.Java);
}
@@ -446,7 +446,7 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
private final class GroupByScopeTypeAction extends ToggleAction {
GroupByScopeTypeAction() {
super(AnalysisScopeBundle.lazyMessage("action.group.by.scope.type"), AnalysisScopeBundle.lazyMessage("action.group.by.scope.type.description"),
super(CodeInsightBundle.lazyMessage("action.group.by.scope.type"), CodeInsightBundle.lazyMessage("action.group.by.scope.type.description"),
AllIcons.Actions.GroupByTestProduction);
}
@@ -465,7 +465,7 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
private class RerunAction extends AnAction {
RerunAction(JComponent comp) {
super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), AllIcons.Actions.Rerun);
super(CommonBundle.message("action.rerun"), CodeInsightBundle.message("action.rerun.dependency"), AllIcons.Actions.Rerun);
registerCustomShortcutSet(CommonShortcuts.getRerun(), comp);
}

8
java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.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.packageDependencies.ui;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.icons.AllIcons;
import com.intellij.ide.projectView.impl.ModuleGroup;
import com.intellij.java.JavaBundle;
@@ -237,7 +237,7 @@ public class TreeModelBuilder {
};
if (showProgress) {
final String title = AnalysisScopeBundle.message("package.dependencies.build.process.title");
final String title = CodeInsightBundle.message("package.dependencies.build.process.title");
ProgressManager.getInstance().runProcessWithProgressSynchronously(buildingRunnable, title, false, myProject);
}
else {
@@ -447,7 +447,7 @@ public class TreeModelBuilder {
}
public static String getScanningPackagesMessage() {
return AnalysisScopeBundle.message("package.dependencies.build.progress.text");
return CodeInsightBundle.message("package.dependencies.build.progress.text");
}
public static String getProductionName() {
@@ -459,6 +459,6 @@ public class TreeModelBuilder {
}
public static String getLibraryName() {
return AnalysisScopeBundle.message("package.dependencies.library.node.text");
return CodeInsightBundle.message("package.dependencies.library.node.text");
}
}

8
java/java-impl/src/com/intellij/psi/search/scope/packageSet/PatternPackageSetParserExtension.java
View File

@@ -2,7 +2,7 @@
package com.intellij.psi.search.scope.packageSet;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.lexer.Lexer;
import com.intellij.psi.search.scope.packageSet.lexer.ScopeTokenTypes;
@@ -67,7 +67,7 @@ public class PatternPackageSetParserExtension implements PackageSetParserExtensi
wasIdentifier = false;
}
else if (lexer.getTokenType() == ScopeTokenTypes.IDENTIFIER) {
if (wasIdentifier) error(AnalysisScopeBundle.message("error.package.set.token.expectations", getTokenText(lexer)), lexer);
if (wasIdentifier) error(CodeInsightBundle.message("error.package.set.token.expectations", getTokenText(lexer)), lexer);
wasIdentifier = true;
pattern.append(getTokenText(lexer));
}
@@ -78,7 +78,7 @@ public class PatternPackageSetParserExtension implements PackageSetParserExtensi
}
if (pattern.length() == 0) {
error(AnalysisScopeBundle.message("error.package.set.pattern.expectations"), lexer);
error(CodeInsightBundle.message("error.package.set.pattern.expectations"), lexer);
}
return pattern.toString();
@@ -93,6 +93,6 @@ public class PatternPackageSetParserExtension implements PackageSetParserExtensi
private static void error(String message, Lexer lexer) throws ParsingException {
throw new ParsingException(
AnalysisScopeBundle.message("error.package.set.position.parsing.error", message, (lexer.getTokenStart() + 1)));
CodeInsightBundle.message("error.package.set.position.parsing.error", message, (lexer.getTokenStart() + 1)));
}
}

2
platform/analysis-api/resources/messages/AnalysisBundle.properties
View File

@@ -122,6 +122,8 @@ scope.option.module=Module ''{0}''
scope.project=Project ''{0}''
scope.selected.files=Selected files
scope.virtual.files=selection
display.name.directories.0=Directories {0}
display.name.directory.0=Directory ''{0}''
shared.scopes.node.text=Shared Scopes
suppress.inspection.family=Suppress inspection
suppress.inspection.statement=Suppress for statement

81
platform/analysis-api/resources/messages/AnalysisScopeBundle.properties
View File

@@ -1,84 +1,7 @@
# {0} = Inspection|Dependency Analysis|Duplication Analysis
#this bundle is DEPRECATED, it's kept for compatibility with external plugins only
specify.analysis.scope=Specify {0} Scope
analysis.scope.title={0} scope
scope.option.whole.project=Whole &project
scope.option.module.with.mnemonic=&Module ''{0}''
scope.option.custom=&Custom scope
scope.option.include.test.sources=Include &test sources
scope.package=Package {0}
# {0} module list comma separated, {1} - module count
#actions
action.rerun.dependency=Rerun Dependency Analysis
action.group.by.scope.type=Group by Scope Type
action.group.by.scope.type.description=Group by Scope Type (production, test, libraries)
action.show.files=Show Files
action.show.files.description=Show/Hide Files
action.close.dependency.description=Close Dependency Viewer
action.module.dependencies.direction=Backward Dependencies (Usages)
action.module.dependencies.tests=Include Test Dependencies
action.analyze.verb=Analyze
action.analysis.noun=Analysis
action.flatten.packages=Flatten Packages
action.show.modules=Show Modules
action.show.modules.description=Show/Hide Modules
action.show.illegals.only=Show Illegals Only
action.show.illegals.only.description=Show only files that have illegal dependencies
action.edit.rules=Edit Rules
action.edit.rules.description=Edit Dependency Rules
action.select.in.left.tree=Select in Left Tree
action.select.in.left.tree.description=Select in left tree (to browse dependencies from)
action.forward.dependency.analysis=Dependency Analysis
action.backward.dependency.analysis=Backward Dependency Analysis
update.module.tree.progress.title=Updating Module Tree
update.module.tree.progress.text=Processing module ''{0}'' cycles
module.dependencies.cycle.node.text=Cycle {0}
module.dependencies.scope.dialog.module.button=Inspect &module ''{0}''
module.dependencies.scope.dialog.project.button=Inspect the whole &project
module.dependencies.scope.dialog.title=Specify Analysis Scope
package.dependencies.progress.title=Analyzing Dependencies
backward.dependencies.progress.text=Analyzing Backward Dependencies
find.dependencies.progress.text=Searching for usages in: {0}
usage.view.canceled=Canceled
package.dependencies.toolwindow.title=Dependencies of {0}
package.dependencies.on.toolwindow.title=Dependencies of {0} on {1}
no.dependencies.found.message=No dependencies of {0} on {1} found.
dependencies.in.imports.message=Dependencies in imports were ignored.
backward.dependencies.toolwindow.title=Backward Dependencies of {0}
package.dependencies.build.progress.text=Scanning packages
package.dependencies.build.process.title=Scanning Packages
#dependencies tree nodes text
package.dependencies.library.node.text=Library Classes
unknown.node.text=<unknown>
package.dependencies.node.items.count= {0, choice, 1#1 entry|2#{0, number} entries}
#scope selector
error.package.set.token.expectations=Unexpected ''{0}''
error.package.set.pattern.expectations=Package pattern expected
error.package.set.rparen.expected=')' expected
error.package.set.position.parsing.error={0} at position {1}
#dependencies configurations
status.bar.no.rule.violation.message=No rules are violated
status.bar.rule.violation.message=The following rule{0, choice, 1# is|2#s are} violated: {1}
dependency.configurable.display.name=Dependency Validation
dependency.configurable.deny.table.column1=Deny usages of
dependency.configurable.deny.table.column2=in
dependency.configurable.allow.table.column1=Allow usages of
dependency.configurable.allow.table.column2=only in
scope.option.uncommitted.files=&Uncommitted files
scope.option.uncommitted.files.all.changelists.choice=All
analyzing.project=Analyzing Project
checking.class.files=Checking Class Files
recompile.confirmation.message=The project's class files are out of date. Do you want to compile the project before continuing DSM analysis?\nNot compiling may result in incomplete or incorrect results.
project.is.out.of.date=Project Is Out Of Date
skip.import.statements.checkbox.title=Skip import statements
mark.dependency.illegal.text=Mark Illegal
display.name.directories.0=Directories {0}
display.name.directory.0=Directory ''{0}''
display.name.directory.02=Directory ''{0}''
project.is.out.of.date=Project Is Out Of Date

4
platform/analysis-api/src/com/intellij/analysis/AnalysisScopeBundle.java
View File

@@ -22,6 +22,10 @@ import org.jetbrains.annotations.PropertyKey;
import java.util.function.Supplier;
/**
* @deprecated use other bundles ({@link AnalysisBundle}, {@link com.intellij.codeInsight.CodeInsightBundle}) instead
*/
@Deprecated
public class AnalysisScopeBundle extends DynamicBundle {
@NonNls private static final String BUNDLE = "messages.AnalysisScopeBundle";
private static final AnalysisScopeBundle INSTANCE = new AnalysisScopeBundle();

7
platform/analysis-api/src/com/intellij/psi/search/GlobalSearchScopesCore.java
View File

@@ -2,7 +2,6 @@
package com.intellij.psi.search;
import com.intellij.analysis.AnalysisBundle;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.UnloadedModuleDescription;
@@ -305,7 +304,7 @@ public class GlobalSearchScopesCore {
@NotNull
@Override
public String getDisplayName() {
return AnalysisScopeBundle.message("display.name.directory.02", myDirectory.getName());
return AnalysisBundle.message("display.name.directory.0", myDirectory.getName());
}
}
@@ -421,10 +420,10 @@ public class GlobalSearchScopesCore {
if (myDirectories.size() + myDirectoriesWithSubdirectories.size() == 1) {
Set<VirtualFile> dirs = myDirectories.size() == 1 ? myDirectories : myDirectoriesWithSubdirectories;
VirtualFile root = Objects.requireNonNull(ContainerUtil.getFirstItem(dirs));
return AnalysisScopeBundle.message("display.name.directory.0", root.getName());
return AnalysisBundle.message("display.name.directory.0", root.getName());
}
Iterable<VirtualFile> allDirs = ContainerUtil.concat(myDirectories, myDirectoriesWithSubdirectories);
return AnalysisScopeBundle.message("display.name.directories.0", StringUtil.join(allDirs, file -> "'" + file.getName() + "'", ", "));
return AnalysisBundle.message("display.name.directories.0", StringUtil.join(allDirs, file -> "'" + file.getName() + "'", ", "));
}
}

64
platform/lang-api/resources/messages/CodeInsightBundle.properties
View File

@@ -437,4 +437,68 @@ new.enum.constant.text=Enum constant
new.enum.constant.description=Create new Enum constant
node.method.tooltip.description=Create new method
action.rerun.dependency=Rerun Dependency Analysis
action.group.by.scope.type=Group by Scope Type
action.group.by.scope.type.description=Group by Scope Type (production, test, libraries)
action.show.files=Show Files
action.show.files.description=Show/Hide Files
action.close.dependency.description=Close Dependency Viewer
action.analysis.noun=Analysis
action.flatten.packages=Flatten Packages
action.show.modules=Show Modules
action.show.modules.description=Show/Hide Modules
action.show.illegals.only=Show Illegals Only
action.show.illegals.only.description=Show only files that have illegal dependencies
action.edit.rules=Edit Rules
action.edit.rules.description=Edit Dependency Rules
action.select.in.left.tree=Select in Left Tree
action.select.in.left.tree.description=Select in left tree (to browse dependencies from)
action.forward.dependency.analysis=Dependency Analysis
action.backward.dependency.analysis=Backward Dependency Analysis
package.dependencies.progress.title=Analyzing Dependencies
backward.dependencies.progress.text=Analyzing Backward Dependencies
find.dependencies.progress.text=Searching for usages in: {0}
usage.view.canceled=Canceled
package.dependencies.toolwindow.title=Dependencies of {0}
package.dependencies.on.toolwindow.title=Dependencies of {0} on {1}
no.dependencies.found.message=No dependencies of {0} on {1} found.
dependencies.in.imports.message=Dependencies in imports were ignored.
backward.dependencies.toolwindow.title=Backward Dependencies of {0}
package.dependencies.build.progress.text=Scanning packages
package.dependencies.build.process.title=Scanning Packages
unknown.node.text=<unknown>
package.dependencies.node.items.count={0, choice, 1#1 entry|2#{0, number} entries}
status.bar.no.rule.violation.message=No rules are violated
status.bar.rule.violation.message=The following rule{0, choice, 1# is|2#s are} violated: {1}
dependency.configurable.display.name=Dependency Validation
dependency.configurable.deny.table.column1=Deny usages of
dependency.configurable.deny.table.column2=in
dependency.configurable.allow.table.column1=Allow usages of
dependency.configurable.allow.table.column2=only in
skip.import.statements.checkbox.title=Skip import statements
mark.dependency.illegal.text=Mark Illegal
edit.intention.settings.intention.text=Edit intention settings
action.module.dependencies.direction=Backward Dependencies (Usages)
action.module.dependencies.tests=Include Test Dependencies
update.module.tree.progress.title=Updating Module Tree
update.module.tree.progress.text=Processing module ''{0}'' cycles
module.dependencies.cycle.node.text=Cycle {0}
module.dependencies.scope.dialog.module.button=Inspect &module ''{0}''
module.dependencies.scope.dialog.project.button=Inspect the whole &project
module.dependencies.scope.dialog.title=Specify Analysis Scope
error.package.set.token.expectations=Unexpected ''{0}''
error.package.set.pattern.expectations=Package pattern expected
error.package.set.rparen.expected=')' expected
error.package.set.position.parsing.error={0} at position {1}
analysis.scope.title={0} scope
action.analyze.verb=Analyze
scope.option.whole.project=Whole &project
scope.option.module.with.mnemonic=&Module ''{0}''
scope.option.custom=&Custom scope
scope.option.uncommitted.files=&Uncommitted files
scope.option.uncommitted.files.all.changelists.choice=All
specify.analysis.scope=Specify {0} Scope
scope.option.include.test.sources=Include &test sources
package.dependencies.library.node.text=Library Classes

5
platform/lang-impl/src/com/intellij/analysis/BaseAnalysisAction.java
View File

@@ -2,6 +2,7 @@
package com.intellij.analysis;
import com.intellij.analysis.dialog.ModelScopeItem;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInspection.ui.InspectionResultsView;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.fileEditor.FileDocumentManager;
@@ -49,7 +50,7 @@ public abstract class BaseAnalysisAction extends AnAction {
if (scope == null) return;
String title = getDialogTitle();
String noon = AnalysisScopeBundle.message("analysis.scope.title", myAnalysisNoon.get());
String noon = CodeInsightBundle.message("analysis.scope.title", myAnalysisNoon.get());
Module module = getModuleFromContext(dataContext);
boolean rememberScope = ActionPlaces.isMainMenuOrActionSearch(e.getPlace());
AnalysisUIOptions uiOptions = AnalysisUIOptions.getInstance(project);
@@ -88,7 +89,7 @@ public abstract class BaseAnalysisAction extends AnAction {
}
protected @NotNull String getDialogTitle() {
return AnalysisScopeBundle.message("specify.analysis.scope", myTitle.get());
return CodeInsightBundle.message("specify.analysis.scope", myTitle.get());
}
protected String getHelpTopic() {

3
platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java
View File

@@ -4,6 +4,7 @@
package com.intellij.analysis;
import com.intellij.analysis.dialog.*;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.find.FindSettings;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.diagnostic.Logger;
@@ -155,7 +156,7 @@ public class BaseAnalysisActionDialog extends DialogWrapper {
gridY++;
}
myInspectTestSource.setText(AnalysisScopeBundle.message("scope.option.include.test.sources"));
myInspectTestSource.setText(CodeInsightBundle.message("scope.option.include.test.sources"));
myInspectTestSource.setSelected(myOptions.ANALYZE_TEST_SOURCES);
myInspectTestSource.setVisible(myShowInspectTestSource);
gbc.gridy = gridY;

4
platform/lang-impl/src/com/intellij/analysis/dialog/CustomScopeItemPresenter.java
View File

@@ -4,7 +4,7 @@
package com.intellij.analysis.dialog;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.ide.util.scopeChooser.ScopeChooserCombo;
import org.jetbrains.annotations.NotNull;
@@ -23,7 +23,7 @@ public class CustomScopeItemPresenter implements ModelScopeItemPresenter {
@Override
public JRadioButton getButton(ModelScopeItem model) {
JRadioButton button = new JRadioButton();
button.setText(AnalysisScopeBundle.message("scope.option.custom"));
button.setText(CodeInsightBundle.message("scope.option.custom"));
return button;
}

4
platform/lang-impl/src/com/intellij/analysis/dialog/ModuleScopeItemPresenter.java
View File

@@ -4,7 +4,7 @@
package com.intellij.analysis.dialog;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -23,7 +23,7 @@ public class ModuleScopeItemPresenter implements ModelScopeItemPresenter {
public JRadioButton getButton(ModelScopeItem m) {
ModuleScopeItem model = (ModuleScopeItem) m;
JRadioButton button = new JRadioButton();
button.setText(AnalysisScopeBundle.message("scope.option.module.with.mnemonic", model.Module.getName()));
button.setText(CodeInsightBundle.message("scope.option.module.with.mnemonic", model.Module.getName()));
return button;
}

4
platform/lang-impl/src/com/intellij/analysis/dialog/ProjectScopeItemPresenter.java
View File

@@ -4,7 +4,7 @@
package com.intellij.analysis.dialog;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import org.jetbrains.annotations.NotNull;
import javax.swing.*;
@@ -21,7 +21,7 @@ public class ProjectScopeItemPresenter implements ModelScopeItemPresenter {
@NotNull
@Override
public JRadioButton getButton(ModelScopeItem m) {
String message = AnalysisScopeBundle.message("scope.option.whole.project");
String message = CodeInsightBundle.message("scope.option.whole.project");
JRadioButton button = new JRadioButton();
button.setText(message);
return button;

4
platform/lang-impl/src/com/intellij/analysis/dialog/VcsScopeItem.java
View File

@@ -4,7 +4,7 @@
package com.intellij.analysis.dialog;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.vcs.changes.ChangeList;
@@ -71,6 +71,6 @@ public class VcsScopeItem implements ModelScopeItem {
}
private static String getAll() {
return AnalysisScopeBundle.message("scope.option.uncommitted.files.all.changelists.choice");
return CodeInsightBundle.message("scope.option.uncommitted.files.all.changelists.choice");
}
}

4
platform/lang-impl/src/com/intellij/analysis/dialog/VcsScopeItemPresenter.java
View File

@@ -2,7 +2,7 @@
package com.intellij.analysis.dialog;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.openapi.ui.ComboBox;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.ui.SimpleListCellRenderer;
@@ -24,7 +24,7 @@ public class VcsScopeItemPresenter implements ModelScopeItemPresenter {
@Override
public JRadioButton getButton(ModelScopeItem m) {
JRadioButton button = new JRadioButton();
button.setText(AnalysisScopeBundle.message("scope.option.uncommitted.files"));
button.setText(CodeInsightBundle.message("scope.option.uncommitted.files"));
return button;
}

6
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/CleanupOnScopeIntention.java
View File

@@ -16,9 +16,9 @@
package com.intellij.codeInsight.daemon.impl;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.analysis.AnalysisUIOptions;
import com.intellij.analysis.BaseAnalysisActionDialog;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInspection.InspectionsBundle;
import com.intellij.codeInspection.actions.CleanupIntention;
import com.intellij.openapi.module.Module;
@@ -43,8 +43,8 @@ public class CleanupOnScopeIntention extends CleanupIntention {
analysisScope = new AnalysisScope(project);
}
final BaseAnalysisActionDialog dlg = new BaseAnalysisActionDialog(
AnalysisScopeBundle.message("specify.analysis.scope", InspectionsBundle.message("inspection.action.title")),
AnalysisScopeBundle.message("analysis.scope.title", InspectionsBundle.message("inspection.action.noun")), project, BaseAnalysisActionDialog.standardItems(
CodeInsightBundle.message("specify.analysis.scope", InspectionsBundle.message("inspection.action.title")),
CodeInsightBundle.message("analysis.scope.title", InspectionsBundle.message("inspection.action.noun")), project, BaseAnalysisActionDialog.standardItems(
project, analysisScope, module, file),
AnalysisUIOptions.getInstance(project), true);
if (!dlg.showAndGet()) {

6
platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionAction.java
View File

@@ -3,10 +3,10 @@ package com.intellij.codeInspection.actions;
import com.intellij.CommonBundle;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.analysis.AnalysisUIOptions;
import com.intellij.analysis.BaseAnalysisActionDialog;
import com.intellij.analysis.dialog.ModelScopeItem;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInspection.CleanupLocalInspectionTool;
import com.intellij.codeInspection.InspectionManager;
import com.intellij.codeInspection.InspectionProfile;
@@ -142,7 +142,7 @@ public class RunInspectionAction extends GotoActionBase implements DataProvider
final AnalysisScope initialAnalysisScope = analysisScope;
List<ModelScopeItem> items = BaseAnalysisActionDialog.standardItems(project, analysisScope, module, psiElement);
final BaseAnalysisActionDialog dialog = new BaseAnalysisActionDialog("Run '" + toolWrapper.getDisplayName() + "'",
AnalysisScopeBundle.message("analysis.scope.title", InspectionsBundle
CodeInsightBundle.message("analysis.scope.title", InspectionsBundle
.message("inspection.action.noun")), project,
items, options, true) {
@@ -198,7 +198,7 @@ public class RunInspectionAction extends GotoActionBase implements DataProvider
protected Action @NotNull [] createActions() {
final List<Action> actions = new ArrayList<>();
final boolean hasFixAll = toolWrapper.getTool() instanceof CleanupLocalInspectionTool;
actions.add(new AbstractAction(hasFixAll ? AnalysisScopeBundle.message("action.analyze.verb")
actions.add(new AbstractAction(hasFixAll ? CodeInsightBundle.message("action.analyze.verb")
: CommonBundle.getOkButtonText()) {
{
putValue(DEFAULT_ACTION, Boolean.TRUE);

6
platform/lang-impl/src/com/intellij/codeInspection/actions/RunInspectionIntention.java
View File

@@ -3,10 +3,10 @@
package com.intellij.codeInspection.actions;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.analysis.AnalysisUIOptions;
import com.intellij.analysis.BaseAnalysisActionDialog;
import com.intellij.analysis.dialog.ModelScopeItem;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.daemon.HighlightDisplayKey;
import com.intellij.codeInsight.intention.HighPriorityAction;
import com.intellij.codeInsight.intention.IntentionAction;
@@ -83,8 +83,8 @@ public class RunInspectionIntention implements IntentionAction, HighPriorityActi
@NotNull Project project) {
List<ModelScopeItem> items = BaseAnalysisActionDialog.standardItems(project, customScope, module, context);
final BaseAnalysisActionDialog dlg = new BaseAnalysisActionDialog(
AnalysisScopeBundle.message("specify.analysis.scope", InspectionsBundle.message("inspection.action.title")),
AnalysisScopeBundle.message("analysis.scope.title", InspectionsBundle.message("inspection.action.noun")), project,
CodeInsightBundle.message("specify.analysis.scope", InspectionsBundle.message("inspection.action.title")),
CodeInsightBundle.message("analysis.scope.title", InspectionsBundle.message("inspection.action.noun")), project,
items, AnalysisUIOptions.getInstance(project), true);
if (!dlg.showAndGet()) {
return;

4
platform/lang-impl/src/com/intellij/ide/navigationToolbar/DefaultNavBarExtension.java
View File

@@ -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.ide.navigationToolbar;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.ide.scratch.RootType;
import com.intellij.openapi.application.ReadAction;
import com.intellij.openapi.module.Module;
@@ -44,7 +44,7 @@ public class DefaultNavBarExtension extends AbstractNavBarModelExtension {
}
else if (object instanceof LibraryOrderEntry) {
final String libraryName = ((LibraryOrderEntry)object).getLibraryName();
return libraryName != null ? libraryName : AnalysisScopeBundle.message("package.dependencies.library.node.text");
return libraryName != null ? libraryName : CodeInsightBundle.message("package.dependencies.library.node.text");
}
else if (object instanceof ModuleOrderEntry) {
final ModuleOrderEntry moduleOrderEntry = (ModuleOrderEntry)object;

12
platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java
View File

@@ -3,7 +3,7 @@ package com.intellij.moduleDependencies;
import com.intellij.CommonBundle;
import com.intellij.ProjectTopics;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.icons.AllIcons;
import com.intellij.ide.CommonActionsManager;
import com.intellij.ide.TreeExpander;
@@ -258,7 +258,7 @@ public class ModulesDependenciesPanel extends JPanel implements Disposable {
}
});
group.add(new ToggleAction(AnalysisScopeBundle.message("action.module.dependencies.direction")) {
group.add(new ToggleAction(CodeInsightBundle.message("action.module.dependencies.direction")) {
@Override
public boolean isSelected(@NotNull AnActionEvent e) {
return !myState.forwardDirection;
@@ -277,7 +277,7 @@ public class ModulesDependenciesPanel extends JPanel implements Disposable {
}
});
group.add(new ToggleAction(AnalysisScopeBundle.message("action.module.dependencies.tests"), null, AllIcons.Nodes.TestSourceFolder) {
group.add(new ToggleAction(CodeInsightBundle.message("action.module.dependencies.tests"), null, AllIcons.Nodes.TestSourceFolder) {
@Override
public boolean isSelected(@NotNull AnActionEvent e) {
return myState.includeTests;
@@ -305,7 +305,7 @@ public class ModulesDependenciesPanel extends JPanel implements Disposable {
ProgressManager.getInstance().runProcessWithProgressSynchronously(() -> {
for (Module module : myModules) {
if (module.isDisposed()) continue;
ProgressManager.progress(AnalysisScopeBundle.message("update.module.tree.progress.text", module.getName()));
ProgressManager.progress(CodeInsightBundle.message("update.module.tree.progress.text", module.getName()));
DefaultMutableTreeNode moduleNode = new DefaultMutableTreeNode(new MyUserObject(isInCycle(module), module));
root.add(moduleNode);
@@ -313,7 +313,7 @@ public class ModulesDependenciesPanel extends JPanel implements Disposable {
moduleNode.add(new DefaultMutableTreeNode(new MyUserObject(isInCycle(dependency), dependency)));
}
}
}, AnalysisScopeBundle.message("update.module.tree.progress.title"), true, myProject);
}, CodeInsightBundle.message("update.module.tree.progress.title"), true, myProject);
TreeUtil.sortRecursively(root, NODE_COMPARATOR);
((DefaultTreeModel)myLeftTree.getModel()).reload();
@@ -327,7 +327,7 @@ public class ModulesDependenciesPanel extends JPanel implements Disposable {
Set<List<Module>> cycles = GraphAlgorithms.getInstance().findCycles(myModuleGraph, module);
int index = 1;
for (List<Module> modules : cycles) {
DefaultMutableTreeNode cycle = new DefaultMutableTreeNode(AnalysisScopeBundle.message("module.dependencies.cycle.node.text", index++));
DefaultMutableTreeNode cycle = new DefaultMutableTreeNode(CodeInsightBundle.message("module.dependencies.cycle.node.text", index++));
root.add(cycle);
cycle.add(new DefaultMutableTreeNode(new MyUserObject(false, module)));
for (Module moduleInCycle : modules) {

8
platform/lang-impl/src/com/intellij/moduleDependencies/ShowModuleDependenciesAction.java
View File

@@ -2,7 +2,7 @@
package com.intellij.moduleDependencies;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.CommonDataKeys;
@@ -64,10 +64,10 @@ public class ShowModuleDependenciesAction extends AnAction {
protected MyModuleOrProjectScope(String moduleName) {
super(false);
setTitle(AnalysisScopeBundle.message("module.dependencies.scope.dialog.title"));
setTitle(CodeInsightBundle.message("module.dependencies.scope.dialog.title"));
ButtonGroup group = new ButtonGroup();
myProjectScope = new JRadioButton(AnalysisScopeBundle.message("module.dependencies.scope.dialog.project.button"));
myModuleScope = new JRadioButton(AnalysisScopeBundle.message("module.dependencies.scope.dialog.module.button", moduleName));
myProjectScope = new JRadioButton(CodeInsightBundle.message("module.dependencies.scope.dialog.project.button"));
myModuleScope = new JRadioButton(CodeInsightBundle.message("module.dependencies.scope.dialog.module.button", moduleName));
group.add(myProjectScope);
group.add(myModuleScope);
myProjectScope.setSelected(true);

4
platform/lang-impl/src/com/intellij/packageDependencies/FindDependencyUtil.java
View File

@@ -16,7 +16,7 @@
package com.intellij.packageDependencies;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.progress.util.ProgressIndicatorUtils;
@@ -114,7 +114,7 @@ public class FindDependencyUtil {
indicator.setFraction(((double)++count) / totalCount);
final VirtualFile virtualFile = psiFile.getVirtualFile();
if (virtualFile != null) {
indicator.setText(AnalysisScopeBundle.message("find.dependencies.progress.text", virtualFile.getPresentableUrl()));
indicator.setText(CodeInsightBundle.message("find.dependencies.progress.text", virtualFile.getPresentableUrl()));
}
}
return count;

4
platform/lang-impl/src/com/intellij/packageDependencies/actions/AnalyzeDependenciesAction.java
View File

@@ -17,9 +17,9 @@
package com.intellij.packageDependencies.actions;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.analysis.BaseAnalysisAction;
import com.intellij.analysis.BaseAnalysisActionDialog;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -32,7 +32,7 @@ public class AnalyzeDependenciesAction extends BaseAnalysisAction {
private AnalyzeDependenciesSettingPanel myPanel;
public AnalyzeDependenciesAction() {
super(AnalysisScopeBundle.lazyMessage("action.forward.dependency.analysis"), AnalysisScopeBundle.lazyMessage("action.analysis.noun"));
super(CodeInsightBundle.lazyMessage("action.forward.dependency.analysis"), CodeInsightBundle.lazyMessage("action.analysis.noun"));
}
@Override

6
platform/lang-impl/src/com/intellij/packageDependencies/actions/AnalyzeDependenciesHandler.java
View File

@@ -17,7 +17,7 @@
package com.intellij.packageDependencies.actions;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.openapi.project.Project;
import com.intellij.packageDependencies.DependenciesBuilder;
import com.intellij.packageDependencies.ForwardDependenciesBuilder;
@@ -48,11 +48,11 @@ public class AnalyzeDependenciesHandler extends DependenciesHandlerBase {
@Override
protected String getPanelDisplayName(final AnalysisScope scope) {
return AnalysisScopeBundle.message("package.dependencies.toolwindow.title", scope.getDisplayName());
return CodeInsightBundle.message("package.dependencies.toolwindow.title", scope.getDisplayName());
}
@Override
protected String getProgressTitle() {
return AnalysisScopeBundle.message("package.dependencies.progress.title");
return CodeInsightBundle.message("package.dependencies.progress.title");
}
}

10
platform/lang-impl/src/com/intellij/packageDependencies/actions/AnalyzeDependenciesOnSpecifiedTargetHandler.java
View File

@@ -16,7 +16,7 @@
package com.intellij.packageDependencies.actions;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.notification.NotificationGroup;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.ui.MessageType;
@@ -46,12 +46,12 @@ public class AnalyzeDependenciesOnSpecifiedTargetHandler extends DependenciesHan
@Override
protected String getProgressTitle() {
return AnalysisScopeBundle.message("package.dependencies.progress.title");
return CodeInsightBundle.message("package.dependencies.progress.title");
}
@Override
protected String getPanelDisplayName(AnalysisScope scope) {
return AnalysisScopeBundle.message("package.dependencies.on.toolwindow.title", scope.getDisplayName(), myTargetScope.getDisplayName());
return CodeInsightBundle.message("package.dependencies.on.toolwindow.title", scope.getDisplayName(), myTargetScope.getDisplayName());
}
@Override
@@ -65,10 +65,10 @@ public class AnalyzeDependenciesOnSpecifiedTargetHandler extends DependenciesHan
}
final String source = StringUtil.decapitalize(getPanelDisplayName(builders));
final String target = StringUtil.decapitalize(myTargetScope.getDisplayName());
String message = AnalysisScopeBundle.message("no.dependencies.found.message", source, target);
String message = CodeInsightBundle.message("no.dependencies.found.message", source, target);
if (DependencyVisitorFactory.VisitorOptions.fromSettings(myProject).skipImports()) {
message += " ";
message += AnalysisScopeBundle.message("dependencies.in.imports.message");
message += CodeInsightBundle.message("dependencies.in.imports.message");
}
NOTIFICATION_GROUP.createNotification(message, MessageType.INFO).notify(myProject);
return false;

4
platform/lang-impl/src/com/intellij/packageDependencies/actions/BackwardDependenciesAction.java
View File

@@ -17,9 +17,9 @@
package com.intellij.packageDependencies.actions;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.analysis.BaseAnalysisAction;
import com.intellij.analysis.BaseAnalysisActionDialog;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.ide.util.scopeChooser.ScopeChooserCombo;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Disposer;
@@ -34,7 +34,7 @@ public class BackwardDependenciesAction extends BaseAnalysisAction {
public BackwardDependenciesAction() {
super(AnalysisScopeBundle.lazyMessage("action.backward.dependency.analysis"), AnalysisScopeBundle.lazyMessage("action.analysis.noun"));
super(CodeInsightBundle.lazyMessage("action.backward.dependency.analysis"), CodeInsightBundle.lazyMessage("action.analysis.noun"));
}
@Override

6
platform/lang-impl/src/com/intellij/packageDependencies/actions/BackwardDependenciesHandler.java
View File

@@ -17,7 +17,7 @@
package com.intellij.packageDependencies.actions;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.openapi.project.Project;
import com.intellij.packageDependencies.BackwardDependenciesBuilder;
import com.intellij.packageDependencies.DependenciesBuilder;
@@ -44,12 +44,12 @@ public class BackwardDependenciesHandler extends DependenciesHandlerBase {
@Override
protected String getProgressTitle() {
return AnalysisScopeBundle.message("backward.dependencies.progress.text");
return CodeInsightBundle.message("backward.dependencies.progress.text");
}
@Override
protected String getPanelDisplayName(final AnalysisScope scope) {
return AnalysisScopeBundle.message("backward.dependencies.toolwindow.title", scope.getDisplayName());
return CodeInsightBundle.message("backward.dependencies.toolwindow.title", scope.getDisplayName());
}
@Override

38
platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java
View File

@@ -4,8 +4,8 @@ package com.intellij.packageDependencies.ui;
import com.intellij.CommonBundle;
import com.intellij.analysis.AnalysisScope;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.analysis.PerformAnalysisInBackgroundOption;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.hint.HintUtil;
import com.intellij.configurationStore.JbXmlOutputter;
import com.intellij.icons.AllIcons;
@@ -170,13 +170,13 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
traverseToLeaves(selectedNode, denyRules, allowRules);
}
if (denyRules.length() + allowRules.length() > 0) {
StatusBar.Info.set(AnalysisScopeBundle.message("status.bar.rule.violation.message",
StatusBar.Info.set(CodeInsightBundle.message("status.bar.rule.violation.message",
((denyRules.length() == 0 || allowRules.length() == 0) ? 1 : 2),
(denyRules.length() > 0 ? denyRules.toString() + (allowRules.length() > 0 ? "; " : "") : " ") +
(allowRules.length() > 0 ? allowRules.toString() : " ")), myProject);
}
else {
StatusBar.Info.set(AnalysisScopeBundle.message("status.bar.no.rule.violation.message"), myProject);
StatusBar.Info.set(CodeInsightBundle.message("status.bar.no.rule.violation.message"), myProject);
}
}
});
@@ -486,7 +486,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
private final class CloseAction extends AnAction implements DumbAware {
CloseAction() {
super(CommonBundle.lazyMessage("action.close"), AnalysisScopeBundle.lazyMessage("action.close.dependency.description"),
super(CommonBundle.lazyMessage("action.close"), CodeInsightBundle.lazyMessage("action.close.dependency.description"),
AllIcons.Actions.Cancel);
}
@@ -500,7 +500,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
private final class FlattenPackagesAction extends ToggleAction {
FlattenPackagesAction() {
super(AnalysisScopeBundle.lazyMessage("action.flatten.packages"), AnalysisScopeBundle.lazyMessage("action.flatten.packages"),
super(CodeInsightBundle.lazyMessage("action.flatten.packages"), CodeInsightBundle.lazyMessage("action.flatten.packages"),
PlatformIcons.FLATTEN_PACKAGES_ICON);
}
@@ -519,7 +519,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
private final class ShowFilesAction extends ToggleAction {
ShowFilesAction() {
super(AnalysisScopeBundle.lazyMessage("action.show.files"), AnalysisScopeBundle.lazyMessage("action.show.files.description"),
super(CodeInsightBundle.lazyMessage("action.show.files"), CodeInsightBundle.lazyMessage("action.show.files.description"),
AllIcons.FileTypes.Unknown);
}
@@ -541,7 +541,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
private final class ShowModulesAction extends ToggleAction {
ShowModulesAction() {
super(AnalysisScopeBundle.lazyMessage("action.show.modules"), AnalysisScopeBundle.lazyMessage("action.show.modules.description"),
super(CodeInsightBundle.lazyMessage("action.show.modules"), CodeInsightBundle.lazyMessage("action.show.modules.description"),
AllIcons.Actions.GroupByModule);
}
@@ -585,8 +585,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
private final class GroupByScopeTypeAction extends ToggleAction {
GroupByScopeTypeAction() {
super(AnalysisScopeBundle.lazyMessage("action.group.by.scope.type"),
AnalysisScopeBundle.lazyMessage("action.group.by.scope.type.description"), AllIcons.Actions.GroupByTestProduction);
super(CodeInsightBundle.lazyMessage("action.group.by.scope.type"),
CodeInsightBundle.lazyMessage("action.group.by.scope.type.description"), AllIcons.Actions.GroupByTestProduction);
}
@Override
@@ -605,8 +605,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
private final class FilterLegalsAction extends ToggleAction {
FilterLegalsAction() {
super(AnalysisScopeBundle.lazyMessage("action.show.illegals.only"),
AnalysisScopeBundle.lazyMessage("action.show.illegals.only.description"), AllIcons.General.Filter);
super(CodeInsightBundle.lazyMessage("action.show.illegals.only"),
CodeInsightBundle.lazyMessage("action.show.illegals.only.description"), AllIcons.General.Filter);
}
@Override
@@ -631,7 +631,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
private final class EditDependencyRulesAction extends AnAction {
EditDependencyRulesAction() {
super(AnalysisScopeBundle.lazyMessage("action.edit.rules"), AnalysisScopeBundle.lazyMessage("action.edit.rules.description"),
super(CodeInsightBundle.lazyMessage("action.edit.rules"), CodeInsightBundle.lazyMessage("action.edit.rules.description"),
AllIcons.General.Settings);
}
@@ -694,7 +694,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
private class RerunAction extends AnAction {
RerunAction(JComponent comp) {
super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), AllIcons.Actions.Rerun);
super(CommonBundle.message("action.rerun"), CodeInsightBundle.message("action.rerun.dependency"), AllIcons.Actions.Rerun);
registerCustomShortcutSet(CommonShortcuts.getRerun(), comp);
}
@@ -830,7 +830,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
} else {
builder = new ForwardDependenciesBuilder(myProject, scope, myTransitiveBorder);
}
ProgressManager.getInstance().runProcessWithProgressAsynchronously(myProject, AnalysisScopeBundle.message("package.dependencies.progress.title"),
ProgressManager.getInstance().runProcessWithProgressAsynchronously(myProject, CodeInsightBundle.message("package.dependencies.progress.title"),
() -> builder.analyze(), () -> {
myBuilders.add(builder);
myDependencies.putAll(builder.getDependencies());
@@ -865,8 +865,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
private class SelectInLeftTreeAction extends AnAction {
SelectInLeftTreeAction() {
super(AnalysisScopeBundle.lazyMessage("action.select.in.left.tree"),
AnalysisScopeBundle.lazyMessage("action.select.in.left.tree.description"), null);
super(CodeInsightBundle.lazyMessage("action.select.in.left.tree"),
CodeInsightBundle.lazyMessage("action.select.in.left.tree.description"), null);
}
@Override
@@ -906,8 +906,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
private class MarkAsIllegalAction extends AnAction {
MarkAsIllegalAction() {
super(AnalysisScopeBundle.lazyMessage("mark.dependency.illegal.text"),
AnalysisScopeBundle.lazyMessage("mark.dependency.illegal.text"), AllIcons.Actions.Lightning);
super(CodeInsightBundle.lazyMessage("mark.dependency.illegal.text"),
CodeInsightBundle.lazyMessage("mark.dependency.illegal.text"), AllIcons.Actions.Lightning);
}
@Override
@@ -955,7 +955,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide
rebuild();
} else {
Messages.showErrorDialog(DependenciesPanel.this, "Rule was not added.\n There is no direct dependency between \'" + leftPackageSet.getText() + "\' and \'" + rightPackageSet.getText() + "\'",
AnalysisScopeBundle.message("mark.dependency.illegal.text"));
CodeInsightBundle.message("mark.dependency.illegal.text"));
}
}
}

2
platform/lang-impl/src/com/intellij/packageDependencies/ui/DependencyConfigurable.form
View File

@@ -19,7 +19,7 @@
<forms defaultalign-horz="false"/>
</constraints>
<properties>
<text resource-bundle="messages/AnalysisScopeBundle" key="skip.import.statements.checkbox.title"/>
<text resource-bundle="messages/CodeInsightBundle" key="skip.import.statements.checkbox.title"/>
</properties>
</component>
<grid id="fb6d9" binding="myAllowPanel" layout-manager="BorderLayout" hgap="0" vgap="0">

12
platform/lang-impl/src/com/intellij/packageDependencies/ui/DependencyConfigurable.java
View File

@@ -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.packageDependencies.ui;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
import com.intellij.ide.util.scopeChooser.PackageSetChooserCombo;
import com.intellij.openapi.diagnostic.Logger;
@@ -34,10 +34,10 @@ public class DependencyConfigurable implements Configurable {
private TableView<DependencyRule> myDenyTable;
private TableView<DependencyRule> myAllowTable;
private final ColumnInfo<DependencyRule, NamedScope> DENY_USAGES_OF = new LeftColumn(AnalysisScopeBundle.message("dependency.configurable.deny.table.column1"));
private final ColumnInfo<DependencyRule, NamedScope> DENY_USAGES_IN = new RightColumn(AnalysisScopeBundle.message("dependency.configurable.deny.table.column2"));
private final ColumnInfo<DependencyRule, NamedScope> ALLOW_USAGES_OF = new LeftColumn(AnalysisScopeBundle.message("dependency.configurable.allow.table.column1"));
private final ColumnInfo<DependencyRule, NamedScope> ALLOW_USAGES_ONLY_IN = new RightColumn(AnalysisScopeBundle.message("dependency.configurable.allow.table.column2"));
private final ColumnInfo<DependencyRule, NamedScope> DENY_USAGES_OF = new LeftColumn(CodeInsightBundle.message("dependency.configurable.deny.table.column1"));
private final ColumnInfo<DependencyRule, NamedScope> DENY_USAGES_IN = new RightColumn(CodeInsightBundle.message("dependency.configurable.deny.table.column2"));
private final ColumnInfo<DependencyRule, NamedScope> ALLOW_USAGES_OF = new LeftColumn(CodeInsightBundle.message("dependency.configurable.allow.table.column1"));
private final ColumnInfo<DependencyRule, NamedScope> ALLOW_USAGES_ONLY_IN = new RightColumn(CodeInsightBundle.message("dependency.configurable.allow.table.column2"));
private JPanel myWholePanel;
private JPanel myDenyPanel;
@@ -51,7 +51,7 @@ public class DependencyConfigurable implements Configurable {
@Override
public String getDisplayName() {
return AnalysisScopeBundle.message("dependency.configurable.display.name");
return CodeInsightBundle.message("dependency.configurable.display.name");
}
@Override

8
platform/lang-impl/src/com/intellij/packageDependencies/ui/FileTreeModelBuilder.java
View File

@@ -16,7 +16,7 @@
package com.intellij.packageDependencies.ui;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.icons.AllIcons;
import com.intellij.ide.dnd.aware.DnDAwareTree;
import com.intellij.ide.projectView.impl.ModuleGroup;
@@ -157,7 +157,7 @@ public class FileTreeModelBuilder {
final TreeModel treeModel = new TreeModel(myRoot);
if (showProgress) {
final Task.Backgroundable backgroundable =
new Task.Backgroundable(project, AnalysisScopeBundle.message("package.dependencies.build.process.title")) {
new Task.Backgroundable(project, CodeInsightBundle.message("package.dependencies.build.process.title")) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
buildingRunnable.run();
@@ -217,7 +217,7 @@ public class FileTreeModelBuilder {
};
if (showProgress) {
ProgressManager.getInstance().runProcessWithProgressSynchronously(buildingRunnable, AnalysisScopeBundle
ProgressManager.getInstance().runProcessWithProgressSynchronously(buildingRunnable, CodeInsightBundle
.message("package.dependencies.build.process.title"), false, myProject);
}
else {
@@ -604,6 +604,6 @@ public class FileTreeModelBuilder {
}
public static String getScanningPackagesMessage() {
return AnalysisScopeBundle.message("package.dependencies.build.progress.text");
return CodeInsightBundle.message("package.dependencies.build.progress.text");
}
}

4
platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleGroupNode.java
View File

@@ -16,7 +16,7 @@
package com.intellij.packageDependencies.ui;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.ide.projectView.impl.ModuleGroup;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Comparing;
@@ -51,7 +51,7 @@ public class ModuleGroupNode extends PackageDependenciesNode {
}
public String toString() {
return myModuleGroup == null ? AnalysisScopeBundle.message("unknown.node.text") : myModuleGroup.toString();
return myModuleGroup == null ? CodeInsightBundle.message("unknown.node.text") : myModuleGroup.toString();
}
public String getModuleGroupName() {

4
platform/lang-impl/src/com/intellij/packageDependencies/ui/PackageDependenciesNode.java
View File

@@ -16,7 +16,7 @@
package com.intellij.packageDependencies.ui;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.navigation.NavigationUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
@@ -118,7 +118,7 @@ public class PackageDependenciesNode extends DefaultMutableTreeNode implements N
public String getPresentableFilesCount(){
final int filesCount = getContainingFiles();
return filesCount > 0 ? " (" + AnalysisScopeBundle.message("package.dependencies.node.items.count", filesCount) + ")" : "";
return filesCount > 0 ? " (" + CodeInsightBundle.message("package.dependencies.node.items.count", filesCount) + ")" : "";
}
@Override

4
platform/lang-impl/src/com/intellij/packageDependencies/ui/PanelProgressIndicator.java
View File

@@ -16,7 +16,7 @@
package com.intellij.packageDependencies.ui;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.openapi.progress.util.ProgressIndicatorBase;
import com.intellij.util.Consumer;
import com.intellij.util.concurrency.EdtExecutorService;
@@ -49,7 +49,7 @@ public class PanelProgressIndicator extends ProgressIndicatorBase {
public void stop() {
super.stop();
if (isCanceled()) {
JLabel label = new JLabel(AnalysisScopeBundle.message("usage.view.canceled"));
JLabel label = new JLabel(CodeInsightBundle.message("usage.view.canceled"));
label.setHorizontalAlignment(SwingConstants.CENTER);
myComponentUpdater.consume(label);
}

4
platform/lang-impl/src/com/intellij/packageDependencies/ui/UsagesPanel.java
View File

@@ -16,7 +16,7 @@
package com.intellij.packageDependencies.ui;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.DataProvider;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
@@ -83,7 +83,7 @@ public abstract class UsagesPanel extends JPanel implements Disposable, DataProv
}
private void setToCanceled() {
setToComponent(createLabel(AnalysisScopeBundle.message("usage.view.canceled")));
setToComponent(createLabel(CodeInsightBundle.message("usage.view.canceled")));
}
void setToComponent(final JComponent cmp) {

8
platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/FilePackageSetParserExtension.java
View File

@@ -16,7 +16,7 @@
package com.intellij.psi.search.scope.packageSet;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.lexer.Lexer;
import com.intellij.psi.TokenType;
import com.intellij.psi.search.scope.packageSet.lexer.ScopeTokenTypes;
@@ -62,7 +62,7 @@ public class FilePackageSetParserExtension implements PackageSetParserExtension
pattern.append("/");
}
else if (lexer.getTokenType() == ScopeTokenTypes.IDENTIFIER || lexer.getTokenType() == ScopeTokenTypes.INTEGER_LITERAL) {
if (wasIdentifier) error(lexer, AnalysisScopeBundle.message("error.package.set.token.expectations", getTokenText(lexer)));
if (wasIdentifier) error(lexer, CodeInsightBundle.message("error.package.set.token.expectations", getTokenText(lexer)));
wasIdentifier = lexer.getTokenType() == ScopeTokenTypes.IDENTIFIER;
pattern.append(getTokenText(lexer));
}
@@ -97,7 +97,7 @@ public class FilePackageSetParserExtension implements PackageSetParserExtension
}
if (pattern.length() == 0) {
error(lexer, AnalysisScopeBundle.message("error.package.set.pattern.expectations"));
error(lexer, CodeInsightBundle.message("error.package.set.pattern.expectations"));
}
return pattern.toString();
@@ -111,6 +111,6 @@ public class FilePackageSetParserExtension implements PackageSetParserExtension
private static void error(Lexer lexer, String message) throws ParsingException {
throw new ParsingException(
AnalysisScopeBundle.message("error.package.set.position.parsing.error", message, (lexer.getTokenStart() + 1)));
CodeInsightBundle.message("error.package.set.position.parsing.error", message, (lexer.getTokenStart() + 1)));
}
}

10
platform/lang-impl/src/com/intellij/psi/search/scope/packageSet/PackageSetFactoryImpl.java
View File

@@ -2,7 +2,7 @@
package com.intellij.psi.search.scope.packageSet;
import com.intellij.analysis.AnalysisScopeBundle;
import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.lexer.Lexer;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.psi.TokenType;
@@ -33,7 +33,7 @@ public class PackageSetFactoryImpl extends PackageSetFactory {
public PackageSet parse() throws ParsingException {
PackageSet set = parseUnion();
if (myLexer.getTokenType() != null) error(AnalysisScopeBundle.message("error.package.set.token.expectations", getTokenText()));
if (myLexer.getTokenType() != null) error(CodeInsightBundle.message("error.package.set.token.expectations", getTokenText()));
return set;
}
@@ -135,7 +135,7 @@ public class PackageSetFactoryImpl extends PackageSetFactory {
myLexer.advance();
}
if (pattern.length() == 0) {
error(AnalysisScopeBundle.message("error.package.set.pattern.expectations"));
error(CodeInsightBundle.message("error.package.set.pattern.expectations"));
}
return pattern.toString();
}
@@ -145,7 +145,7 @@ public class PackageSetFactoryImpl extends PackageSetFactory {
myLexer.advance();
PackageSet result = parseUnion();
if (myLexer.getTokenType() != ScopeTokenTypes.RPARENTH) error(AnalysisScopeBundle.message("error.package.set.rparen.expected"));
if (myLexer.getTokenType() != ScopeTokenTypes.RPARENTH) error(CodeInsightBundle.message("error.package.set.rparen.expected"));
myLexer.advance();
return result;
@@ -153,7 +153,7 @@ public class PackageSetFactoryImpl extends PackageSetFactory {
private void error(@NotNull String message) throws ParsingException {
throw new ParsingException(
AnalysisScopeBundle.message("error.package.set.position.parsing.error", message, (myLexer.getTokenStart() + 1)));
CodeInsightBundle.message("error.package.set.position.parsing.error", message, (myLexer.getTokenStart() + 1)));
}
}
}