From 97c8241d972204c4e532f21bd93d51f60c6cc7fe Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 30 Aug 2013 15:54:48 +0200
Subject: [PATCH] AddToWatches action should be available in the Inspect pop-up
 too

---
 .../intellij/debugger/actions/AddToWatchActionHandler.java   | 5 +++++
 platform/platform-resources/src/idea/LangActions.xml         | 4 ----
 .../intellij/xdebugger/impl/actions/XDebuggerActions.java    | 1 -
 .../intellij/xdebugger/impl/evaluate/quick/XValueHint.java   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/AddToWatchActionHandler.java b/java/debugger/impl/src/com/intellij/debugger/actions/AddToWatchActionHandler.java
index ca697c801131..99c3090afc46 100644
--- a/java/debugger/impl/src/com/intellij/debugger/actions/AddToWatchActionHandler.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/AddToWatchActionHandler.java
@@ -124,6 +124,7 @@ public class AddToWatchActionHandler extends DebuggerActionHandler {
       myWatchPanel = watchPanel;
     }
 
+    @Override
     public void threadAction() {
       final DebuggerSession session = myDebuggerContext.getDebuggerSession();
       if (session == null) {
@@ -136,6 +137,7 @@ public class AddToWatchActionHandler extends DebuggerActionHandler {
           final TextWithImports expression = DebuggerTreeNodeExpression.createEvaluationText(node, myDebuggerContext);
           if (expression != null) {
             DebuggerInvocationUtil.swingInvokeLater(project, new Runnable() {
+              @Override
               public void run() {
                 doAddWatch(myWatchPanel, expression, descriptor);
               }
@@ -144,6 +146,7 @@ public class AddToWatchActionHandler extends DebuggerActionHandler {
         }
         catch (final EvaluateException e) {
           DebuggerInvocationUtil.swingInvokeLater(project, new Runnable() {
+            @Override
             public void run() {
               Messages.showErrorDialog(project, e.getMessage(), ActionsBundle.actionText(XDebuggerActions.ADD_TO_WATCH));
             }
@@ -152,8 +155,10 @@ public class AddToWatchActionHandler extends DebuggerActionHandler {
       }
     }
 
+    @Override
     protected void commandCancelled() {
       DebuggerInvocationUtil.swingInvokeLater(myDebuggerContext.getProject(), new Runnable() {
+        @Override
         public void run() {
           for (DebuggerTreeNodeImpl node : mySelectedNodes) {
             final NodeDescriptorImpl descriptor = node.getDescriptor();
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index c309f11a2c5f..e83d3f98342a 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -722,10 +722,6 @@
 
     <group id="XDebugger.Inspect.Tree.Popup">
       <reference ref="XDebugger.ValueGroup"/>
-    </group>
-
-    <group id="XDebugger.Value.Hint.Tree.Popup">
-      <reference ref="XDebugger.ValueGroup"/>
       <reference ref="XDebugger.AddToWatches"/>
     </group>
 
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/XDebuggerActions.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/XDebuggerActions.java
index b3d65c4fd433..db13c1b9944d 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/XDebuggerActions.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/actions/XDebuggerActions.java
@@ -47,7 +47,6 @@ public interface XDebuggerActions {
   @NonNls String VARIABLES_TREE_POPUP_GROUP = "XDebugger.Variables.Tree.Popup";
   @NonNls String WATCHES_TREE_POPUP_GROUP = "XDebugger.Watches.Tree.Popup";
   @NonNls String WATCHES_TREE_TOOLBAR_GROUP = "XDebugger.Watches.Tree.Toolbar";
-  @NonNls String VALUE_HINT_TREE_POPUP_GROUP = "XDebugger.Value.Hint.Tree.Popup";
 
   @NonNls String ADD_TO_WATCH = "Debugger.AddToWatch";
 
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java
index e1598fbf55be..ff31d0addd56 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/XValueHint.java
@@ -132,7 +132,7 @@ public class XValueHint extends AbstractValueHint {
 
   private void showTree(final XValue value, final String name) {
     XDebuggerTree tree = new XDebuggerTree(myDebugSession, myDebugSession.getDebugProcess().getEditorsProvider(),
-                                           myDebugSession.getCurrentPosition(), XDebuggerActions.VALUE_HINT_TREE_POPUP_GROUP);
+                                           myDebugSession.getCurrentPosition(), XDebuggerActions.INSPECT_TREE_POPUP_GROUP);
     tree.getModel().addTreeModelListener(createTreeListener(tree));
     XValueHintTreeComponent component = new XValueHintTreeComponent(this, tree, Pair.create(value, name));
     showTreePopup(component, tree, name);