1 files changed, 12 insertions, 13 deletions

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java
index 28a7c2204265..cbe6da5379cf 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/ContextMenuImpl.java
@@ -46,16 +46,15 @@ import java.awt.event.ActionListener;
 public class ContextMenuImpl extends JPanel implements Disposable {
   @NonNls
   public static final String ACTION_GROUP = "EditorContextBarMenu";
-
-  private ActionGroup myActionGroup;
   private final JComponent myComponent;
+  private final JLayeredPane myLayeredPane;
+  private ActionGroup myActionGroup;
   private boolean myVisible = false;
   private boolean myShow = false;
   private int myCurrentOpacity;
   private Timer myTimer;
   private EditorImpl myEditor;
   private boolean myDisposed;
-  private final JLayeredPane myLayeredPane;
   private ActionToolbar myActionToolbar;
 
   public ContextMenuImpl(JLayeredPane layeredPane, @NotNull final JScrollPane container, @NotNull final EditorImpl editor) {
@@ -81,7 +80,7 @@ public class ContextMenuImpl extends JPanel implements Disposable {
       }
     });
 
-    AnAction action = actionManager.getAction("EditorContextBarMenu");
+    AnAction action = actionManager.getAction(ACTION_GROUP);
     if (action == null) {
       action = new DefaultActionGroup();
       actionManager.registerAction(ACTION_GROUP, action);
@@ -107,6 +106,15 @@ public class ContextMenuImpl extends JPanel implements Disposable {
     return activationArea.contains(p.x, p.y - viewPosition.y);
   }
 
+  public static boolean mayShowToolbar(@Nullable final Document document) {
+    if (document == null) {
+      return false;
+    }
+
+    final VirtualFile file = FileDocumentManager.getInstance().getFile(document);
+    return file != null && file.isValid() && (file.isInLocalFileSystem() || file instanceof HttpVirtualFile);
+  }
+
   private void toggleContextToolbar(final boolean show) {
     final Component toolbar = myComponent.getComponent(0);
     final int count = ((Container)toolbar).getComponentCount();
@@ -201,15 +209,6 @@ public class ContextMenuImpl extends JPanel implements Disposable {
     }
   }
 
-  public static boolean mayShowToolbar(@Nullable final Document document) {
-    if (document == null) {
-      return false;
-    }
-
-    final VirtualFile file = FileDocumentManager.getInstance().getFile(document);
-    return file != null && file.isValid() && (file.isInLocalFileSystem() || file instanceof HttpVirtualFile);
-  }
-
   private void scheduleHide() {
     if (myTimer != null && myTimer.isRunning()) {
       myTimer.stop();