From db1b7a6ddd628c393d3ecf728c2e14c950cf7588 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 19 Feb 2020 09:43:55 +0300 Subject: [PATCH] [i18n] move properties used in *.structureView modules to a separate bundle (IDEA-209382) GitOrigin-RevId: 30e5ed642983a37151684423f5595fc29b74d375 --- .../structureView/impl/java/FieldsFilter.java | 4 +-- .../impl/java/SuperTypeGroup.java | 4 +-- .../impl/java/SuperTypesGrouper.java | 4 +-- .../impl/java/VisibilitySorter.java | 4 +-- .../navigationToolbar/NavBarPresentation.java | 4 +-- .../intellij.platform.structureView.impl.iml | 1 + .../messages/StructureViewBundle.properties | 6 ++++ .../structureView/StructureViewBundle.java | 28 +++++++++++++++++++ .../util/InheritedMembersNodeProvider.java | 6 ++-- .../MarkdownStructureElement.java | 4 +-- .../python/structureView/PyFieldsFilter.java | 4 +-- .../PyInheritedMembersFilter.java | 6 ++-- .../impl/xml/XmlTagTreeElement.java | 4 +-- .../structureView/HtmlTagTreeElement.java | 4 +-- 14 files changed, 59 insertions(+), 24 deletions(-) create mode 100644 platform/structure-view-impl/resources/messages/StructureViewBundle.properties create mode 100644 platform/structure-view-impl/src/com/intellij/ide/structureView/StructureViewBundle.java diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/FieldsFilter.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/FieldsFilter.java index acea371cbad2..867dfc0fc3e8 100644 --- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/FieldsFilter.java +++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/FieldsFilter.java @@ -15,7 +15,7 @@ */ package com.intellij.ide.structureView.impl.java; -import com.intellij.ide.IdeBundle; +import com.intellij.ide.structureView.StructureViewBundle; import com.intellij.ide.util.treeView.smartTree.ActionPresentation; import com.intellij.ide.util.treeView.smartTree.ActionPresentationData; import com.intellij.ide.util.treeView.smartTree.Filter; @@ -35,7 +35,7 @@ public class FieldsFilter implements Filter{ @Override @NotNull public ActionPresentation getPresentation() { - return new ActionPresentationData(IdeBundle.message("action.structureview.show.fields"), null, PlatformIcons.FIELD_ICON); + return new ActionPresentationData(StructureViewBundle.message("action.structureview.show.fields"), null, PlatformIcons.FIELD_ICON); } @Override diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java index d96f189af977..e6f008fe2b80 100644 --- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java +++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java @@ -16,7 +16,7 @@ package com.intellij.ide.structureView.impl.java; import com.intellij.icons.AllIcons; -import com.intellij.ide.IdeBundle; +import com.intellij.ide.structureView.StructureViewBundle; import com.intellij.ide.util.treeView.smartTree.Group; import com.intellij.ide.util.treeView.smartTree.TreeElement; import com.intellij.navigation.ItemPresentation; @@ -91,7 +91,7 @@ public class SuperTypeGroup implements Group, ItemPresentation, AccessLevelProvi public String toString() { final PsiClass superClass = getSuperClass(); - return superClass != null ? superClass.getName() : IdeBundle.message("node.structureview.invalid"); + return superClass != null ? superClass.getName() : StructureViewBundle.message("node.structureview.invalid"); } public boolean equals(Object o) { diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypesGrouper.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypesGrouper.java index 16d71f8274b5..eb3039295a8c 100644 --- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypesGrouper.java +++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypesGrouper.java @@ -2,7 +2,7 @@ package com.intellij.ide.structureView.impl.java; import com.intellij.icons.AllIcons; -import com.intellij.ide.IdeBundle; +import com.intellij.ide.structureView.StructureViewBundle; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.ide.util.treeView.smartTree.*; import com.intellij.openapi.util.Key; @@ -99,7 +99,7 @@ public class SuperTypesGrouper implements Grouper{ @Override @NotNull public ActionPresentation getPresentation() { - return new ActionPresentationData(IdeBundle.message("action.structureview.group.methods.by.defining.type"), null, + return new ActionPresentationData(StructureViewBundle.message("action.structureview.group.methods.by.defining.type"), null, AllIcons.General.ImplementingMethod); } diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/VisibilitySorter.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/VisibilitySorter.java index d509c77f56b2..805b8e501030 100644 --- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/VisibilitySorter.java +++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/VisibilitySorter.java @@ -16,7 +16,7 @@ package com.intellij.ide.structureView.impl.java; import com.intellij.icons.AllIcons; -import com.intellij.ide.IdeBundle; +import com.intellij.ide.structureView.StructureViewBundle; import com.intellij.ide.util.treeView.smartTree.ActionPresentation; import com.intellij.ide.util.treeView.smartTree.Sorter; import org.jetbrains.annotations.NonNls; @@ -33,7 +33,7 @@ public class VisibilitySorter implements Sorter{ @Override @NotNull public String getText() { - return IdeBundle.message("action.structureview.sort.by.visibility"); + return StructureViewBundle.message("action.structureview.sort.by.visibility"); } @Override diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java index a3757a40c982..080847cb6f91 100644 --- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java +++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java @@ -2,8 +2,8 @@ package com.intellij.ide.navigationToolbar; import com.intellij.icons.AllIcons; -import com.intellij.ide.IdeBundle; import com.intellij.ide.projectView.impl.ProjectRootsUtil; +import com.intellij.ide.structureView.StructureViewBundle; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; @@ -89,7 +89,7 @@ public class NavBarPresentation { @NotNull public static String calcPresentableText(Object object, boolean forPopup) { if (!NavBarModel.isValid(object)) { - return IdeBundle.message("node.structureview.invalid"); + return StructureViewBundle.message("node.structureview.invalid"); } for (NavBarModelExtension modelExtension : NavBarModelExtension.EP_NAME.getExtensionList()) { String text = modelExtension.getPresentableText(object, forPopup); diff --git a/platform/structure-view-impl/intellij.platform.structureView.impl.iml b/platform/structure-view-impl/intellij.platform.structureView.impl.iml index acaf44e3012b..db997630c0ce 100644 --- a/platform/structure-view-impl/intellij.platform.structureView.impl.iml +++ b/platform/structure-view-impl/intellij.platform.structureView.impl.iml @@ -4,6 +4,7 @@ + diff --git a/platform/structure-view-impl/resources/messages/StructureViewBundle.properties b/platform/structure-view-impl/resources/messages/StructureViewBundle.properties new file mode 100644 index 000000000000..d46d25ff14d2 --- /dev/null +++ b/platform/structure-view-impl/resources/messages/StructureViewBundle.properties @@ -0,0 +1,6 @@ +action.structureview.group.methods.by.defining.type=Group Methods by Defining Type +action.structureview.show.fields=Show Fields +action.structureview.show.inherited=Show Inherited +action.structureview.sort.by.visibility=Sort by Visibility +file.structure.toggle.show.inherited=Inherited members +node.structureview.invalid= diff --git a/platform/structure-view-impl/src/com/intellij/ide/structureView/StructureViewBundle.java b/platform/structure-view-impl/src/com/intellij/ide/structureView/StructureViewBundle.java new file mode 100644 index 000000000000..c6da683dd48a --- /dev/null +++ b/platform/structure-view-impl/src/com/intellij/ide/structureView/StructureViewBundle.java @@ -0,0 +1,28 @@ +// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +package com.intellij.ide.structureView; + +import com.intellij.DynamicBundle; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.PropertyKey; + +import java.util.function.Supplier; + +public class StructureViewBundle extends DynamicBundle { + @NonNls private static final String BUNDLE = "messages.StructureViewBundle"; + private static final StructureViewBundle INSTANCE = new StructureViewBundle(); + + private StructureViewBundle() { + super(BUNDLE); + } + + @NotNull + public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + return INSTANCE.getMessage(key, params); + } + + @NotNull + public static Supplier lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + return INSTANCE.getLazyMessage(key, params); + } +} diff --git a/platform/structure-view-impl/src/com/intellij/ide/util/InheritedMembersNodeProvider.java b/platform/structure-view-impl/src/com/intellij/ide/util/InheritedMembersNodeProvider.java index cdfcf4df26d0..a13b9ba7c68f 100644 --- a/platform/structure-view-impl/src/com/intellij/ide/util/InheritedMembersNodeProvider.java +++ b/platform/structure-view-impl/src/com/intellij/ide/util/InheritedMembersNodeProvider.java @@ -16,7 +16,7 @@ package com.intellij.ide.util; import com.intellij.icons.AllIcons; -import com.intellij.ide.IdeBundle; +import com.intellij.ide.structureView.StructureViewBundle; import com.intellij.ide.util.treeView.smartTree.ActionPresentation; import com.intellij.ide.util.treeView.smartTree.ActionPresentationData; import com.intellij.ide.util.treeView.smartTree.TreeElement; @@ -34,7 +34,7 @@ public abstract class InheritedMembersNodeProvider implem @NotNull @Override public String getCheckBoxText() { - return IdeBundle.message("file.structure.toggle.show.inherited"); + return StructureViewBundle.message("file.structure.toggle.show.inherited"); } @Override @@ -51,7 +51,7 @@ public abstract class InheritedMembersNodeProvider implem @Override @NotNull public ActionPresentation getPresentation() { - return new ActionPresentationData(IdeBundle.message("action.structureview.show.inherited"), null, AllIcons.Hierarchy.Supertypes); + return new ActionPresentationData(StructureViewBundle.message("action.structureview.show.inherited"), null, AllIcons.Hierarchy.Supertypes); } @Override diff --git a/plugins/markdown/src/org/intellij/plugins/markdown/structureView/MarkdownStructureElement.java b/plugins/markdown/src/org/intellij/plugins/markdown/structureView/MarkdownStructureElement.java index 24c8b00f9bc5..32314444752d 100644 --- a/plugins/markdown/src/org/intellij/plugins/markdown/structureView/MarkdownStructureElement.java +++ b/plugins/markdown/src/org/intellij/plugins/markdown/structureView/MarkdownStructureElement.java @@ -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 org.intellij.plugins.markdown.structureView; -import com.intellij.ide.IdeBundle; +import com.intellij.ide.structureView.StructureViewBundle; import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.ide.structureView.impl.common.PsiTreeElementBase; import com.intellij.ide.util.treeView.smartTree.SortableTreeElement; @@ -77,7 +77,7 @@ public class MarkdownStructureElement extends PsiTreeElementBase imp public String getPresentableText() { final PsiElement tag = getElement(); if (tag == null) { - return IdeBundle.message("node.structureview.invalid"); + return StructureViewBundle.message("node.structureview.invalid"); } return getPresentation().getPresentableText(); } diff --git a/python/src/com/jetbrains/python/structureView/PyFieldsFilter.java b/python/src/com/jetbrains/python/structureView/PyFieldsFilter.java index 526756e54fe8..ea0d8496d2a1 100644 --- a/python/src/com/jetbrains/python/structureView/PyFieldsFilter.java +++ b/python/src/com/jetbrains/python/structureView/PyFieldsFilter.java @@ -15,7 +15,7 @@ */ package com.jetbrains.python.structureView; -import com.intellij.ide.IdeBundle; +import com.intellij.ide.structureView.StructureViewBundle; import com.intellij.ide.util.treeView.smartTree.ActionPresentation; import com.intellij.ide.util.treeView.smartTree.ActionPresentationData; import com.intellij.ide.util.treeView.smartTree.Filter; @@ -57,6 +57,6 @@ public class PyFieldsFilter implements Filter { @NotNull @Override public ActionPresentation getPresentation() { - return new ActionPresentationData(IdeBundle.message("action.structureview.show.fields"), null, PlatformIcons.FIELD_ICON); + return new ActionPresentationData(StructureViewBundle.message("action.structureview.show.fields"), null, PlatformIcons.FIELD_ICON); } } diff --git a/python/src/com/jetbrains/python/structureView/PyInheritedMembersFilter.java b/python/src/com/jetbrains/python/structureView/PyInheritedMembersFilter.java index 8c37c609894d..f4a5159f9476 100644 --- a/python/src/com/jetbrains/python/structureView/PyInheritedMembersFilter.java +++ b/python/src/com/jetbrains/python/structureView/PyInheritedMembersFilter.java @@ -16,7 +16,7 @@ package com.jetbrains.python.structureView; import com.intellij.icons.AllIcons; -import com.intellij.ide.IdeBundle; +import com.intellij.ide.structureView.StructureViewBundle; import com.intellij.ide.util.FileStructureFilter; import com.intellij.ide.util.treeView.smartTree.ActionPresentation; import com.intellij.ide.util.treeView.smartTree.ActionPresentationData; @@ -60,7 +60,7 @@ public class PyInheritedMembersFilter implements FileStructureFilter { @NotNull @Override public ActionPresentation getPresentation() { - return new ActionPresentationData(IdeBundle.message("action.structureview.show.inherited"), + return new ActionPresentationData(StructureViewBundle.message("action.structureview.show.inherited"), null, AllIcons.Hierarchy.Supertypes); } @@ -68,7 +68,7 @@ public class PyInheritedMembersFilter implements FileStructureFilter { @NotNull @Override public String getCheckBoxText() { - return IdeBundle.message("file.structure.toggle.show.inherited"); + return StructureViewBundle.message("file.structure.toggle.show.inherited"); } @Override diff --git a/xml/xml-structure-view-impl/src/com/intellij/ide/structureView/impl/xml/XmlTagTreeElement.java b/xml/xml-structure-view-impl/src/com/intellij/ide/structureView/impl/xml/XmlTagTreeElement.java index eddd19cf5b4c..b84f247db519 100644 --- a/xml/xml-structure-view-impl/src/com/intellij/ide/structureView/impl/xml/XmlTagTreeElement.java +++ b/xml/xml-structure-view-impl/src/com/intellij/ide/structureView/impl/xml/XmlTagTreeElement.java @@ -15,7 +15,7 @@ */ package com.intellij.ide.structureView.impl.xml; -import com.intellij.ide.IdeBundle; +import com.intellij.ide.structureView.StructureViewBundle; import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlTag; @@ -43,7 +43,7 @@ public class XmlTagTreeElement extends AbstractXmlTagTreeElement{ public String getPresentableText() { final XmlTag element = getElement(); if (element == null) { - return IdeBundle.message("node.structureview.invalid"); + return StructureViewBundle.message("node.structureview.invalid"); } String id = element.getAttributeValue(ID_ATTR_NAME); if (id == null) { diff --git a/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/HtmlTagTreeElement.java b/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/HtmlTagTreeElement.java index 3ac150cdc486..e28d96b16534 100644 --- a/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/HtmlTagTreeElement.java +++ b/xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/HtmlTagTreeElement.java @@ -15,7 +15,7 @@ */ package com.intellij.lang.html.structureView; -import com.intellij.ide.IdeBundle; +import com.intellij.ide.structureView.StructureViewBundle; import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.ide.structureView.impl.common.PsiTreeElementBase; import com.intellij.navigation.LocationPresentation; @@ -48,7 +48,7 @@ public class HtmlTagTreeElement extends PsiTreeElementBase implements Lo public String getPresentableText() { final XmlTag tag = getElement(); if (tag == null) { - return IdeBundle.message("node.structureview.invalid"); + return StructureViewBundle.message("node.structureview.invalid"); } return HtmlUtil.getTagPresentation(tag); }