1 files changed, 13 insertions, 2 deletions
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/TipManager.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/TipManager.java
index fce05d1f23db..df91efed9579 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/TipManager.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/TipManager.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.debugger.ui.impl;
 
-import com.intellij.debugger.settings.DebuggerSettings;
 import com.intellij.ide.FrameStateListener;
 import com.intellij.ide.FrameStateManager;
 import com.intellij.openapi.Disposable;
@@ -32,6 +31,7 @@ import com.intellij.util.Alarm;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.update.Activatable;
 import com.intellij.util.ui.update.UiNotifyConnector;
+import com.intellij.xdebugger.settings.XDebuggerSettingsManager;
 
 import javax.swing.*;
 import javax.swing.event.PopupMenuEvent;
@@ -117,14 +117,17 @@ public class TipManager implements Disposable, PopupMenuListener {
     return menu;
   }
 
+  @Override
   public void popupMenuWillBecomeVisible(final PopupMenuEvent e) {
     myPopupShown = true;
   }
 
+  @Override
   public void popupMenuWillBecomeInvisible(final PopupMenuEvent e) {
     onPopupClosed(e);
   }
 
+  @Override
   public void popupMenuCanceled(final PopupMenuEvent e) {
     onPopupClosed(e);
   }
@@ -174,12 +177,13 @@ public class TipManager implements Disposable, PopupMenuListener {
     myShowAlarm.cancelAllRequests();
     myHideAlarm.cancelAllRequests();
     myShowAlarm.addRequest(new Runnable() {
+      @Override
       public void run() {
         if (!myIsDisposed && !myPopupShown) {
           showTooltip(e, auto);
         }
       }
-    }, auto ? DebuggerSettings.getInstance().VALUE_LOOKUP_DELAY : 10);
+    }, auto ? XDebuggerSettingsManager.getInstance().getDataViewSettings().getValueLookupDelay() : 10);
   }
 
   private void showTooltip(InputEvent e, boolean auto) {
@@ -245,6 +249,7 @@ public class TipManager implements Disposable, PopupMenuListener {
       myCurrentTooltip = null;
     } else {
       myHideAlarm.addRequest(new Runnable() {
+        @Override
         public void run() {
           if (myInsideComponent) {
             hideTooltip(true);
@@ -273,10 +278,12 @@ public class TipManager implements Disposable, PopupMenuListener {
     myComponent = component;
 
     new UiNotifyConnector.Once(component, new Activatable() {
+      @Override
       public void showNotify() {
         installListeners();
       }
 
+      @Override
       public void hideNotify() {
       }
     });
@@ -284,6 +291,7 @@ public class TipManager implements Disposable, PopupMenuListener {
     final HideTooltipAction hide = new HideTooltipAction();
     hide.registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0)), myComponent);
     Disposer.register(this, new Disposable() {
+      @Override
       public void dispose() {
         hide.unregisterCustomShortcutSet(myComponent);
       }
@@ -292,6 +300,7 @@ public class TipManager implements Disposable, PopupMenuListener {
 
 
   private class HideTooltipAction extends AnAction {
+    @Override
     public void actionPerformed(AnActionEvent e) {
       hideTooltip(true);
     }
@@ -316,6 +325,7 @@ public class TipManager implements Disposable, PopupMenuListener {
     FrameStateManager.getInstance().addListener(myFrameStateListener);
   }
 
+  @Override
   public void dispose() {
     Disposer.dispose(this);
 
@@ -333,6 +343,7 @@ public class TipManager implements Disposable, PopupMenuListener {
 
   private class MyAwtPreprocessor implements AWTEventListener {
 
+    @Override
     public void eventDispatched(AWTEvent event) {
       if (event.getID() == MouseEvent.MOUSE_MOVED) {
         preventFromHideIfInsideTooltip(event);