diff --git a/src/com/maddyhome/idea/vim/KeyHandler.java b/src/com/maddyhome/idea/vim/KeyHandler.java
index a4d81b15b..ac39bd74a 100644
--- a/src/com/maddyhome/idea/vim/KeyHandler.java
+++ b/src/com/maddyhome/idea/vim/KeyHandler.java
@@ -31,13 +31,13 @@ import com.maddyhome.idea.vim.command.Command;
import com.maddyhome.idea.vim.command.CommandState;
import com.maddyhome.idea.vim.group.CommandGroups;
import com.maddyhome.idea.vim.group.RegisterGroup;
+import com.maddyhome.idea.vim.helper.RunnableHelper;
import com.maddyhome.idea.vim.key.ArgumentNode;
import com.maddyhome.idea.vim.key.BranchNode;
import com.maddyhome.idea.vim.key.CommandNode;
import com.maddyhome.idea.vim.key.KeyParser;
import com.maddyhome.idea.vim.key.Node;
import com.maddyhome.idea.vim.key.ParentNode;
-import com.maddyhome.idea.vim.helper.RunnableHelper;
import java.awt.event.KeyEvent;
import java.util.ArrayList;
import java.util.Stack;
diff --git a/src/com/maddyhome/idea/vim/action/AbstractCommandAction.java b/src/com/maddyhome/idea/vim/action/AbstractCommandAction.java
index a178be82e..f79ca3700 100644
--- a/src/com/maddyhome/idea/vim/action/AbstractCommandAction.java
+++ b/src/com/maddyhome/idea/vim/action/AbstractCommandAction.java
@@ -22,7 +22,6 @@ package com.maddyhome.idea.vim.action;
import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DataContext;
-import com.maddyhome.idea.vim.KeyHandler;
import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.command.Command;
import com.maddyhome.idea.vim.command.CommandState;
diff --git a/src/com/maddyhome/idea/vim/ex/CommandHandler.java b/src/com/maddyhome/idea/vim/ex/CommandHandler.java
index 4b989ade4..d587a19f6 100644
--- a/src/com/maddyhome/idea/vim/ex/CommandHandler.java
+++ b/src/com/maddyhome/idea/vim/ex/CommandHandler.java
@@ -21,9 +21,9 @@ package com.maddyhome.idea.vim.ex;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Editor;
+import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.helper.RunnableHelper;
import com.maddyhome.idea.vim.undo.UndoManager;
-import com.maddyhome.idea.vim.VimPlugin;
/**
*
diff --git a/src/com/maddyhome/idea/vim/ex/Ranges.java b/src/com/maddyhome/idea/vim/ex/Ranges.java
index cb3ed16c2..8287b3e9e 100644
--- a/src/com/maddyhome/idea/vim/ex/Ranges.java
+++ b/src/com/maddyhome/idea/vim/ex/Ranges.java
@@ -22,8 +22,8 @@ package com.maddyhome.idea.vim.ex;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.TextRange;
-import com.maddyhome.idea.vim.ex.range.LineNumberRange;
import com.maddyhome.idea.vim.ex.range.AbstractRange;
+import com.maddyhome.idea.vim.ex.range.LineNumberRange;
import com.maddyhome.idea.vim.helper.EditorHelper;
import java.util.ArrayList;
diff --git a/src/com/maddyhome/idea/vim/ex/handler/EmptyHandler.java b/src/com/maddyhome/idea/vim/ex/handler/EmptyHandler.java
index 702cc4aa0..60012dd5c 100644
--- a/src/com/maddyhome/idea/vim/ex/handler/EmptyHandler.java
+++ b/src/com/maddyhome/idea/vim/ex/handler/EmptyHandler.java
@@ -20,8 +20,8 @@ package com.maddyhome.idea.vim.ex.handler;
*/
import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Editor;
import com.maddyhome.idea.vim.ex.CommandHandler;
import com.maddyhome.idea.vim.ex.ExCommand;
import com.maddyhome.idea.vim.ex.ExException;
diff --git a/src/com/maddyhome/idea/vim/ex/handler/SubstituteHandler.java b/src/com/maddyhome/idea/vim/ex/handler/SubstituteHandler.java
index e75b43bf2..41e138841 100644
--- a/src/com/maddyhome/idea/vim/ex/handler/SubstituteHandler.java
+++ b/src/com/maddyhome/idea/vim/ex/handler/SubstituteHandler.java
@@ -20,18 +20,18 @@ package com.maddyhome.idea.vim.ex.handler;
*/
import com.intellij.openapi.actionSystem.DataContext;
+import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.TextRange;
-import com.intellij.openapi.diagnostic.Logger;
import com.maddyhome.idea.vim.ex.CommandHandler;
+import com.maddyhome.idea.vim.ex.CommandName;
import com.maddyhome.idea.vim.ex.ExCommand;
import com.maddyhome.idea.vim.ex.ExException;
import com.maddyhome.idea.vim.ex.InvalidArgumentException;
-import com.maddyhome.idea.vim.ex.CommandName;
import com.maddyhome.idea.vim.group.CommandGroups;
import com.maddyhome.idea.vim.group.SearchGroup;
-import java.util.StringTokenizer;
import java.util.NoSuchElementException;
+import java.util.StringTokenizer;
/**
*
diff --git a/src/com/maddyhome/idea/vim/group/ProcessGroup.java b/src/com/maddyhome/idea/vim/group/ProcessGroup.java
index 8516264fa..7e4be4631 100644
--- a/src/com/maddyhome/idea/vim/group/ProcessGroup.java
+++ b/src/com/maddyhome/idea/vim/group/ProcessGroup.java
@@ -19,19 +19,19 @@ package com.maddyhome.idea.vim.group;
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.diagnostic.Logger;
-import java.io.CharArrayReader;
-import java.io.StringWriter;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.Writer;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.util.TextRange;
import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.io.BufferedWriter;
+import java.io.CharArrayReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
/**
*
diff --git a/src/com/maddyhome/idea/vim/group/SearchGroup.java b/src/com/maddyhome/idea/vim/group/SearchGroup.java
index 10ba0e100..59a8e0645 100644
--- a/src/com/maddyhome/idea/vim/group/SearchGroup.java
+++ b/src/com/maddyhome/idea/vim/group/SearchGroup.java
@@ -27,7 +27,6 @@ import java.nio.CharBuffer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.swing.JOptionPane;
-import javax.swing.JButton;
/**
*
diff --git a/src/com/maddyhome/idea/vim/handler/AbstractEditorActionHandler.java b/src/com/maddyhome/idea/vim/handler/AbstractEditorActionHandler.java
index 8a3382acc..b18b6f36d 100644
--- a/src/com/maddyhome/idea/vim/handler/AbstractEditorActionHandler.java
+++ b/src/com/maddyhome/idea/vim/handler/AbstractEditorActionHandler.java
@@ -22,7 +22,6 @@ package com.maddyhome.idea.vim.handler;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
-import com.maddyhome.idea.vim.KeyHandler;
import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.command.Command;
import com.maddyhome.idea.vim.command.CommandState;
diff --git a/src/com/maddyhome/idea/vim/handler/ExEntryHandler.java b/src/com/maddyhome/idea/vim/handler/ExEntryHandler.java
index 6262612e3..7f329d224 100644
--- a/src/com/maddyhome/idea/vim/handler/ExEntryHandler.java
+++ b/src/com/maddyhome/idea/vim/handler/ExEntryHandler.java
@@ -23,13 +23,13 @@ import com.intellij.openapi.actionSystem.DataConstants;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
+import com.maddyhome.idea.vim.VimPlugin;
import com.maddyhome.idea.vim.command.Command;
import com.maddyhome.idea.vim.command.CommandState;
import com.maddyhome.idea.vim.ex.CommandParser;
import com.maddyhome.idea.vim.ex.ExException;
import com.maddyhome.idea.vim.group.CommandGroups;
import com.maddyhome.idea.vim.ui.CommandEntryPanel;
-import com.maddyhome.idea.vim.VimPlugin;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.SwingUtilities;
diff --git a/src/com/maddyhome/idea/vim/handler/change/RepeatExCommandHandler.java b/src/com/maddyhome/idea/vim/handler/change/RepeatExCommandHandler.java
index 018d6a689..5a1381cff 100644
--- a/src/com/maddyhome/idea/vim/handler/change/RepeatExCommandHandler.java
+++ b/src/com/maddyhome/idea/vim/handler/change/RepeatExCommandHandler.java
@@ -21,14 +21,10 @@ package com.maddyhome.idea.vim.handler.change;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Editor;
-import com.maddyhome.idea.vim.KeyHandler;
+import com.maddyhome.idea.vim.command.Command;
import com.maddyhome.idea.vim.ex.CommandParser;
import com.maddyhome.idea.vim.ex.ExException;
-import com.maddyhome.idea.vim.command.Command;
-import com.maddyhome.idea.vim.command.CommandState;
-import com.maddyhome.idea.vim.group.CommandGroups;
import com.maddyhome.idea.vim.handler.AbstractEditorActionHandler;
-import com.maddyhome.idea.vim.undo.UndoManager;
/**
*/
diff --git a/src/com/maddyhome/idea/vim/handler/change/change/ChangeLastGlobalSearchReplaceHandler.java b/src/com/maddyhome/idea/vim/handler/change/change/ChangeLastGlobalSearchReplaceHandler.java
index f240f8b53..12c54dfc9 100644
--- a/src/com/maddyhome/idea/vim/handler/change/change/ChangeLastGlobalSearchReplaceHandler.java
+++ b/src/com/maddyhome/idea/vim/handler/change/change/ChangeLastGlobalSearchReplaceHandler.java
@@ -23,10 +23,10 @@ import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.TextRange;
import com.maddyhome.idea.vim.command.Argument;
+import com.maddyhome.idea.vim.ex.Ranges;
import com.maddyhome.idea.vim.group.CommandGroups;
import com.maddyhome.idea.vim.group.SearchGroup;
import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import com.maddyhome.idea.vim.ex.Ranges;
/**
*/
diff --git a/src/com/maddyhome/idea/vim/handler/change/change/ChangeLastSearchReplaceHandler.java b/src/com/maddyhome/idea/vim/handler/change/change/ChangeLastSearchReplaceHandler.java
index 318ae5eb0..833701e7e 100644
--- a/src/com/maddyhome/idea/vim/handler/change/change/ChangeLastSearchReplaceHandler.java
+++ b/src/com/maddyhome/idea/vim/handler/change/change/ChangeLastSearchReplaceHandler.java
@@ -23,9 +23,9 @@ import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.util.TextRange;
import com.maddyhome.idea.vim.command.Argument;
+import com.maddyhome.idea.vim.ex.Ranges;
import com.maddyhome.idea.vim.group.CommandGroups;
import com.maddyhome.idea.vim.handler.ChangeEditorActionHandler;
-import com.maddyhome.idea.vim.ex.Ranges;
/**
*/
diff --git a/src/com/maddyhome/idea/vim/handler/change/insert/InsertExitModeHandler.java b/src/com/maddyhome/idea/vim/handler/change/insert/InsertExitModeHandler.java
index 398e2b96f..d4eeee025 100644
--- a/src/com/maddyhome/idea/vim/handler/change/insert/InsertExitModeHandler.java
+++ b/src/com/maddyhome/idea/vim/handler/change/insert/InsertExitModeHandler.java
@@ -23,7 +23,6 @@ import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
import com.maddyhome.idea.vim.group.CommandGroups;
-import com.maddyhome.idea.vim.undo.UndoManager;
/**
*
diff --git a/src/com/maddyhome/idea/vim/key/KeyParser.java b/src/com/maddyhome/idea/vim/key/KeyParser.java
index 12608c4b0..0d7050b9a 100644
--- a/src/com/maddyhome/idea/vim/key/KeyParser.java
+++ b/src/com/maddyhome/idea/vim/key/KeyParser.java
@@ -42,7 +42,7 @@ import javax.swing.KeyStroke;
* <li>Insert - The mode where you actually enter text into the editor</li>
* <li>Operator Pending - This mode is entered after an operator has been entered. Arguments then follow</li>
* <li>Command Line - The mode for entering ex commands</li>
- * </ul>A
+ * </ul>
* Several convenience methods are provided for building the key mapping trees. The mappings supplied to all the
* <code>registerAction</code> methods are combinations of the five mapping constants. The action names supplied
* must be valid action ids registered with Idea. These can be built in actions supplied with Idea or custom actions
diff --git a/src/com/maddyhome/idea/vim/ui/CommandEntryPanel.java b/src/com/maddyhome/idea/vim/ui/CommandEntryPanel.java
index 4cd01c4db..2c9f8e4a0 100644
--- a/src/com/maddyhome/idea/vim/ui/CommandEntryPanel.java
+++ b/src/com/maddyhome/idea/vim/ui/CommandEntryPanel.java
@@ -33,8 +33,6 @@ import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
-import java.awt.event.KeyAdapter;
-import java.awt.event.KeyEvent;
import javax.swing.BorderFactory;
import javax.swing.JComponent;
import javax.swing.JLabel;
@@ -45,6 +43,7 @@ import javax.swing.SwingUtilities;
/**
* TODO - support complete set of command line editing keys
+ * TODO - redo focus change support to work like MorePanel
*/
public class CommandEntryPanel extends JPanel
{
@@ -98,24 +97,6 @@ public class CommandEntryPanel extends JPanel
}
}
});
-
- // TODO - move these keys to the ExEditorKit
- /*
- entry.addKeyListener(new KeyAdapter() {
- public void keyPressed(KeyEvent e)
- {
- if (e.getKeyCode() == KeyEvent.VK_BACK_SPACE)
- {
- if (entry.getDocument().getLength() == 0)
- {
- e.consume();
- entry.setText("");
- entry.postActionEvent();
- }
- }
- }
- });
- */
}
public void activate(JComponent comp, String label, String initText)
diff --git a/src/com/maddyhome/idea/vim/ui/ExKeyBindings.java b/src/com/maddyhome/idea/vim/ui/ExKeyBindings.java
index 3b5bd34d5..d1e304249 100644
--- a/src/com/maddyhome/idea/vim/ui/ExKeyBindings.java
+++ b/src/com/maddyhome/idea/vim/ui/ExKeyBindings.java
@@ -21,7 +21,6 @@ package com.maddyhome.idea.vim.ui;
import java.awt.event.KeyEvent;
import javax.swing.KeyStroke;
-import javax.swing.JTextField;
import javax.swing.text.JTextComponent.KeyBinding;
/**
diff --git a/src/com/maddyhome/idea/vim/ui/ExTextField.java b/src/com/maddyhome/idea/vim/ui/ExTextField.java
index 1aad89340..455a72eef 100644
--- a/src/com/maddyhome/idea/vim/ui/ExTextField.java
+++ b/src/com/maddyhome/idea/vim/ui/ExTextField.java
@@ -22,8 +22,8 @@ package com.maddyhome.idea.vim.ui;
import com.intellij.openapi.diagnostic.Logger;
import java.awt.Font;
import javax.swing.Action;
-import javax.swing.JTextField;
import javax.swing.InputMap;
+import javax.swing.JTextField;
import javax.swing.text.Document;
import javax.swing.text.Keymap;
import javax.swing.text.TextAction;
diff --git a/src/com/maddyhome/idea/vim/ui/MorePanel.java b/src/com/maddyhome/idea/vim/ui/MorePanel.java
index a087b2f15..5fcce6bfb 100644
--- a/src/com/maddyhome/idea/vim/ui/MorePanel.java
+++ b/src/com/maddyhome/idea/vim/ui/MorePanel.java
@@ -19,28 +19,28 @@ package com.maddyhome.idea.vim.ui;
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.fileEditor.FileEditorManagerEvent;
+import com.intellij.openapi.fileEditor.FileEditorManagerListener;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Container;
import java.awt.Font;
import java.awt.Point;
import java.awt.Rectangle;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
import java.awt.event.FocusAdapter;
import java.awt.event.FocusEvent;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
-import com.intellij.openapi.fileEditor.FileEditorManagerListener;
-import com.intellij.openapi.fileEditor.FileEditorManagerEvent;
-import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.editor.Editor;
/**
* This panel displays text in a <code>more</code> like window.