MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[i18n] move properties used in *.structureView modules to a separate bundle (IDEA-209382)

Browse Source 
GitOrigin-RevId: 30e5ed642983a37151684423f5595fc29b74d375
This commit is contained in:
nik
2020-02-19 09:43:55 +03:00
committed by intellij-monorepo-bot
parent 8fe3d51847
commit db1b7a6ddd
14 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/FieldsFilter.java
View File

@@ -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

4
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java
View File

@@ -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) {

4
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/SuperTypesGrouper.java
View File

@@ -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);
}

4
java/java-structure-view/src/com/intellij/ide/structureView/impl/java/VisibilitySorter.java
View File

@@ -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

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

@@ -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);

1
platform/structure-view-impl/intellij.platform.structureView.impl.iml
View File

@@ -4,6 +4,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />

6
platform/structure-view-impl/resources/messages/StructureViewBundle.properties Normal file
View File

@@ -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=<invalid>

28
platform/structure-view-impl/src/com/intellij/ide/structureView/StructureViewBundle.java Normal file
View File

@@ -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<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
return INSTANCE.getLazyMessage(key, params);
}
}

6
platform/structure-view-impl/src/com/intellij/ide/util/InheritedMembersNodeProvider.java
View File

@@ -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<T extends TreeElement> 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<T extends TreeElement> 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

4
plugins/markdown/src/org/intellij/plugins/markdown/structureView/MarkdownStructureElement.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 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<PsiElement> 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();
}

4
python/src/com/jetbrains/python/structureView/PyFieldsFilter.java
View File

@@ -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);
}
}

6
python/src/com/jetbrains/python/structureView/PyInheritedMembersFilter.java
View File

@@ -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

4
xml/xml-structure-view-impl/src/com/intellij/ide/structureView/impl/xml/XmlTagTreeElement.java
View File

@@ -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<XmlTag>{
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) {

4
xml/xml-structure-view-impl/src/com/intellij/lang/html/structureView/HtmlTagTreeElement.java
View File

@@ -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<XmlTag> 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);
}