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

Survive on missing actions; slightly better diagnostics

Browse Source
This commit is contained in:
Roman Shevchenko
2011-08-16 21:52:37 +02:00
parent 3f1d983f67
commit 55bf72c4a4
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/openapi/actionSystem/Presentation.java
+5
View File
@@ -334,4 +334,9 @@ public final class Presentation implements Cloneable {
public void setWeight(double weight) {
myWeight = weight;
}
@Override
public String toString() {
return myText + " (" + myDescription + ")";
}
}
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/Utils.java
+5 -4
View File
@@ -178,8 +178,11 @@ public class Utils{
private static boolean hasVisibleChildren(ActionGroup group, PresentationFactory factory, DataContext context, String place) {
AnActionEvent event = new AnActionEvent(null, context, place, factory.getPresentation(group), ActionManager.getInstance(), 0);
event.setInjectedContext(group.isInInjectedContext());
AnAction[] children = group.getChildren(event);
for (AnAction anAction : children) {
for (AnAction anAction : group.getChildren(event)) {
if (anAction == null) {
LOG.error("Null action found in group " + group + ", " + factory.getPresentation(group));
continue;
}
if (anAction instanceof Separator) {
continue;
}
@@ -188,8 +191,6 @@ public class Utils{
continue;
}
LOG.assertTrue(anAction != null, "Null action found in group " + group);
final Presentation presentation = factory.getPresentation(anAction);
updateGroupChild(context, place, anAction, presentation);
if (anAction instanceof ActionGroup) {