Author: mareshkau Date: 2008-11-25 12:54:11 -0500 (Tue, 25 Nov 2008) New Revision: 12036 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSelectionController.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java Log: JBIDE-3209, revert changed which was created previously Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-11-25 17:29:18 UTC (rev 12035) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-11-25 17:54:11 UTC (rev 12036) @@ -329,7 +329,7 @@ sourceEditor, visualSelectionController); keyEventHandler = new KeyEventManager(sourceEditor, domMapping, - pageContext,visualSelectionController); + pageContext); // glory ISelectionProvider provider = sourceEditor.getSelectionProvider(); @@ -3350,7 +3350,7 @@ sourceEditor, visualSelectionController); keyEventHandler = new KeyEventManager(sourceEditor, domMapping, - pageContext,visualSelectionController); + pageContext); //restore selection in visula part sourceSelectionChanged(); }finally { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSelectionController.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSelectionController.java 2008-11-25 17:29:18 UTC (rev 12035) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/selection/VpeSelectionController.java 2008-11-25 17:54:11 UTC (rev 12036) @@ -11,6 +11,7 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor.selection; + import org.mozilla.interfaces.nsISelection; import org.mozilla.interfaces.nsISelectionController; @@ -56,18 +57,6 @@ getSelectionController().setSelectionFlags(selectionFlags); } /** - * @see nsISelectionController.lineMove() - * @param forward - * @param extend - */ - public void lineMove(boolean forward, boolean extend) { - //mareshkau, hack for JBIDE-3209 - getSelectionController().characterMove(forward, extend); -// selectionController.characterMove(false, false); -// selectionController.lineMove(forward, extend); - } - - /** * @return the selectionController */ private nsISelectionController getSelectionController() { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java 2008-11-25 17:29:18 UTC (rev 12035) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/KeyEventManager.java 2008-11-25 17:54:11 UTC (rev 12036) @@ -27,7 +27,6 @@ import org.jboss.tools.vpe.editor.util.TextUtil; import org.mozilla.interfaces.nsIDOMKeyEvent; import org.mozilla.interfaces.nsIDOMNode; -import org.mozilla.interfaces.nsISelectionController; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -55,8 +54,6 @@ */ private VpePageContext pageContext; - - private VpeSelectionController selectionController; /** * * @@ -67,12 +64,10 @@ */ public KeyEventManager(StructuredTextEditor sourceEditor, - VpeDomMapping domMapping, VpePageContext pageContext, - VpeSelectionController selectionController) { + VpeDomMapping domMapping, VpePageContext pageContext) { this.sourceEditor = sourceEditor; this.domMapping = domMapping; this.pageContext = pageContext; - this.selectionController = selectionController; } final public boolean handleKeyPress(nsIDOMKeyEvent keyEvent) { @@ -333,9 +328,6 @@ * @return whether handled event */ protected boolean handleDown(nsIDOMKeyEvent keyEvent) { - selectionController.lineMove(true, false); - keyEvent.stopPropagation(); - keyEvent.preventDefault(); return false; } @@ -362,9 +354,6 @@ * @return whether handled event */ protected boolean handleUp(nsIDOMKeyEvent keyEvent) { - selectionController.lineMove(false, false); - keyEvent.stopPropagation(); - keyEvent.preventDefault(); return false; }