diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/Editor.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/Editor.java
index 3a5d9d415257..bd63b43f1af3 100644
--- a/platform/editor-ui-api/src/com/intellij/openapi/editor/Editor.java
+++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/Editor.java
@@ -22,7 +22,6 @@ import com.intellij.openapi.editor.event.EditorMouseMotionListener;
 import com.intellij.openapi.editor.markup.MarkupModel;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.UserDataHolder;
-import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/platform/platform-impl/src/com/intellij/ui/EditorComboBoxEditor.java b/platform/platform-impl/src/com/intellij/ui/EditorComboBoxEditor.java
index 2b9dce102509..f4dfb1059651 100644
--- a/platform/platform-impl/src/com/intellij/ui/EditorComboBoxEditor.java
+++ b/platform/platform-impl/src/com/intellij/ui/EditorComboBoxEditor.java
@@ -38,6 +38,7 @@ public class EditorComboBoxEditor implements ComboBoxEditor{
     myTextField.setName(NAME);
   }
 
+  @Override
   public void selectAll() {
     myTextField.selectAll();
     myTextField.requestFocus();
@@ -48,18 +49,22 @@ public class EditorComboBoxEditor implements ComboBoxEditor{
     return myTextField.getEditor();
   }
 
+  @Override
   public EditorTextField getEditorComponent() {
     return myTextField;
   }
 
+  @Override
   public void addActionListener(ActionListener l) {
 
   }
 
+  @Override
   public void removeActionListener(ActionListener l) {
 
   }
 
+  @Override
   public Object getItem() {
     return getDocument();
   }
@@ -68,6 +73,7 @@ public class EditorComboBoxEditor implements ComboBoxEditor{
     return myTextField.getDocument();
   }
 
+  @Override
   public void setItem(Object anObject) {
     myTextField.setDocument((Document)anObject);
   }