diff --git a/platform/platform-impl/src/com/intellij/ui/ComboboxEditorTextField.java b/platform/platform-impl/src/com/intellij/ui/ComboboxEditorTextField.java
index ec53597b0a31..f1949805d2a8 100644
--- a/platform/platform-impl/src/com/intellij/ui/ComboboxEditorTextField.java
+++ b/platform/platform-impl/src/com/intellij/ui/ComboboxEditorTextField.java
@@ -78,6 +78,7 @@ public class ComboboxEditorTextField extends EditorTextField {
     UIUtil.setComboBoxEditorBounds(x, y, width, height, this);
   }
 
+  @Override
   protected void updateBorder(@NotNull final EditorEx editor) {
     if (UIUtil.isUnderAquaLookAndFeel()) {
       editor.setBorder(isEnabled() ? EDITOR_TEXTFIELD_BORDER : EDITOR_TEXTFIELD_DISABLED_BORDER);
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/WatchInplaceEditor.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/WatchInplaceEditor.java
index 784908be3613..9f04b9107619 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/WatchInplaceEditor.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/WatchInplaceEditor.java
@@ -49,10 +49,12 @@ public class WatchInplaceEditor extends XDebuggerTreeInplaceEditor {
     new WatchEditorSessionListener(session).install();
   }
 
+  @Override
   protected JComponent createInplaceEditorComponent() {
     return myExpressionEditor.getComponent();
   }
 
+  @Override
   public void cancelEditing() {
     if (!isShown()) return;
     super.cancelEditing();
@@ -62,6 +64,7 @@ public class WatchInplaceEditor extends XDebuggerTreeInplaceEditor {
     }
   }
 
+  @Override
   public void doOKAction() {
     String expression = myExpressionEditor.getText();
     myExpressionEditor.saveTextInHistory();
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java
index 4d8c7121ac0a..3db287f84210 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/TreeInplaceEditor.java
@@ -116,6 +116,7 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
     layeredPane.add(inplaceEditorComponent, new Integer(250));
 
     myRemoveActions.add(new Runnable() {
+      @Override
       public void run() {
         layeredPane.remove(inplaceEditorComponent);
       }
@@ -126,9 +127,11 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
     getPreferredFocusedComponent().requestFocus();
 
     final ComponentAdapter componentListener = new ComponentAdapter() {
+      @Override
       public void componentResized(ComponentEvent e) {
         final Project project = getProject();
         ApplicationManager.getApplication().invokeLater(new Runnable() {
+          @Override
           public void run() {
             if (!isShown() || project == null || project.isDisposed()) {
               return;
@@ -146,6 +149,7 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
         });
       }
 
+      @Override
       public void componentHidden(ComponentEvent e) {
         cancelEditing();
       }
@@ -165,6 +169,7 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
     rootPane.addComponentListener(componentListener);
 
     myRemoveActions.add(new Runnable() {
+      @Override
       public void run() {
         tree.removeHierarchyListener(hierarchyListener);
         tree.addComponentListener(componentListener);
@@ -174,16 +179,19 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
 
     final RunContentManager contentManager = ExecutionManager.getInstance(getProject()).getContentManager();
     final RunContentListener runContentListener = new RunContentListener() {
+      @Override
       public void contentSelected(RunContentDescriptor descriptor) {
         cancelEditing();
       }
 
+      @Override
       public void contentRemoved(RunContentDescriptor descriptor) {
         cancelEditing();
       }
     };
     contentManager.addRunContentListener(runContentListener);
     myRemoveActions.add(new Runnable() {
+      @Override
       public void run() {
         contentManager.removeRunContentListener(runContentListener);
       }
@@ -192,18 +200,21 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
     final JComponent editorComponent = getEditorComponent();
     editorComponent.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "enterStroke");
     editorComponent.getActionMap().put("enterStroke", new AbstractAction() {
+      @Override
       public void actionPerformed(ActionEvent e) {
         doOKAction();
       }
     });
     editorComponent.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), "escapeStroke");
     editorComponent.getActionMap().put("escapeStroke", new AbstractAction() {
+      @Override
       public void actionPerformed(ActionEvent e) {
         cancelEditing();
       }
     });
     final Toolkit defaultToolkit = Toolkit.getDefaultToolkit();
     SwingUtilities.invokeLater(new Runnable() {
+      @Override
       public void run() {
         if (!isShown()) return;
         defaultToolkit.addAWTEventListener(TreeInplaceEditor.this, AWTEvent.MOUSE_EVENT_MASK | AWTEvent.MOUSE_WHEEL_EVENT_MASK);
@@ -211,6 +222,7 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
     });
 
     myRemoveActions.add(new Runnable() {
+      @Override
       public void run() {
         defaultToolkit.removeAWTEventListener(TreeInplaceEditor.this);
       }
@@ -221,6 +233,7 @@ public abstract class TreeInplaceEditor implements AWTEventListener {
   protected void onShown() {
   }
 
+  @Override
   public void eventDispatched(AWTEvent event) {
     if (!isShown()) {
       return;
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchMessageNode.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchMessageNode.java
index 488c1a2e69bb..cfa3e946ce87 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchMessageNode.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchMessageNode.java
@@ -35,6 +35,7 @@ public class WatchMessageNode extends MessageTreeNode implements WatchNode {
     setIcon(icon);
   }
 
+  @Override
   @NotNull
   public String getExpression() {
     return myExpression;
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchesRootNode.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchesRootNode.java
index 21ceb241babd..f959015b6f74 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchesRootNode.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchesRootNode.java
@@ -187,8 +187,7 @@ public class WatchesRootNode extends XDebuggerTreeNode {
       myChildren.set(index, messageNode);
       fireNodeStructureChanged(messageNode);
     }
-    WatchInplaceEditor editor = new WatchInplaceEditor(this, mySession, myWatchesView, messageNode, "watch", node);
-    editor.show();
+    new WatchInplaceEditor(this, mySession, myWatchesView, messageNode, "watch", node).show();
   }
 
   private class MyEvaluationCallback extends XEvaluationCallbackBase {