MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

LAB-62 get rid of static *Bundle usages: more fields with better names

Browse Source 
GitOrigin-RevId: 7f8d93704b415e3eca55479936300cbfb2dd2cd8
This commit is contained in:
Dmitry.Krasilschikov
2020-01-01 16:10:09 +00:00
committed by intellij-monorepo-bot
parent 1e099bed94
commit 8fd0bcff95
24 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java
+1 -1
View File
@@ -212,7 +212,7 @@ public class JdkChooserPanel extends JPanel {
}
updateListModel(allJdks, knownJdks);
myLoadingDecorator.stopLoading();
myList.getEmptyText().setText(StatusText.getDEFAULT_EMPTY_TEXT());
myList.getEmptyText().setText(StatusText.getDefaultEmptyText());
}, ModalityState.any());
});
} else {
java/java-analysis-impl/src/com/intellij/codeInspection/testOnly/TestOnlyInspection.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class TestOnlyInspection extends AbstractBaseJavaLocalInspectionTool {
@Override
@NotNull
public String getGroupDisplayName() {
return getGENERAL_GROUP_NAME();
return getGeneralGroupName();
}
@Override
java/java-impl/src/com/intellij/application/options/JavaDocFormattingPanel.java
+6 -6
View File
@@ -81,9 +81,9 @@ public class JavaDocFormattingPanel extends OptionTreeWithPreviewPanel {
@Override
protected void initTables() {
initCustomOptions(getALIGNMENT_GROUP());
initCustomOptions(getBLANK_LINES_GROUP());
initCustomOptions(getINVALID_TAGS_GROUP());
initCustomOptions(getAlignmentGroup());
initCustomOptions(getBlankLinesGroup());
initCustomOptions(getInvalidTagsGroup());
initBooleanField("WRAP_COMMENTS", ApplicationBundle.message("checkbox.wrap.at.right.margin"), getOtherGroup());
initCustomOptions(getOtherGroup());
}
@@ -185,15 +185,15 @@ public class JavaDocFormattingPanel extends OptionTreeWithPreviewPanel {
return ApplicationBundle.message("group.javadoc.other");
}
public static String getINVALID_TAGS_GROUP() {
public static String getInvalidTagsGroup() {
return ApplicationBundle.message("group.javadoc.invalid.tags");
}
public static String getBLANK_LINES_GROUP() {
public static String getBlankLinesGroup() {
return ApplicationBundle.message("group.javadoc.blank.lines");
}
public static String getALIGNMENT_GROUP() {
public static String getAlignmentGroup() {
return ApplicationBundle.message("group.javadoc.alignment");
}
}
java/java-impl/src/com/intellij/codeInspection/defaultFileTemplateUsage/DefaultFileTemplateUsageInspection.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class DefaultFileTemplateUsageInspection extends AbstractBaseJavaLocalIns
@Override
@NotNull
public String getGroupDisplayName() {
return getGENERAL_GROUP_NAME();
return getGeneralGroupName();
}
@Override
java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
+9 -9
View File
@@ -225,33 +225,33 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett
else if (settingsType == SettingsType.LANGUAGE_SPECIFIC) {
consumer.showCustomOption(JavaCodeStyleSettings.class, "JD_ALIGN_PARAM_COMMENTS",
ApplicationBundle.message("checkbox.align.parameter.descriptions"),
getALIGNMENT_GROUP());
getAlignmentGroup());
consumer.showCustomOption(JavaCodeStyleSettings.class, "JD_ALIGN_EXCEPTION_COMMENTS",
ApplicationBundle.message("checkbox.align.thrown.exception.descriptions"),
getALIGNMENT_GROUP());
getAlignmentGroup());
consumer.showCustomOption(JavaCodeStyleSettings.class, "JD_ADD_BLANK_AFTER_DESCRIPTION",
ApplicationBundle.message("checkbox.after.description"),
getBLANK_LINES_GROUP());
getBlankLinesGroup());
consumer.showCustomOption(JavaCodeStyleSettings.class, "JD_ADD_BLANK_AFTER_PARM_COMMENTS",
ApplicationBundle.message("checkbox.after.parameter.descriptions"),
getBLANK_LINES_GROUP());
getBlankLinesGroup());
consumer.showCustomOption(JavaCodeStyleSettings.class, "JD_ADD_BLANK_AFTER_RETURN",
ApplicationBundle.message("checkbox.after.return.tag"),
getBLANK_LINES_GROUP());
getBlankLinesGroup());
consumer.showCustomOption(JavaCodeStyleSettings.class, "JD_KEEP_INVALID_TAGS",
ApplicationBundle.message("checkbox.keep.invalid.tags"),
getINVALID_TAGS_GROUP());
getInvalidTagsGroup());
consumer.showCustomOption(JavaCodeStyleSettings.class, "JD_KEEP_EMPTY_PARAMETER",
ApplicationBundle.message("checkbox.keep.empty.param.tags"),
getINVALID_TAGS_GROUP());
getInvalidTagsGroup());
consumer.showCustomOption(JavaCodeStyleSettings.class, "JD_KEEP_EMPTY_RETURN",
ApplicationBundle.message("checkbox.keep.empty.return.tags"),
getINVALID_TAGS_GROUP());
getInvalidTagsGroup());
consumer.showCustomOption(JavaCodeStyleSettings.class, "JD_KEEP_EMPTY_EXCEPTION",
ApplicationBundle.message("checkbox.keep.empty.throws.tags"),
getINVALID_TAGS_GROUP());
getInvalidTagsGroup());
consumer.showCustomOption(JavaCodeStyleSettings.class, "JD_LEADING_ASTERISKS_ARE_ENABLED",
ApplicationBundle.message("checkbox.enable.leading.asterisks"),
platform/analysis-api/src/com/intellij/codeInspection/InspectionEP.java
+1 -1
View File
@@ -131,7 +131,7 @@ public class InspectionEP extends LanguageExtensionPoint<InspectionProfileEntry>
String name = getGroupDisplayName();
if (name == null) return null;
if (groupPath == null) {
return new String[]{name.isEmpty() ? InspectionProfileEntry.getGENERAL_GROUP_NAME() : name};
return new String[]{name.isEmpty() ? InspectionProfileEntry.getGeneralGroupName() : name};
}
return ArrayUtil.append(groupPath.split(","), name);
}
platform/analysis-api/src/com/intellij/codeInspection/InspectionProfileEntry.java
+2 -2
View File
@@ -253,7 +253,7 @@ public abstract class InspectionProfileEntry implements BatchSuppressableTool {
public String[] getGroupPath() {
String groupDisplayName = getGroupDisplayName();
if (groupDisplayName.isEmpty()) {
groupDisplayName = getGENERAL_GROUP_NAME();
groupDisplayName = getGeneralGroupName();
}
return new String[]{groupDisplayName};
}
@@ -488,7 +488,7 @@ public abstract class InspectionProfileEntry implements BatchSuppressableTool {
return null;
}
public static String getGENERAL_GROUP_NAME() {
public static String getGeneralGroupName() {
return InspectionsBundle.message("inspection.general.tools.group.name");
}
}
platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/DefaultHighlightVisitorBasedInspection.java
+1 -1
View File
@@ -122,7 +122,7 @@ public abstract class DefaultHighlightVisitorBasedInspection extends GlobalSimpl
@NotNull
@Override
public String getGroupDisplayName() {
return getGENERAL_GROUP_NAME();
return getGeneralGroupName();
}
private static class MyPsiElementVisitor extends PsiElementVisitor {
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
+1 -1
View File
@@ -232,7 +232,7 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode
public void reloadModel(boolean userForcedRefresh) {
fireUpdateStarted();
myUpdating.set(true);
myTable.getEmptyText().setText(StatusText.getDEFAULT_EMPTY_TEXT());
myTable.getEmptyText().setText(StatusText.getDefaultEmptyText());
JBLoadingPanel loadingPanel = getLoadingPanel();
loadingPanel.startLoading();
platform/lang-impl/src/com/intellij/codeInspection/ex/Descriptor.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class Descriptor {
InspectionToolWrapper tool = state.getTool();
myText = tool.getDisplayName();
final String[] groupPath = tool.getGroupPath();
myGroup = groupPath.length == 0 ? new String[]{InspectionProfileEntry.getGENERAL_GROUP_NAME()} : groupPath;
myGroup = groupPath.length == 0 ? new String[]{InspectionProfileEntry.getGeneralGroupName()} : groupPath;
myKey = HighlightDisplayKey.find(tool.getShortName());
myScopeName = state.getScopeName();
myScope = state.getScope(project);
platform/lang-impl/src/com/intellij/ide/actions/SearchEverywhereAction.java
+1 -1
View File
@@ -1388,7 +1388,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
finally {
if (!isCanceled()) {
//noinspection SSBasedInspection
SwingUtilities.invokeLater(() -> myList.getEmptyText().setText(StatusText.getDEFAULT_EMPTY_TEXT()));
SwingUtilities.invokeLater(() -> myList.getEmptyText().setText(StatusText.getDefaultEmptyText()));
updatePopup();
}
if (!myDone.isProcessed()) {
platform/lang-impl/src/com/intellij/webcore/packaging/InstalledPackagesPanel.java
+1 -1
View File
@@ -402,7 +402,7 @@ public class InstalledPackagesPanel extends JPanel {
private void onUpdateFinished() {
myPackagesTable.setPaintBusy(!myCurrentlyInstalling.isEmpty());
myPackagesTable.getEmptyText().setText(StatusText.getDEFAULT_EMPTY_TEXT());
myPackagesTable.getEmptyText().setText(StatusText.getDefaultEmptyText());
updateUninstallUpgrade();
// Action button presentations won't be updated if no events occur (e.g. mouse isn't moving, keys aren't being pressed).
// In that case emulating activity will help:
platform/platform-api/src/com/intellij/util/ui/StatusText.java
+3 -3
View File
@@ -21,7 +21,7 @@ import java.util.List;
public abstract class StatusText {
public static final SimpleTextAttributes DEFAULT_ATTRIBUTES = SimpleTextAttributes.GRAYED_ATTRIBUTES;
/**
* Use {code {@link #getDEFAULT_EMPTY_TEXT()}} instead
* Use {code {@link #getDefaultEmptyText()}} instead
*/
@Deprecated
public static final String DEFAULT_EMPTY_TEXT = "Nothing to show";
@@ -87,7 +87,7 @@ public abstract class StatusText {
myComponent.setOpaque(false);
myComponent.setFont(UIUtil.getLabelFont());
setText(getDEFAULT_EMPTY_TEXT(), DEFAULT_ATTRIBUTES);
setText(getDefaultEmptyText(), DEFAULT_ATTRIBUTES);
myIsDefaultText = true;
mySecondaryComponent.setOpaque(false);
@@ -339,7 +339,7 @@ public abstract class StatusText {
return myVerticalFlow;
}
public static String getDEFAULT_EMPTY_TEXT() {
public static String getDefaultEmptyText() {
return UIBundle.message("message.nothingToShow");
}
}
platform/platform-impl/src/com/intellij/ide/actions/Switcher.java
+2 -2
View File
@@ -1369,8 +1369,8 @@ public final class Switcher extends AnAction implements DumbAware {
myComponent.files.getEmptyText().setText("Press 'Enter' to search in Project");
}
else {
myComponent.files.getEmptyText().setText(StatusText.getDEFAULT_EMPTY_TEXT());
myComponent.toolWindows.getEmptyText().setText(StatusText.getDEFAULT_EMPTY_TEXT());
myComponent.files.getEmptyText().setText(StatusText.getDefaultEmptyText());
myComponent.toolWindows.getEmptyText().setText(StatusText.getDefaultEmptyText());
}
refreshSelection();
}
platform/platform-impl/src/com/intellij/ide/actions/ToggleFullScreenAction.java
+2 -2
View File
@@ -22,7 +22,7 @@ final class ToggleFullScreenAction extends DumbAwareAction {
return ActionsBundle.message("action.ToggleFullScreen.text.enter");
}
private static String getTEXT_EXIT_FULL_SCREEN() {
private static String getTextExitFullScreen() {
return ActionsBundle.message("action.ToggleFullScreen.text.exit");
}
}
@@ -52,7 +52,7 @@ final class ToggleFullScreenAction extends DumbAwareAction {
p.setEnabled(isApplicable);
if (isApplicable) {
p.setText(frame.isInFullScreen() ? Holder.getTEXT_EXIT_FULL_SCREEN() : Holder.getTextEnterFullScreen());
p.setText(frame.isInFullScreen() ? Holder.getTextExitFullScreen() : Holder.getTextEnterFullScreen());
}
}
platform/platform-impl/src/com/intellij/ide/lightEdit/LightEditUtil.java
+4 -4
View File
@@ -52,10 +52,10 @@ public class LightEditUtil {
static boolean confirmClose(@NotNull String message,
@NotNull String title,
@NotNull Runnable saveRunnable) {
final String[] options = {getCloseSave(), getCLOSE_DISCARD(), getCLOSE_CANCEL()};
final String[] options = {getCloseSave(), getCloseDiscard(), getCloseCancel()};
int result = Messages.showDialog(getProject(), message, title, options, 0, Messages.getWarningIcon());
if (result >= 0) {
if (getCLOSE_CANCEL().equals(options[result])) {
if (getCloseCancel().equals(options[result])) {
return false;
}
else if (getCloseSave().equals(options[result])) {
@@ -94,11 +94,11 @@ public class LightEditUtil {
return ApplicationBundle.message("light.edit.close.save");
}
private static String getCLOSE_DISCARD() {
private static String getCloseDiscard() {
return ApplicationBundle.message("light.edit.close.discard");
}
private static String getCLOSE_CANCEL() {
private static String getCloseCancel() {
return ApplicationBundle.message("light.edit.close.cancel");
}
}
platform/platform-impl/src/com/intellij/ide/ui/customization/CustomActionsSchema.java
+8 -8
View File
@@ -64,16 +64,16 @@ public final class CustomActionsSchema implements PersistentStateComponent<Eleme
private int myModificationStamp = 0;
public CustomActionsSchema() {
myIdToName.put(IdeActions.GROUP_MAIN_MENU, ActionsTreeUtil.getMAIN_MENU_TITLE());
myIdToName.put(IdeActions.GROUP_MAIN_TOOLBAR, ActionsTreeUtil.getMAIN_TOOLBAR());
myIdToName.put(IdeActions.GROUP_EDITOR_POPUP, ActionsTreeUtil.getEDITOR_POPUP());
myIdToName.put(IdeActions.GROUP_MAIN_MENU, ActionsTreeUtil.getMainMenuTitle());
myIdToName.put(IdeActions.GROUP_MAIN_TOOLBAR, ActionsTreeUtil.getMainToolbar());
myIdToName.put(IdeActions.GROUP_EDITOR_POPUP, ActionsTreeUtil.getEditorPopup());
myIdToName.put(IdeActions.GROUP_EDITOR_GUTTER, "Editor Gutter Popup Menu");
myIdToName.put(IdeActions.GROUP_EDITOR_TAB_POPUP, ActionsTreeUtil.getEDITOR_TAB_POPUP());
myIdToName.put(IdeActions.GROUP_PROJECT_VIEW_POPUP, ActionsTreeUtil.getPROJECT_VIEW_POPUP());
myIdToName.put(IdeActions.GROUP_EDITOR_TAB_POPUP, ActionsTreeUtil.getEditorTabPopup());
myIdToName.put(IdeActions.GROUP_PROJECT_VIEW_POPUP, ActionsTreeUtil.getProjectViewPopup());
myIdToName.put(IdeActions.GROUP_SCOPE_VIEW_POPUP, "Scope View Popup Menu");
myIdToName.put(IdeActions.GROUP_FAVORITES_VIEW_POPUP, ActionsTreeUtil.getFAVORITES_POPUP());
myIdToName.put(IdeActions.GROUP_COMMANDER_POPUP, ActionsTreeUtil.getCOMMANDER_POPUP());
myIdToName.put(IdeActions.GROUP_J2EE_VIEW_POPUP, ActionsTreeUtil.getJ2EE_POPUP());
myIdToName.put(IdeActions.GROUP_FAVORITES_VIEW_POPUP, ActionsTreeUtil.getFavoritesPopup());
myIdToName.put(IdeActions.GROUP_COMMANDER_POPUP, ActionsTreeUtil.getCommanderPopup());
myIdToName.put(IdeActions.GROUP_J2EE_VIEW_POPUP, ActionsTreeUtil.getJ2EEPopup());
myIdToName.put(IdeActions.GROUP_NAVBAR_POPUP, "Navigation Bar Popup Menu");
myIdToName.put("NavBarToolBar", "Navigation Bar Toolbar");
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
+10 -10
View File
@@ -38,7 +38,7 @@ public class ActionsTreeUtil {
private static final Logger LOG = Logger.getInstance(ActionsTreeUtil.class);
/**
* Use {code {@link #getMAIN_MENU_TITLE()}} instead
* Use {code {@link #getMainMenuTitle()}} instead
*/
@Deprecated
public static final String MAIN_MENU_TITLE = "Main menu";
@@ -129,7 +129,7 @@ public class ActionsTreeUtil {
}
private static Group createMainMenuGroup(Condition<? super AnAction> filtered) {
Group group = new Group(getMAIN_MENU_TITLE(), IdeActions.GROUP_MAIN_MENU, AllIcons.Nodes.KeymapMainMenu);
Group group = new Group(getMainMenuTitle(), IdeActions.GROUP_MAIN_MENU, AllIcons.Nodes.KeymapMainMenu);
ActionGroup mainMenuGroup = (ActionGroup)ActionManager.getInstance().getActionOrStub(IdeActions.GROUP_MAIN_MENU);
fillGroupIgnorePopupFlag(mainMenuGroup, group, filtered);
return group;
@@ -648,35 +648,35 @@ public class ActionsTreeUtil {
return action;
}
public static String getMAIN_MENU_TITLE() {
public static String getMainMenuTitle() {
return KeyMapBundle.message("main.menu.action.title");
}
public static String getMAIN_TOOLBAR() {
public static String getMainToolbar() {
return KeyMapBundle.message("main.toolbar.title");
}
public static String getEDITOR_POPUP() {
public static String getEditorPopup() {
return KeyMapBundle.message("editor.popup.menu.title");
}
public static String getEDITOR_TAB_POPUP() {
public static String getEditorTabPopup() {
return KeyMapBundle.message("editor.tab.popup.menu.title");
}
public static String getFAVORITES_POPUP() {
public static String getFavoritesPopup() {
return KeyMapBundle.message("favorites.popup.title");
}
public static String getPROJECT_VIEW_POPUP() {
public static String getProjectViewPopup() {
return KeyMapBundle.message("project.view.popup.menu.title");
}
public static String getCOMMANDER_POPUP() {
public static String getCommanderPopup() {
return KeyMapBundle.message("commender.view.popup.menu.title");
}
public static String getJ2EE_POPUP() {
public static String getJ2EEPopup() {
return KeyMapBundle.message("j2ee.view.popup.menu.title");
}
}
platform/structuralsearch/source/com/intellij/structuralsearch/inspection/highlightTemplate/SSBasedInspection.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class SSBasedInspection extends LocalInspectionTool {
@Override
@NotNull
public String getGroupDisplayName() {
return getGENERAL_GROUP_NAME();
return getGeneralGroupName();
}
@Override
platform/testRunner/src/com/intellij/execution/testframework/FailedTestsNavigator.java
+4 -4
View File
@@ -69,13 +69,13 @@ public class FailedTestsNavigator implements OccurenceNavigator {
@NotNull
@Override
public String getNextOccurenceActionName() {
return getNEXT_NAME();
return getNextName();
}
@NotNull
@Override
public String getPreviousOccurenceActionName() {
return getPREVIOUS_NAME();
return getPreviousName();
}
private FailedTestInfo getNextOccurenceInfo() {
@@ -183,11 +183,11 @@ public class FailedTestsNavigator implements OccurenceNavigator {
}
}
static String getNEXT_NAME() {
static String getNextName() {
return ExecutionBundle.message("next.faled.test.action.name");
}
static String getPREVIOUS_NAME() {
static String getPreviousName() {
return ExecutionBundle.message("prev.faled.test.action.name");
}
}
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
+1 -1
View File
@@ -300,7 +300,7 @@ public class FileHistoryPanelImpl extends JPanel implements DataProvider, Dispos
myDualView.setEmptyText(CommonBundle.getLoadingTreeNodeText());
}
else {
myDualView.setEmptyText(StatusText.getDEFAULT_EMPTY_TEXT());
myDualView.setEmptyText(StatusText.getDefaultEmptyText());
}
}
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/details/CommitDetailsListPanel.kt
+1 -1
View File
@@ -109,7 +109,7 @@ abstract class CommitDetailsListPanel<Panel : CommitDetailsPanel>(parent: Dispos
fun setCommits(commits: List<VcsCommitMetadata>) {
rebuildPanel(commits.size)
if (commits.isEmpty()) {
setStatusText(StatusText.getDEFAULT_EMPTY_TEXT())
setStatusText(StatusText.getDefaultEmptyText())
return
}
setStatusText("")
plugins/git4idea/src/git4idea/ui/branch/dashboard/BranchesDashboardUi.kt
+2 -2
View File
@@ -19,7 +19,7 @@ import com.intellij.ui.SideBorder
import com.intellij.ui.components.panels.Wrapper
import com.intellij.util.ui.JBUI
import com.intellij.util.ui.JBUI.Panels.simplePanel
import com.intellij.util.ui.StatusText.getDEFAULT_EMPTY_TEXT
import com.intellij.util.ui.StatusText.getDefaultEmptyText
import com.intellij.util.ui.UIUtil
import com.intellij.util.ui.components.BorderLayoutPanel
import com.intellij.vcs.log.VcsLogFilterCollection
@@ -209,7 +209,7 @@ internal class BranchesDashboardUi(val project: Project) : Disposable {
}
fun stopLoadingBranches() {
tree.component.emptyText.text = getDEFAULT_EMPTY_TEXT()
tree.component.emptyText.text = getDefaultEmptyText()
branchesTreePanel.isEnabled = true
branchesProgressStripe.stopLoading()
}
xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlHighlightVisitorBasedInspection.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class XmlHighlightVisitorBasedInspection extends GlobalSimpleInspectionTo
@NotNull
@Override
public String getGroupDisplayName() {
return getGENERAL_GROUP_NAME();
return getGeneralGroupName();
}
@NotNull