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

add-to-group: handle not yet registered action stubs correctly

Browse Source
This commit is contained in:
Gregory.Shrago
2017-06-22 21:28:59 +03:00
parent d7c09841c0
commit ce3d997618
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
+5 -7
View File
@@ -716,8 +716,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
group.setPopup(Boolean.valueOf(popup).booleanValue());
}
// process all group's children. There are other groups, actions, references and links
for (final Object o : element.getChildren()) {
Element child = (Element)o;
for (Element child : element.getChildren()) {
String name = child.getName();
if (ACTION_ELEMENT_NAME.equals(name)) {
AnAction action = processActionElement(child, loader, pluginId);
@@ -778,8 +777,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
private void processReferenceNode(final Element element, final PluginId pluginId) {
final AnAction action = processReferenceElement(element, pluginId);
for (final Object o : element.getChildren()) {
Element child = (Element)o;
for (Element child : element.getChildren()) {
if (ADD_TO_GROUP_ELEMENT_NAME.equals(child.getName())) {
processAddToGroupNode(action, child, pluginId, isSecondary(child));
}
@@ -824,8 +822,9 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
}
private void addToGroupInner(AnAction group, AnAction action, Constraints constraints, boolean secondary) {
String actionId = action instanceof ActionStub ? ((ActionStub)action).getId() : myAction2Id.get(action);
((DefaultActionGroup)group).addAction(action, constraints, this).setAsSecondary(secondary);
myId2GroupId.putValue(myAction2Id.get(action), myAction2Id.get(group));
myId2GroupId.putValue(actionId, myAction2Id.get(group));
}
@Nullable
@@ -864,8 +863,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
parentGroup.add(separator, this);
}
// try to find inner <add-to-parent...> tag
for (final Object o : element.getChildren()) {
Element child = (Element)o;
for (Element child : element.getChildren()) {
if (ADD_TO_GROUP_ELEMENT_NAME.equals(child.getName())) {
processAddToGroupNode(separator, child, pluginId, isSecondary(child));
}