diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:01:23 -0700 |
---|---|---|
committer | Tor Norbye <tnorbye@google.com> | 2014-08-20 17:01:23 -0700 |
commit | 1aa2e09bdbd413eacb677e9fa4b50630530d0656 (patch) | |
tree | 2f4cc6d69645bd460aa253fdecb606d764fbd25d /platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesCheckboxTree.java | |
parent | 02cf98d65c798d368fcec43ed64a001d513bdd4f (diff) | |
download | idea-1aa2e09bdbd413eacb677e9fa4b50630530d0656.tar.gz |
Snapshot idea/138.1696 from git://git.jetbrains.org/idea/community.git
Change-Id: I50c97b83a815ce635e49a38380ba5b8765e4b16a
Diffstat (limited to 'platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesCheckboxTree.java')
-rw-r--r-- | platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesCheckboxTree.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesCheckboxTree.java b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesCheckboxTree.java index b6a507ec67a2..68d5e7417d2a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesCheckboxTree.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/postfix/settings/PostfixTemplatesCheckboxTree.java @@ -17,6 +17,7 @@ package com.intellij.codeInsight.template.postfix.settings; import com.intellij.codeInsight.template.postfix.templates.PostfixTemplate; import com.intellij.ide.util.treeView.TreeState; +import com.intellij.lang.Language; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.CheckboxTree; import com.intellij.ui.CheckedTreeNode; @@ -35,7 +36,10 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreePath; import java.awt.*; -import java.util.*; +import java.util.Collection; +import java.util.Enumeration; +import java.util.Map; +import java.util.Set; public class PostfixTemplatesCheckboxTree extends CheckboxTree { @@ -102,7 +106,7 @@ public class PostfixTemplatesCheckboxTree extends CheckboxTree { getSelectionModel().addTreeSelectionListener(new TreeSelectionListener() { @Override - public void valueChanged(TreeSelectionEvent event) { + public void valueChanged(@NotNull TreeSelectionEvent event) { selectionChanged(); } }); @@ -117,10 +121,13 @@ public class PostfixTemplatesCheckboxTree extends CheckboxTree { public void initTree(@NotNull MultiMap<String, PostfixTemplate> langToTemplates) { myRoot.removeAllChildren(); for (Map.Entry<String, Collection<PostfixTemplate>> entry : langToTemplates.entrySet()) { - CheckedTreeNode langNode = new CheckedTreeNode(entry.getKey()); + String id = entry.getKey(); + Language language = Language.findLanguageByID(id); + String langName = language != null ? language.getDisplayName() : id; + CheckedTreeNode langNode = new CheckedTreeNode(langName); myRoot.add(langNode); for (PostfixTemplate template : entry.getValue()) { - CheckedTreeNode templateNode = new PostfixTemplateCheckedTreeNode(template, entry.getKey()); + CheckedTreeNode templateNode = new PostfixTemplateCheckedTreeNode(template, langName); langNode.add(templateNode); } } |