diff --git a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.java b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.java
index c2c5e408904e..2da95c372219 100644
--- a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.java
+++ b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationArgumentsHelpArea.java
@@ -44,8 +44,9 @@ public class ConfigurationArgumentsHelpArea extends JPanel {
     group.add(new MyCopyAction());
     myHelpArea.addMouseListener(
       new PopupHandler(){
+        @Override
         public void invokePopup(final Component comp,final int x,final int y){
-          createPopupMenu(group).getComponent().show(comp,x,y);
+          ActionManager.getInstance().createActionPopupMenu(ActionPlaces.UNKNOWN, group).getComponent().show(comp, x, y);
         }
       }
     );
@@ -67,10 +68,6 @@ public class ConfigurationArgumentsHelpArea extends JPanel {
     myToolbarPanel.setVisible(true);
   }
 
-  private static ActionPopupMenu createPopupMenu(DefaultActionGroup group) {
-    return ActionManager.getInstance().createActionPopupMenu(ActionPlaces.UNKNOWN, group);
-  }
-
   public void updateText(final String text) {
     myHelpArea.setText(text);
   }
@@ -89,6 +86,7 @@ public class ConfigurationArgumentsHelpArea extends JPanel {
       copyFrom(ActionManager.getInstance().getAction(IdeActions.ACTION_COPY));
     }
 
+    @Override
     public void actionPerformed(final AnActionEvent e) {
       final StringSelection contents = new StringSelection(myHelpArea.getText().trim());
       CopyPasteManager.getInstance().setContents(contents);
diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
index 3e295665cc1a..6fa25337c292 100644
--- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
@@ -871,8 +871,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo
         editor.addEditorMouseListener(new EditorPopupHandler() {
           @Override
           public void invokePopup(final EditorMouseEvent event) {
-            final MouseEvent mouseEvent = event.getMouseEvent();
-            popupInvoked(mouseEvent);
+            popupInvoked(event.getMouseEvent());
           }
         });
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java
index e88b8fcb8d79..b9c1f6f55a91 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java
@@ -16,10 +16,7 @@
 package com.intellij.openapi.fileEditor.impl.http;
 
 import com.intellij.icons.AllIcons;
-import com.intellij.openapi.actionSystem.ActionManager;
-import com.intellij.openapi.actionSystem.ActionPlaces;
-import com.intellij.openapi.actionSystem.ActionToolbar;
-import com.intellij.openapi.actionSystem.DefaultActionGroup;
+import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileEditor.TextEditor;