From a15214209f1f60269bafa66204c9b0cb0090d6ec Mon Sep 17 00:00:00 2001 From: Alexander Doroshko Date: Wed, 16 Sep 2009 21:01:52 +0400 Subject: [PATCH] hierarchy of functions for plain javascript --- .../com/intellij/ide/hierarchy/CallHierarchyBrowserBase.java | 5 +---- .../com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java | 3 +++ .../intellij/ide/hierarchy/MethodHierarchyBrowserBase.java | 3 +-- .../com/intellij/ide/hierarchy/TypeHierarchyBrowserBase.java | 4 +--- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/CallHierarchyBrowserBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/CallHierarchyBrowserBase.java index e34434bcf367..512ccfb6c9f1 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/CallHierarchyBrowserBase.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/CallHierarchyBrowserBase.java @@ -52,8 +52,7 @@ public abstract class CallHierarchyBrowserBase extends HierarchyBrowserBaseEx { return CALL_HIERARCHY_BROWSER_DATA_KEY; } - @Override - protected void appendActions(@NotNull DefaultActionGroup actionGroup, String helpID) { + protected void prependActions(@NotNull DefaultActionGroup actionGroup) { actionGroup.add(new ChangeViewTypeActionBase(IdeBundle.message("action.caller.methods.hierarchy"), IdeBundle.message("action.caller.methods.hierarchy"), IconLoader.getIcon("/hierarchy/caller.png"), CALLER_TYPE)); @@ -62,8 +61,6 @@ public abstract class CallHierarchyBrowserBase extends HierarchyBrowserBaseEx { IconLoader.getIcon("/hierarchy/callee.png"), CALLEE_TYPE)); actionGroup.add(new AlphaSortAction()); actionGroup.add(new ChangeScopeAction()); - - super.appendActions(actionGroup, helpID); } @NotNull diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java index 26d14f3fac45..7275f7627461 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java @@ -296,10 +296,13 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem @Override protected void appendActions(@NotNull DefaultActionGroup actionGroup, String helpID) { + prependActions(actionGroup); actionGroup.add(myRefreshAction); super.appendActions(actionGroup, helpID); } + protected void prependActions(final DefaultActionGroup actionGroup) { + } public boolean hasNextOccurence() { return getOccurrenceNavigator().hasNextOccurence(); diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java index aa377819ba8a..b16444ce720f 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java @@ -64,10 +64,9 @@ public abstract class MethodHierarchyBrowserBase extends HierarchyBrowserBaseEx } @Override - protected void appendActions(@NotNull DefaultActionGroup actionGroup, String helpID) { + protected void prependActions(@NotNull DefaultActionGroup actionGroup) { actionGroup.add(new AlphaSortAction()); actionGroup.add(new ShowImplementationsOnlyAction()); - super.appendActions(actionGroup, helpID); } @NotNull diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/TypeHierarchyBrowserBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/TypeHierarchyBrowserBase.java index f30f3d95610b..351c318e85ea 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/TypeHierarchyBrowserBase.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/TypeHierarchyBrowserBase.java @@ -9,7 +9,6 @@ import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; public abstract class TypeHierarchyBrowserBase extends HierarchyBrowserBaseEx { @@ -46,12 +45,11 @@ public abstract class TypeHierarchyBrowserBase extends HierarchyBrowserBaseEx { myIsInterface = isInterface(element); } - protected void appendActions(@NotNull final DefaultActionGroup actionGroup, @Nullable String helpID) { + protected void prependActions(final DefaultActionGroup actionGroup) { actionGroup.add(new ViewClassHierarchyAction()); actionGroup.add(new ViewSupertypesHierarchyAction()); actionGroup.add(new ViewSubtypesHierarchyAction()); actionGroup.add(new AlphaSortAction()); - super.appendActions(actionGroup, helpID); } @NotNull