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

EA-20620 fixed

Browse Source
This commit is contained in:
Roman Chernyatchik
2010-06-24 16:44:01 +04:00
committed by Dennis Ushakov
parent d5ed7b2b53
commit 09ae855a49
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/gotoByName/GotoActionModel.java
+10 -8
View File
@@ -131,7 +131,7 @@ public class GotoActionModel implements ChooseByNameModel, CustomMatcherModel {
};
}
protected String getActionId(AnAction anAction) {
protected String getActionId(final @NotNull AnAction anAction) {
return myActionManager.getId(anAction);
}
@@ -219,13 +219,15 @@ public class GotoActionModel implements ChooseByNameModel, CustomMatcherModel {
private void collectActions(String id, Map<AnAction, String> result, ActionGroup group, final String containingGroupName){
final AnAction[] actions = group.getChildren(null);
for (AnAction action : actions) {
if (action instanceof ActionGroup) {
final ActionGroup actionGroup = (ActionGroup)action;
final String groupName = actionGroup.getTemplatePresentation().getText();
collectActions(id, result, actionGroup, groupName != null ? groupName : containingGroupName);
} else if (getActionId(action) == id) {
final String groupName = group.getTemplatePresentation().getText();
result.put(action, groupName != null && groupName.length() > 0 ? groupName : containingGroupName);
if (action != null) {
if (action instanceof ActionGroup) {
final ActionGroup actionGroup = (ActionGroup)action;
final String groupName = actionGroup.getTemplatePresentation().getText();
collectActions(id, result, actionGroup, groupName != null ? groupName : containingGroupName);
} else if (getActionId(action) == id) {
final String groupName = group.getTemplatePresentation().getText();
result.put(action, groupName != null && groupName.length() > 0 ? groupName : containingGroupName);
}
}
}
}