mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-26 19:06:24 +07:00
LAB-62 get rid of static *Bundle usages: more fields with readable name
GitOrigin-RevId: a57e5216970e96c9e4ff5139ca8f5566835ca2e6
This commit is contained in:
committed by
intellij-monorepo-bot
parent
81be21f0e8
commit
8718df4f50
@@ -68,7 +68,7 @@ public class CallHierarchyBrowser extends CallHierarchyBrowserBase {
|
||||
PopupHandler.installPopupHandler(tree2, group, ActionPlaces.CALL_HIERARCHY_VIEW_POPUP, ActionManager.getInstance());
|
||||
baseOnThisMethodAction
|
||||
.registerCustomShortcutSet(ActionManager.getInstance().getAction(IdeActions.ACTION_CALL_HIERARCHY).getShortcutSet(), tree2);
|
||||
type2TreeMap.put(getCALLER_TYPE(), tree2);
|
||||
type2TreeMap.put(getCallerType(), tree2);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -96,7 +96,7 @@ public class CallHierarchyBrowser extends CallHierarchyBrowserBase {
|
||||
|
||||
@Override
|
||||
protected HierarchyTreeStructure createHierarchyTreeStructure(@NotNull final String typeName, @NotNull final PsiElement psiElement) {
|
||||
if (getCALLER_TYPE().equals(typeName)) {
|
||||
if (getCallerType().equals(typeName)) {
|
||||
return new CallerMethodsTreeStructure(myProject, (PsiMember)psiElement, getCurrentScopeType());
|
||||
}
|
||||
if (getCalleeType().equals(typeName)) {
|
||||
|
||||
@@ -49,6 +49,6 @@ public class JavaCallHierarchyProvider implements HierarchyProvider {
|
||||
|
||||
@Override
|
||||
public void browserActivated(@NotNull final HierarchyBrowser hierarchyBrowser) {
|
||||
((CallHierarchyBrowser)hierarchyBrowser).changeView(CallHierarchyBrowserBase.getCALLER_TYPE());
|
||||
((CallHierarchyBrowser)hierarchyBrowser).changeView(CallHierarchyBrowserBase.getCallerType());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ public class TypeHierarchyBrowser extends TypeHierarchyBrowserBase {
|
||||
actionGroup.add(new ChangeScopeAction() {
|
||||
@Override
|
||||
protected boolean isEnabled() {
|
||||
return !Comparing.strEqual(getCurrentViewType(), getSUPERTYPES_HIERARCHY_TYPE());
|
||||
return !Comparing.strEqual(getCurrentViewType(), getSupertypesHierarchyType());
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -87,7 +87,7 @@ public class TypeHierarchyBrowser extends TypeHierarchyBrowserBase {
|
||||
|
||||
@Override
|
||||
protected HierarchyTreeStructure createHierarchyTreeStructure(@NotNull final String typeName, @NotNull final PsiElement psiElement) {
|
||||
if (getSUPERTYPES_HIERARCHY_TYPE().equals(typeName)) {
|
||||
if (getSupertypesHierarchyType().equals(typeName)) {
|
||||
return new SupertypesHierarchyTreeStructure(myProject, (PsiClass)psiElement);
|
||||
}
|
||||
else if (getSubtypesHierarchyType().equals(typeName)) {
|
||||
|
||||
@@ -47,7 +47,7 @@ public class PackagePatternProvider extends PatternDialectProvider {
|
||||
else if (TreeModelBuilder.getTestName().equals(name)) {
|
||||
scope1 = PatternPackageSet.SCOPE_TEST;
|
||||
}
|
||||
else if (TreeModelBuilder.getLIBRARY_NAME().equals(name)) {
|
||||
else if (TreeModelBuilder.getLibraryName().equals(name)) {
|
||||
scope1 = PatternPackageSet.SCOPE_LIBRARY;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -104,7 +104,7 @@ public class TreeModelBuilder {
|
||||
if (myGroupByScopeType) {
|
||||
mySourceRoot = new GeneralGroupNode(getProductionName(), AllIcons.Modules.SourceFolder, project);
|
||||
myTestRoot = new GeneralGroupNode(getTestName(), AllIcons.Modules.TestSourceFolder, project);
|
||||
myLibsRoot = new GeneralGroupNode(getLIBRARY_NAME(), AllIcons.Nodes.PpLibFolder, project);
|
||||
myLibsRoot = new GeneralGroupNode(getLibraryName(), AllIcons.Nodes.PpLibFolder, project);
|
||||
myRoot.add(mySourceRoot);
|
||||
myRoot.add(myTestRoot);
|
||||
myRoot.add(myLibsRoot);
|
||||
@@ -471,7 +471,7 @@ public class TreeModelBuilder {
|
||||
return AnalysisScopeBundle.message("package.dependencies.test.node.text");
|
||||
}
|
||||
|
||||
public static String getLIBRARY_NAME() {
|
||||
public static String getLibraryName() {
|
||||
return AnalysisScopeBundle.message("package.dependencies.library.node.text");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,7 +21,7 @@ public class InlineFieldDialog extends InlineOptionsWithSearchSettingsDialog {
|
||||
myReferenceExpression = ref;
|
||||
myInvokedOnReference = myReferenceExpression != null;
|
||||
|
||||
setTitle(getREFACTORING_NAME());
|
||||
setTitle(getRefactoringName());
|
||||
myOccurrencesNumber = getNumberOfOccurrences(myField);
|
||||
init();
|
||||
}
|
||||
@@ -107,7 +107,7 @@ public class InlineFieldDialog extends InlineOptionsWithSearchSettingsDialog {
|
||||
return HelpID.INLINE_FIELD;
|
||||
}
|
||||
|
||||
public static String getREFACTORING_NAME() {
|
||||
public static String getRefactoringName() {
|
||||
return RefactoringBundle.message("inline.field.title");
|
||||
}
|
||||
}
|
||||
@@ -27,7 +27,7 @@ public class InlineMethodDialog extends InlineOptionsWithSearchSettingsDialog {
|
||||
myInvokedOnReference = ref != null;
|
||||
myOccurrencesNumber = getNumberOfOccurrences(method);
|
||||
|
||||
setTitle(getREFACTORING_NAME());
|
||||
setTitle(getRefactoringName());
|
||||
init();
|
||||
}
|
||||
|
||||
@@ -118,7 +118,7 @@ public class InlineMethodDialog extends InlineOptionsWithSearchSettingsDialog {
|
||||
JavaRefactoringSettings.getInstance().RENAME_SEARCH_FOR_TEXT_FOR_METHOD = searchInTextOccurrences;
|
||||
}
|
||||
|
||||
public static String getREFACTORING_NAME() {
|
||||
public static String getRefactoringName() {
|
||||
return RefactoringBundle.message("inline.method.title");
|
||||
}
|
||||
}
|
||||
@@ -74,8 +74,8 @@ public abstract class LocalToFieldHandler {
|
||||
classes.add((PsiClass)parent);
|
||||
}
|
||||
if (parent instanceof PsiFile && FileTypeUtils.isInServerPageFile(parent)) {
|
||||
String message = RefactoringBundle.message("error.not.supported.for.jsp", getREFACTORING_NAME());
|
||||
CommonRefactoringUtil.showErrorHint(myProject, editor, message, getREFACTORING_NAME(), HelpID.LOCAL_TO_FIELD);
|
||||
String message = RefactoringBundle.message("error.not.supported.for.jsp", getRefactoringName());
|
||||
CommonRefactoringUtil.showErrorHint(myProject, editor, message, getRefactoringName(), HelpID.LOCAL_TO_FIELD);
|
||||
return false;
|
||||
}
|
||||
if (parent instanceof PsiModifierListOwner &&((PsiModifierListOwner)parent).hasModifierProperty(PsiModifier.STATIC)) {
|
||||
@@ -132,7 +132,7 @@ public abstract class LocalToFieldHandler {
|
||||
final Runnable runnable =
|
||||
new IntroduceFieldRunnable(rebindNeeded1, local, aaClass, settings, isStatic, occurences);
|
||||
CommandProcessor.getInstance().executeCommand(myProject, () -> ApplicationManager.getApplication().runWriteAction(runnable),
|
||||
getREFACTORING_NAME(), null);
|
||||
getRefactoringName(), null);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -400,7 +400,7 @@ public abstract class LocalToFieldHandler {
|
||||
}
|
||||
}
|
||||
|
||||
private static String getREFACTORING_NAME() {
|
||||
private static String getRefactoringName() {
|
||||
return RefactoringBundle.message("convert.local.to.field.title");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,7 +33,7 @@ import java.util.List;
|
||||
|
||||
public class JavaPullUpHandler implements RefactoringActionHandler, PullUpDialog.Callback, ElementsHandler, ContextAwareActionHandler {
|
||||
/**
|
||||
* Use {code {@link #getREFACTORING_NAME()}} instead
|
||||
* Use {code {@link #getRefactoringName()}} instead
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String REFACTORING_NAME = "Pull Members Up";
|
||||
@@ -53,7 +53,7 @@ public class JavaPullUpHandler implements RefactoringActionHandler, PullUpDialog
|
||||
List<PsiElement> elements = getElements(editor, file, false);
|
||||
if (elements.isEmpty()) {
|
||||
String message = RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("the.caret.should.be.positioned.inside.a.class.to.pull.members.from"));
|
||||
CommonRefactoringUtil.showErrorHint(project, editor, message, getREFACTORING_NAME(), HelpID.MEMBERS_PULL_UP);
|
||||
CommonRefactoringUtil.showErrorHint(project, editor, message, getRefactoringName(), HelpID.MEMBERS_PULL_UP);
|
||||
}
|
||||
else {
|
||||
invoke(project, elements.toArray(PsiElement.EMPTY_ARRAY), dataContext);
|
||||
@@ -92,8 +92,8 @@ public class JavaPullUpHandler implements RefactoringActionHandler, PullUpDialog
|
||||
if (aClass == null) {
|
||||
String message =
|
||||
RefactoringBundle.getCannotRefactorMessage(RefactoringBundle.message("is.not.supported.in.the.current.context",
|
||||
getREFACTORING_NAME()));
|
||||
CommonRefactoringUtil.showErrorHint(project, editor, message, getREFACTORING_NAME(), HelpID.MEMBERS_PULL_UP);
|
||||
getRefactoringName()));
|
||||
CommonRefactoringUtil.showErrorHint(project, editor, message, getRefactoringName(), HelpID.MEMBERS_PULL_UP);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -106,7 +106,7 @@ public class JavaPullUpHandler implements RefactoringActionHandler, PullUpDialog
|
||||
}
|
||||
String message = RefactoringBundle.getCannotRefactorMessage(
|
||||
RefactoringBundle.message("class.does.not.have.base.classes.interfaces.in.current.project", aClass.getQualifiedName()));
|
||||
CommonRefactoringUtil.showErrorHint(project, editor, message, getREFACTORING_NAME(), HelpID.MEMBERS_PULL_UP);
|
||||
CommonRefactoringUtil.showErrorHint(project, editor, message, getRefactoringName(), HelpID.MEMBERS_PULL_UP);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -166,7 +166,7 @@ public class JavaPullUpHandler implements RefactoringActionHandler, PullUpDialog
|
||||
return elements.length == 1 && elements[0] instanceof PsiClass;
|
||||
}
|
||||
|
||||
public static String getREFACTORING_NAME() {
|
||||
public static String getRefactoringName() {
|
||||
return RefactoringBundle.message("pull.members.up.title");
|
||||
}
|
||||
}
|
||||
@@ -54,7 +54,7 @@ public class PullUpDialog extends PullUpDialogBase<MemberInfoStorage, MemberInfo
|
||||
}
|
||||
|
||||
public PullUpDialog(Project project, PsiClass aClass, List<PsiClass> superClasses, MemberInfoStorage memberInfoStorage, Callback callback) {
|
||||
super(project, aClass, superClasses, memberInfoStorage, JavaPullUpHandler.getREFACTORING_NAME());
|
||||
super(project, aClass, superClasses, memberInfoStorage, JavaPullUpHandler.getRefactoringName());
|
||||
myCallback = callback;
|
||||
|
||||
init();
|
||||
|
||||
@@ -128,7 +128,7 @@ public class MigrationProcessor extends BaseRefactoringProcessor {
|
||||
@Override
|
||||
protected boolean preprocessUsages(@NotNull Ref<UsageInfo[]> refUsages) {
|
||||
if (refUsages.get().length == 0) {
|
||||
Messages.showInfoMessage(myProject, RefactoringBundle.message("migration.no.usages.found.in.the.project"), getREFACTORING_NAME());
|
||||
Messages.showInfoMessage(myProject, RefactoringBundle.message("migration.no.usages.found.in.the.project"), getRefactoringName());
|
||||
return false;
|
||||
}
|
||||
setPreviewUsages(true);
|
||||
@@ -180,7 +180,7 @@ public class MigrationProcessor extends BaseRefactoringProcessor {
|
||||
@Override
|
||||
@NotNull
|
||||
protected String getCommandName() {
|
||||
return getREFACTORING_NAME();
|
||||
return getRefactoringName();
|
||||
}
|
||||
|
||||
static class MigrationUsageInfo extends UsageInfo {
|
||||
@@ -192,7 +192,7 @@ public class MigrationProcessor extends BaseRefactoringProcessor {
|
||||
}
|
||||
}
|
||||
|
||||
private static String getREFACTORING_NAME() {
|
||||
private static String getRefactoringName() {
|
||||
return RefactoringBundle.message("migration.title");
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -176,7 +176,7 @@ public abstract class AbstractJavaFormatterTest extends LightIdeaTestCase {
|
||||
catch (IncorrectOperationException e) {
|
||||
assertTrue(e.getLocalizedMessage(), false);
|
||||
}
|
||||
}), action == REFORMAT ? ReformatCodeProcessor.getCOMMAND_NAME() : "", "");
|
||||
}), action == REFORMAT ? ReformatCodeProcessor.getCommandName() : "", "");
|
||||
|
||||
return document.getText();
|
||||
}
|
||||
|
||||
+25
-25
@@ -57,126 +57,126 @@ class JavaPredefinedConfigurations {
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.methods.of.the.class"),
|
||||
"'_ReturnType? '_Method('_ParameterType '_Parameter*);",
|
||||
getCLASS_TYPE(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
getClassType(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.deprecated.methods"),
|
||||
"@Deprecated\n'_ReturnType '_Method('_ParameterType '_Parameter*);",
|
||||
getCLASS_TYPE(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
getClassType(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.fields.of.the.class"),
|
||||
"class '_Class { \n '_FieldType 'Field+ = '_Init?;\n}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.all.methods.of.the.class.within.hierarchy"),
|
||||
"class '_ { \n '_ReturnType 'Method+:* ('_ParameterType '_Parameter*);\n}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.all.fields.of.the.class"),
|
||||
"class '_Class { \n '_FieldType 'Field+:* = '_Init?;\n}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.instance.fields.of.the.class"),
|
||||
"class '_Class { \n @Modifier(\"Instance\") '_FieldType 'Field+ = '_Init?;\n}",
|
||||
getCLASS_TYPE(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
getClassType(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.packagelocal.fields.of.the.class"),
|
||||
"@Modifier(\"packageLocal\") '_FieldType 'Field = '_Init?;",
|
||||
getCLASS_TYPE(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
getClassType(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.constructors.of.the.class"),
|
||||
"'Class('_ParameterType '_Parameter*) {\n '_Statement*;\n}",
|
||||
getCLASS_TYPE(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
getClassType(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.classes"),
|
||||
"class 'Class:[script( \"!__context__.interface && !__context__.enum\" )] {}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.classes.interfaces.enums"),
|
||||
"class 'ClassInterfaceEnum {}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.direct.subclasses"),
|
||||
"class 'Class extends '_Parent {}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.implementors.of.interface.within.hierarchy"),
|
||||
"class 'Class implements '_Interface:* {}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.interfaces"),
|
||||
"interface 'Interface {}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.inner.classes"),
|
||||
"class '_ {\n class 'InnerClass+ {}\n}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.all.inner.classes.within.hierarchy"),
|
||||
"class '_Class {\n class 'InnerClass+:* {}\n}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.anonymous.classes"),
|
||||
"new 'AnonymousClass() {}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.class.implements.two.interfaces"),
|
||||
"class 'A implements '_Interface1:[regex( *java\\.lang\\.Cloneable )], '_Interface2:*java\\.io\\.Serializable {\n" +"}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.class.static.blocks"),
|
||||
"static {\n '_Statement*;\n}",
|
||||
getCLASS_TYPE(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
getClassType(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.class.instance.initialization.blocks"),
|
||||
"@Modifier(\"Instance\") {\n '_Statement*;\n}",
|
||||
getCLASS_TYPE(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
getClassType(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
),
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.class.any.initialization.blocks"),
|
||||
"{\n '_Statement*;\n}",
|
||||
getCLASS_TYPE(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
getClassType(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
),
|
||||
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.enums"),
|
||||
"enum 'Enum {}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.class.with.parameterless.constructors"),
|
||||
"class 'Class {\n '_Method{0,0}('_ParameterType '_Parameter+);\n}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.static.fields.without.final"),
|
||||
"static '_Type 'Variable+:[ script( \"!__context__.hasModifierProperty(\"final\")\" ) ] = '_Init?;",
|
||||
getCLASS_TYPE(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
getClassType(), StdFileTypes.JAVA, JavaStructuralSearchProfile.MEMBER_CONTEXT
|
||||
),
|
||||
|
||||
createSearchTemplateInfo(
|
||||
SSRBundle.message("predefined.configuration.interfaces.having.no.descendants"),
|
||||
"interface 'A:[script( \"com.intellij.psi.search.searches.ClassInheritorsSearch.search(__context__).findFirst() == null\" )] {}",
|
||||
getCLASS_TYPE()
|
||||
getClassType()
|
||||
),
|
||||
|
||||
// Generics
|
||||
@@ -388,7 +388,7 @@ class JavaPredefinedConfigurations {
|
||||
return SSRBundle.message("operators.category");
|
||||
}
|
||||
|
||||
private static String getCLASS_TYPE() {
|
||||
private static String getClassType() {
|
||||
return SSRBundle.message("class.category");
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ public interface HighlightInfoType {
|
||||
|
||||
HighlightInfoType MARKED_FOR_REMOVAL = new HighlightInfoTypeSeverityByKey(
|
||||
HighlightDisplayKey.findOrRegister(
|
||||
DeprecationUtil.FOR_REMOVAL_SHORT_NAME, DeprecationUtil.getFOR_REMOVAL_DISPLAY_NAME(), DeprecationUtil.FOR_REMOVAL_ID),
|
||||
DeprecationUtil.FOR_REMOVAL_SHORT_NAME, DeprecationUtil.getForRemovalDisplayName(), DeprecationUtil.FOR_REMOVAL_ID),
|
||||
CodeInsightColors.MARKED_FOR_REMOVAL_ATTRIBUTES);
|
||||
|
||||
HighlightSeverity SYMBOL_TYPE_SEVERITY = new HighlightSeverity("SYMBOL_TYPE_SEVERITY", HighlightSeverity.INFORMATION.myVal-2);
|
||||
|
||||
@@ -28,7 +28,7 @@ public class DeprecationUtil {
|
||||
return InspectionsBundle.message("inspection.deprecated.display.name");
|
||||
}
|
||||
|
||||
public static String getFOR_REMOVAL_DISPLAY_NAME() {
|
||||
public static String getForRemovalDisplayName() {
|
||||
return InspectionsBundle.message("inspection.marked.for.removal.display.name");
|
||||
}
|
||||
}
|
||||
@@ -101,7 +101,7 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel {
|
||||
//noinspection unchecked
|
||||
myLineSeparatorCombo.addItem(getWindowsString());
|
||||
//noinspection unchecked
|
||||
myLineSeparatorCombo.addItem(getMACINTOSH_STRING());
|
||||
myLineSeparatorCombo.addItem(getMacintoshString());
|
||||
addPanelToWatch(myPanel);
|
||||
|
||||
myRightMarginField.setDefaultValue(settings.getDefaultRightMargin());
|
||||
@@ -224,7 +224,7 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel {
|
||||
if (getUnixString().equals(myLineSeparatorCombo.getSelectedItem())) {
|
||||
return "\n";
|
||||
}
|
||||
if (getMACINTOSH_STRING().equals(myLineSeparatorCombo.getSelectedItem())) {
|
||||
if (getMacintoshString().equals(myLineSeparatorCombo.getSelectedItem())) {
|
||||
return "\r";
|
||||
}
|
||||
if (getWindowsString().equals(myLineSeparatorCombo.getSelectedItem())) {
|
||||
@@ -287,7 +287,7 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel {
|
||||
myLineSeparatorCombo.setSelectedItem(getWindowsString());
|
||||
}
|
||||
else if ("\r".equals(lineSeparator)) {
|
||||
myLineSeparatorCombo.setSelectedItem(getMACINTOSH_STRING());
|
||||
myLineSeparatorCombo.setSelectedItem(getMacintoshString());
|
||||
}
|
||||
else {
|
||||
myLineSeparatorCombo.setSelectedItem(getSystemDependantString());
|
||||
@@ -369,7 +369,7 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel {
|
||||
return ApplicationBundle.message("combobox.crlf.windows");
|
||||
}
|
||||
|
||||
private static String getMACINTOSH_STRING() {
|
||||
private static String getMacintoshString() {
|
||||
return ApplicationBundle.message("combobox.crlf.mac");
|
||||
}
|
||||
}
|
||||
|
||||
+2
-2
@@ -120,7 +120,7 @@ public class EditorOptionsPanel extends CompositeConfigurable<ErrorOptionsProvid
|
||||
myHighlightSettingsPanel.add(myErrorHighlightingPanel.getPanel(), BorderLayout.CENTER);
|
||||
|
||||
myRichCopyColorSchemeComboBox.setRenderer(SimpleListCellRenderer.create("", value ->
|
||||
RichCopySettings.ACTIVE_GLOBAL_SCHEME_MARKER.equals(value) ? getACTIVE_COLOR_SCHEME() :
|
||||
RichCopySettings.ACTIVE_GLOBAL_SCHEME_MARKER.equals(value) ? getActiveColorScheme() :
|
||||
EditorColorsScheme.DEFAULT_SCHEME_NAME.equals(value) ? EditorColorsScheme.DEFAULT_SCHEME_ALIAS : value));
|
||||
|
||||
initCaretStopComboBox(myWordBoundaryCaretStopComboBox, EditorCaretStopPolicyItem.WordBoundary.values());
|
||||
@@ -525,7 +525,7 @@ public class EditorOptionsPanel extends CompositeConfigurable<ErrorOptionsProvid
|
||||
return ApplicationBundle.message("combobox.strip.none");
|
||||
}
|
||||
|
||||
private static String getACTIVE_COLOR_SCHEME() {
|
||||
private static String getActiveColorScheme() {
|
||||
return ApplicationBundle.message("combobox.richcopy.color.scheme.active");
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -19,11 +19,11 @@ public class CodeCleanupCodeProcessor extends AbstractLayoutCodeProcessor {
|
||||
private SelectionModel mySelectionModel = null;
|
||||
|
||||
public CodeCleanupCodeProcessor(@NotNull AbstractLayoutCodeProcessor previousProcessor) {
|
||||
super(previousProcessor, COMMAND_NAME, getPROGRESS_TEXT());
|
||||
super(previousProcessor, COMMAND_NAME, getProgressText());
|
||||
}
|
||||
|
||||
public CodeCleanupCodeProcessor(@NotNull AbstractLayoutCodeProcessor previousProcessor, @NotNull SelectionModel selectionModel) {
|
||||
super(previousProcessor, COMMAND_NAME, getPROGRESS_TEXT());
|
||||
super(previousProcessor, COMMAND_NAME, getProgressText());
|
||||
mySelectionModel = selectionModel;
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ public class CodeCleanupCodeProcessor extends AbstractLayoutCodeProcessor {
|
||||
return false;
|
||||
}
|
||||
|
||||
public static String getPROGRESS_TEXT() {
|
||||
public static String getProgressText() {
|
||||
return CodeInsightBundle.message("process.cleanup.code");
|
||||
}
|
||||
}
|
||||
|
||||
+10
-10
@@ -32,45 +32,45 @@ public class ReformatCodeProcessor extends AbstractLayoutCodeProcessor {
|
||||
private SelectionModel mySelectionModel;
|
||||
|
||||
public ReformatCodeProcessor(Project project, boolean processChangedTextOnly) {
|
||||
super(project, getCOMMAND_NAME(), getProgressText(), processChangedTextOnly);
|
||||
super(project, getCommandName(), getProgressText(), processChangedTextOnly);
|
||||
}
|
||||
|
||||
public ReformatCodeProcessor(@NotNull PsiFile file, @NotNull SelectionModel selectionModel) {
|
||||
super(file.getProject(), file, getProgressText(), getCOMMAND_NAME(), false);
|
||||
super(file.getProject(), file, getProgressText(), getCommandName(), false);
|
||||
mySelectionModel = selectionModel;
|
||||
}
|
||||
|
||||
public ReformatCodeProcessor(AbstractLayoutCodeProcessor processor, @NotNull SelectionModel selectionModel) {
|
||||
super(processor, getCOMMAND_NAME(), getProgressText());
|
||||
super(processor, getCommandName(), getProgressText());
|
||||
mySelectionModel = selectionModel;
|
||||
}
|
||||
|
||||
public ReformatCodeProcessor(AbstractLayoutCodeProcessor processor, boolean processChangedTextOnly) {
|
||||
super(processor, getCOMMAND_NAME(), getProgressText());
|
||||
super(processor, getCommandName(), getProgressText());
|
||||
setProcessChangedTextOnly(processChangedTextOnly);
|
||||
}
|
||||
|
||||
public ReformatCodeProcessor(Project project, Module module, boolean processChangedTextOnly) {
|
||||
super(project, module, getCOMMAND_NAME(), getProgressText(), processChangedTextOnly);
|
||||
super(project, module, getCommandName(), getProgressText(), processChangedTextOnly);
|
||||
}
|
||||
|
||||
public ReformatCodeProcessor(Project project, PsiDirectory directory, boolean includeSubdirs, boolean processChangedTextOnly) {
|
||||
super(project, directory, includeSubdirs, getProgressText(), getCOMMAND_NAME(), processChangedTextOnly);
|
||||
super(project, directory, includeSubdirs, getProgressText(), getCommandName(), processChangedTextOnly);
|
||||
}
|
||||
|
||||
public ReformatCodeProcessor(Project project, PsiFile file, @Nullable TextRange range, boolean processChangedTextOnly) {
|
||||
super(project, file, getProgressText(), getCOMMAND_NAME(), processChangedTextOnly);
|
||||
super(project, file, getProgressText(), getCommandName(), processChangedTextOnly);
|
||||
if (range != null) {
|
||||
myRanges.add(range);
|
||||
}
|
||||
}
|
||||
|
||||
public ReformatCodeProcessor(@NotNull PsiFile file, boolean processChangedTextOnly) {
|
||||
super(file.getProject(), file, getProgressText(), getCOMMAND_NAME(), processChangedTextOnly);
|
||||
super(file.getProject(), file, getProgressText(), getCommandName(), processChangedTextOnly);
|
||||
}
|
||||
|
||||
public ReformatCodeProcessor(Project project, PsiFile[] files, @Nullable Runnable postRunnable, boolean processChangedTextOnly) {
|
||||
this(project, files, getCOMMAND_NAME(), postRunnable, processChangedTextOnly);
|
||||
this(project, files, getCommandName(), postRunnable, processChangedTextOnly);
|
||||
}
|
||||
|
||||
public ReformatCodeProcessor(Project project,
|
||||
@@ -175,7 +175,7 @@ public class ReformatCodeProcessor extends AbstractLayoutCodeProcessor {
|
||||
return CodeInsightBundle.message("reformat.progress.common.text");
|
||||
}
|
||||
|
||||
public static String getCOMMAND_NAME() {
|
||||
public static String getCommandName() {
|
||||
return CodeInsightBundle.message("process.reformat.code");
|
||||
}
|
||||
}
|
||||
+3
-3
@@ -205,7 +205,7 @@ public final class AllFileTemplatesConfigurable implements SearchableConfigurabl
|
||||
|
||||
final List<FileTemplateGroupDescriptorFactory> factories = FileTemplateGroupDescriptorFactory.EXTENSION_POINT_NAME.getExtensionList();
|
||||
if (!factories.isEmpty()) {
|
||||
myOtherTemplatesList = new FileTemplateTabAsTree(getOTHER_TITLE()) {
|
||||
myOtherTemplatesList = new FileTemplateTabAsTree(getOtherTitle()) {
|
||||
@Override
|
||||
public void onTemplateSelected() {
|
||||
onListSelectionChanged();
|
||||
@@ -445,7 +445,7 @@ public final class AllFileTemplatesConfigurable implements SearchableConfigurabl
|
||||
if (Comparing.strEqual(templateTabTitle, getCodeTitle())) {
|
||||
return true;
|
||||
}
|
||||
if (Comparing.strEqual(templateTabTitle, getOTHER_TITLE())) {
|
||||
if (Comparing.strEqual(templateTabTitle, getOtherTitle())) {
|
||||
return true;
|
||||
}
|
||||
if (Comparing.strEqual(templateTabTitle, getIncludesTitle())) {
|
||||
@@ -796,7 +796,7 @@ public final class AllFileTemplatesConfigurable implements SearchableConfigurabl
|
||||
return IdeBundle.message("tab.filetemplates.code");
|
||||
}
|
||||
|
||||
private static String getOTHER_TITLE() {
|
||||
private static String getOtherTitle() {
|
||||
return IdeBundle.message("tab.filetemplates.j2ee");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ public abstract class CallHierarchyBrowserBase extends HierarchyBrowserBaseEx {
|
||||
public static final String CALLEE_TYPE = "Callees of {0}";
|
||||
|
||||
/**
|
||||
* Use {code {@link #getCALLER_TYPE()}} instead
|
||||
* Use {code {@link #getCallerType()}} instead
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String CALLER_TYPE = "Callers of {0}";
|
||||
@@ -61,7 +61,7 @@ public abstract class CallHierarchyBrowserBase extends HierarchyBrowserBaseEx {
|
||||
protected void prependActions(@NotNull DefaultActionGroup actionGroup) {
|
||||
actionGroup.add(new ChangeViewTypeActionBase(IdeBundle.message("action.caller.methods.hierarchy"),
|
||||
IdeBundle.message("action.caller.methods.hierarchy"),
|
||||
AllIcons.Hierarchy.Supertypes, getCALLER_TYPE()));
|
||||
AllIcons.Hierarchy.Supertypes, getCallerType()));
|
||||
actionGroup.add(new ChangeViewTypeActionBase(IdeBundle.message("action.callee.methods.hierarchy"),
|
||||
IdeBundle.message("action.callee.methods.hierarchy"),
|
||||
AllIcons.Hierarchy.Subtypes, getCalleeType()));
|
||||
@@ -127,7 +127,7 @@ public abstract class CallHierarchyBrowserBase extends HierarchyBrowserBaseEx {
|
||||
}
|
||||
|
||||
@SuppressWarnings("UnresolvedPropertyKey")
|
||||
public static String getCALLER_TYPE() {
|
||||
public static String getCallerType() {
|
||||
return IdeBundle.message("title.hierarchy.callers.of");
|
||||
}
|
||||
}
|
||||
@@ -44,7 +44,7 @@ public abstract class TypeHierarchyBrowserBase extends HierarchyBrowserBaseEx {
|
||||
public static final String SUBTYPES_HIERARCHY_TYPE = "Subtypes of {0}";
|
||||
|
||||
/**
|
||||
* Use {code {@link #getSUPERTYPES_HIERARCHY_TYPE()}} instead
|
||||
* Use {code {@link #getSupertypesHierarchyType()}} instead
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String SUPERTYPES_HIERARCHY_TYPE = "Supertypes of {0}";
|
||||
@@ -78,7 +78,7 @@ public abstract class TypeHierarchyBrowserBase extends HierarchyBrowserBaseEx {
|
||||
PopupHandler.installPopupHandler(tree2, group, ActionPlaces.TYPE_HIERARCHY_VIEW_POPUP, ActionManager.getInstance());
|
||||
baseOnThisTypeAction
|
||||
.registerCustomShortcutSet(ActionManager.getInstance().getAction(IdeActions.ACTION_TYPE_HIERARCHY).getShortcutSet(), tree2);
|
||||
trees.put(getSUPERTYPES_HIERARCHY_TYPE(), tree2);
|
||||
trees.put(getSupertypesHierarchyType(), tree2);
|
||||
|
||||
final JTree tree3 = createTree(true);
|
||||
PopupHandler.installPopupHandler(tree3, group, ActionPlaces.TYPE_HIERARCHY_VIEW_POPUP, ActionManager.getInstance());
|
||||
@@ -199,7 +199,7 @@ public abstract class TypeHierarchyBrowserBase extends HierarchyBrowserBaseEx {
|
||||
}
|
||||
|
||||
@SuppressWarnings("UnresolvedPropertyKey")
|
||||
public static String getSUPERTYPES_HIERARCHY_TYPE() {
|
||||
public static String getSupertypesHierarchyType() {
|
||||
return IdeBundle.message("title.hierarchy.supertypes");
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -30,6 +30,6 @@ public final class ViewSupertypesHierarchyAction extends ChangeViewTypeActionBas
|
||||
|
||||
@Override
|
||||
protected final String getTypeName() {
|
||||
return TypeHierarchyBrowserBase.getSUPERTYPES_HIERARCHY_TYPE();
|
||||
return TypeHierarchyBrowserBase.getSupertypesHierarchyType();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ public class FormatterUtil {
|
||||
public static final String REFORMAT_BEFORE_COMMIT_COMMAND_NAME = "Reformat Code Before Commit";
|
||||
|
||||
public static final Collection<String> FORMATTER_ACTION_NAMES = Collections.unmodifiableCollection(ContainerUtil.newHashSet(
|
||||
ReformatCodeProcessor.getCOMMAND_NAME(), getReformatBeforeCommitCommandName()
|
||||
ReformatCodeProcessor.getCommandName(), getReformatBeforeCommitCommandName()
|
||||
));
|
||||
|
||||
private FormatterUtil() {
|
||||
|
||||
+1
-1
@@ -122,7 +122,7 @@ public class UsageContextCallHierarchyPanel extends UsageContextPanelBase {
|
||||
if (browser instanceof HierarchyBrowserBaseEx) {
|
||||
HierarchyBrowserBaseEx browserEx = (HierarchyBrowserBaseEx)browser;
|
||||
// do not steal focus when scrolling through nodes
|
||||
browserEx.changeView(CallHierarchyBrowserBase.getCALLER_TYPE(), false);
|
||||
browserEx.changeView(CallHierarchyBrowserBase.getCallerType(), false);
|
||||
}
|
||||
return browser;
|
||||
}
|
||||
|
||||
@@ -103,7 +103,7 @@ private fun onSuccess(threadId: Int, eventData: Any?, callback: Consumer<Submitt
|
||||
text.append('.').append("<br/>").append(DiagnosticBundle.message("error.report.gratitude"))
|
||||
val content = XmlStringUtil.wrapInHtml(text)
|
||||
ReportMessages.GROUP
|
||||
.createNotification(ReportMessages.getERROR_REPORT(), content, NotificationType.INFORMATION, NotificationListener.URL_OPENING_LISTENER)
|
||||
.createNotification(ReportMessages.getErrorReport(), content, NotificationType.INFORMATION, NotificationListener.URL_OPENING_LISTENER)
|
||||
.setImportant(false)
|
||||
.notify(project)
|
||||
}
|
||||
@@ -131,7 +131,7 @@ private fun onError(e: Exception, errorBean: ErrorBean, callback: Consumer<Submi
|
||||
}
|
||||
else {
|
||||
val message = DiagnosticBundle.message("error.report.posting.failed", e.message)
|
||||
val result = MessageDialogBuilder.yesNo(ReportMessages.getERROR_REPORT(), message).project(project).show()
|
||||
val result = MessageDialogBuilder.yesNo(ReportMessages.getErrorReport(), message).project(project).show()
|
||||
if (result != Messages.YES || !submit(errorBean, callback, parentComponent, project)) {
|
||||
callback.consume(SubmittedReportInfo(SubmittedReportInfo.SubmissionStatus.FAILED))
|
||||
}
|
||||
|
||||
@@ -24,14 +24,14 @@ import com.intellij.notification.NotificationGroup;
|
||||
|
||||
public class ReportMessages {
|
||||
/**
|
||||
* Use {code {@link #getERROR_REPORT()}} instead
|
||||
* Use {code {@link #getErrorReport()}} instead
|
||||
*/
|
||||
@Deprecated
|
||||
public static final String ERROR_REPORT = "Error Report";
|
||||
|
||||
public static String getERROR_REPORT() {
|
||||
public static String getErrorReport() {
|
||||
return DiagnosticBundle.message("error.report.title");
|
||||
}
|
||||
|
||||
public static final NotificationGroup GROUP = new NotificationGroup(getERROR_REPORT(), NotificationDisplayType.BALLOON, false);
|
||||
public static final NotificationGroup GROUP = new NotificationGroup(getErrorReport(), NotificationDisplayType.BALLOON, false);
|
||||
}
|
||||
|
||||
@@ -372,7 +372,7 @@ public class RecentLocationsAction extends DumbAwareAction {
|
||||
popup.closeOk(null);
|
||||
}
|
||||
|
||||
static String getEMPTY_FILE_TEXT() {
|
||||
static String getEmptyFileText() {
|
||||
return IdeBundle.message("recent.locations.popup.empty.file.text");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,7 +3,7 @@ package com.intellij.ide.actions
|
||||
|
||||
import com.intellij.codeInsight.breadcrumbs.FileBreadcrumbsCollector
|
||||
import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerEx
|
||||
import com.intellij.ide.actions.RecentLocationsAction.getEMPTY_FILE_TEXT
|
||||
import com.intellij.ide.actions.RecentLocationsAction.getEmptyFileText
|
||||
import com.intellij.ide.ui.UISettings
|
||||
import com.intellij.lang.annotation.HighlightSeverity
|
||||
import com.intellij.openapi.editor.*
|
||||
@@ -131,7 +131,7 @@ data class RecentLocationsDataModel(val project: Project, val editorsToRelease:
|
||||
val actualTextRange = getTrimmedRange(fileDocument, lineNumber)
|
||||
var documentText = fileDocument.getText(actualTextRange)
|
||||
if (actualTextRange.isEmpty) {
|
||||
documentText = getEMPTY_FILE_TEXT()
|
||||
documentText = getEmptyFileText()
|
||||
}
|
||||
|
||||
val editorFactory = EditorFactory.getInstance()
|
||||
|
||||
@@ -128,9 +128,9 @@ class RecentLocationsRenderer extends ColoredListCellRenderer<RecentLocationItem
|
||||
editor.setBackgroundColor(getBackgroundColor(colorsScheme, selected));
|
||||
editor.setBorder(JBUI.Borders.empty(0, 4, 6, 0));
|
||||
|
||||
if (RecentLocationsAction.getEMPTY_FILE_TEXT().equals(editor.getDocument().getText())) {
|
||||
if (RecentLocationsAction.getEmptyFileText().equals(editor.getDocument().getText())) {
|
||||
editor.getMarkupModel().addRangeHighlighter(0,
|
||||
RecentLocationsAction.getEMPTY_FILE_TEXT().length(),
|
||||
RecentLocationsAction.getEmptyFileText().length(),
|
||||
HighlighterLayer.SYNTAX,
|
||||
createEmptyTextForegroundTextAttributes(colorsScheme),
|
||||
HighlighterTargetArea.EXACT_RANGE);
|
||||
|
||||
@@ -18,7 +18,7 @@ import org.jetbrains.annotations.Nullable;
|
||||
*/
|
||||
final class ToggleFullScreenAction extends DumbAwareAction {
|
||||
private static class Holder {
|
||||
private static String getTEXT_ENTER_FULL_SCREEN() {
|
||||
private static String getTextEnterFullScreen() {
|
||||
return ActionsBundle.message("action.ToggleFullScreen.text.enter");
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ final class ToggleFullScreenAction extends DumbAwareAction {
|
||||
p.setEnabled(isApplicable);
|
||||
|
||||
if (isApplicable) {
|
||||
p.setText(frame.isInFullScreen() ? Holder.getTEXT_EXIT_FULL_SCREEN() : Holder.getTEXT_ENTER_FULL_SCREEN());
|
||||
p.setText(frame.isInFullScreen() ? Holder.getTEXT_EXIT_FULL_SCREEN() : Holder.getTextEnterFullScreen());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -52,13 +52,13 @@ public class LightEditUtil {
|
||||
static boolean confirmClose(@NotNull String message,
|
||||
@NotNull String title,
|
||||
@NotNull Runnable saveRunnable) {
|
||||
final String[] options = {getCLOSE_SAVE(), getCLOSE_DISCARD(), getCLOSE_CANCEL()};
|
||||
final String[] options = {getCloseSave(), getCLOSE_DISCARD(), getCLOSE_CANCEL()};
|
||||
int result = Messages.showDialog(getProject(), message, title, options, 0, Messages.getWarningIcon());
|
||||
if (result >= 0) {
|
||||
if (getCLOSE_CANCEL().equals(options[result])) {
|
||||
return false;
|
||||
}
|
||||
else if (getCLOSE_SAVE().equals(options[result])) {
|
||||
else if (getCloseSave().equals(options[result])) {
|
||||
saveRunnable.run();
|
||||
}
|
||||
return true;
|
||||
@@ -90,7 +90,7 @@ public class LightEditUtil {
|
||||
.map(fileType -> fileType.getDefaultExtension()).sorted().distinct().collect(Collectors.toList()));
|
||||
}
|
||||
|
||||
private static String getCLOSE_SAVE() {
|
||||
private static String getCloseSave() {
|
||||
return ApplicationBundle.message("light.edit.close.save");
|
||||
}
|
||||
|
||||
|
||||
@@ -65,7 +65,7 @@ public class GitResetDialog extends DialogWrapper {
|
||||
setOKButtonText(GitBundle.getString("reset.button"));
|
||||
myResetTypeComboBox.addItem(getMixed());
|
||||
myResetTypeComboBox.addItem(getSoft());
|
||||
myResetTypeComboBox.addItem(getHARD());
|
||||
myResetTypeComboBox.addItem(getHard());
|
||||
myResetTypeComboBox.setSelectedItem(getMixed());
|
||||
GitUIUtil.setupRootChooser(project, roots, defaultRoot, myGitRootComboBox, myCurrentBranchLabel);
|
||||
myGitReferenceValidator = new GitReferenceValidator(myProject, myGitRootComboBox, myCommitTextField, myValidateButton,
|
||||
@@ -100,7 +100,7 @@ public class GitResetDialog extends DialogWrapper {
|
||||
if (getSoft().equals(type)) {
|
||||
handler.addParameters("--soft");
|
||||
}
|
||||
else if (getHARD().equals(type)) {
|
||||
else if (getHard().equals(type)) {
|
||||
handler.addParameters("--hard");
|
||||
}
|
||||
else if (getMixed().equals(type)) {
|
||||
@@ -162,7 +162,7 @@ public class GitResetDialog extends DialogWrapper {
|
||||
/**
|
||||
* The --hard reset type
|
||||
*/
|
||||
static String getHARD() {
|
||||
static String getHard() {
|
||||
return GitBundle.getString("reset.type.hard");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -79,7 +79,7 @@ public class SelectBranchPopup {
|
||||
|
||||
addIfNotNull(items, configuration.getTrunk());
|
||||
items.addAll(configuration.getBranchLocations());
|
||||
items.add(getCONFIGURE_MESSAGE());
|
||||
items.add(getConfigureMessage());
|
||||
|
||||
BranchBasesPopupStep step = new BranchBasesPopupStep(project, vcsRoot, configuration, callback, items, title, component);
|
||||
step.showPopupAt(JBPopupFactory.getInstance().createListPopup(step));
|
||||
@@ -114,7 +114,7 @@ public class SelectBranchPopup {
|
||||
|
||||
@Override
|
||||
public ListSeparator getSeparatorAbove(Object value) {
|
||||
return getCONFIGURE_MESSAGE().equals(value) ? new ListSeparator("") : null;
|
||||
return getConfigureMessage().equals(value) ? new ListSeparator("") : null;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@@ -131,7 +131,7 @@ public class SelectBranchPopup {
|
||||
|
||||
@Override
|
||||
public PopupStep onChosen(Object selectedValue, boolean finalChoice) {
|
||||
if (getCONFIGURE_MESSAGE().equals(selectedValue)) {
|
||||
if (getConfigureMessage().equals(selectedValue)) {
|
||||
return doFinalStep(() -> BranchConfigurationDialog.configureBranches(myProject, myVcsRoot));
|
||||
}
|
||||
|
||||
@@ -242,7 +242,7 @@ public class SelectBranchPopup {
|
||||
}
|
||||
}
|
||||
|
||||
private static String getCONFIGURE_MESSAGE() {
|
||||
private static String getConfigureMessage() {
|
||||
return SvnBundle.message("configure.branches.item");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -54,7 +54,7 @@ public class PyTypeHierarchyBrowser extends TypeHierarchyBrowserBase {
|
||||
@Override
|
||||
@Nullable
|
||||
protected HierarchyTreeStructure createHierarchyTreeStructure(@NotNull String typeName, @NotNull PsiElement psiElement) {
|
||||
if (getSUPERTYPES_HIERARCHY_TYPE().equals(typeName)) {
|
||||
if (getSupertypesHierarchyType().equals(typeName)) {
|
||||
return new PySuperTypesHierarchyTreeStructure((PyClass)psiElement);
|
||||
}
|
||||
else if (getSubtypesHierarchyType().equals(typeName)) {
|
||||
|
||||
@@ -65,7 +65,7 @@ public class PyCallHierarchyBrowser extends CallHierarchyBrowserBase {
|
||||
final JTree callerTree = createHierarchyTree(group);
|
||||
final JTree calleeTree = createHierarchyTree(group);
|
||||
|
||||
type2TreeMap.put(getCALLER_TYPE(), callerTree);
|
||||
type2TreeMap.put(getCallerType(), callerTree);
|
||||
type2TreeMap.put(getCalleeType(), calleeTree);
|
||||
}
|
||||
|
||||
@@ -83,7 +83,7 @@ public class PyCallHierarchyBrowser extends CallHierarchyBrowserBase {
|
||||
@Nullable
|
||||
@Override
|
||||
protected HierarchyTreeStructure createHierarchyTreeStructure(@NotNull String typeName, @NotNull PsiElement psiElement) {
|
||||
if (getCALLER_TYPE().equals(typeName)) {
|
||||
if (getCallerType().equals(typeName)) {
|
||||
return new PyCallerFunctionTreeStructure(myProject, psiElement, getCurrentScopeType());
|
||||
}
|
||||
else if (getCalleeType().equals(typeName)) {
|
||||
|
||||
@@ -71,6 +71,6 @@ public class PyCallHierarchyProvider implements HierarchyProvider {
|
||||
|
||||
@Override
|
||||
public void browserActivated(@NotNull HierarchyBrowser hierarchyBrowser) {
|
||||
((PyCallHierarchyBrowser)hierarchyBrowser).changeView(CallHierarchyBrowserBase.getCALLER_TYPE());
|
||||
((PyCallHierarchyBrowser)hierarchyBrowser).changeView(CallHierarchyBrowserBase.getCallerType());
|
||||
}
|
||||
}
|
||||
|
||||
+3
-3
@@ -74,7 +74,7 @@ public class PyConvertCollectionLiteralIntentionTest extends PyIntentionTestCase
|
||||
|
||||
// PY-9419
|
||||
public void testConvertListToSet() {
|
||||
doIntentionTest(getCONVERT_LIST_TO_SET());
|
||||
doIntentionTest(getConvertListToSet());
|
||||
}
|
||||
|
||||
// PY-9419
|
||||
@@ -139,7 +139,7 @@ public class PyConvertCollectionLiteralIntentionTest extends PyIntentionTestCase
|
||||
|
||||
// PY-19399
|
||||
public void testCannotConvertEmptyListToSet() {
|
||||
doNegativeTest(getCONVERT_LIST_TO_SET());
|
||||
doNegativeTest(getConvertListToSet());
|
||||
}
|
||||
|
||||
private static String getConvertTupleToList() {
|
||||
@@ -154,7 +154,7 @@ public class PyConvertCollectionLiteralIntentionTest extends PyIntentionTestCase
|
||||
return PyBundle.message("INTN.convert.collection.literal.text", "list", "tuple");
|
||||
}
|
||||
|
||||
private static String getCONVERT_LIST_TO_SET() {
|
||||
private static String getConvertListToSet() {
|
||||
return PyBundle.message("INTN.convert.collection.literal.text", "list", "set");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user