Author: yradtsevich Date: 2010-09-17 13:10:36 -0400 (Fri, 17 Sep 2010) New Revision: 25000 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java Log: JBIDE-6229 https://jira.jboss.org/browse/JBIDE-6229: Implement DnD support for selected text in VPE - Minor refactoring 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 2010-09-17 17:02:00 UTC (rev 24999) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-09-17 17:10:36 UTC (rev 25000) @@ -10,6 +10,7 @@ ******************************************************************************/ package org.jboss.tools.vpe.editor; +import java.text.MessageFormat; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -170,7 +171,6 @@ private Attr lastRemovedAttr; private String lastRemovedAttrName; private boolean mouseUpSelectionReasonFlag; - private boolean mouseDownSelectionFlag; private boolean sourceChangeFlag; private boolean commentNodeChanged; private int commentRemoveCount = 0; @@ -1114,7 +1114,7 @@ if (switcher .startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_VISUAL)) { try { - mouseUpSelectionReasonFlag = (reason & nsISelectionListener.MOUSEUP_REASON) > 0; + mouseUpSelectionReasonFlag = (reason & nsISelectionListener.MOUSEUP_REASON) != 0; if ( // commited by Dzmitrovich - experimental // TODO check selection and if are appear errors then @@ -1217,15 +1217,9 @@ return; } try { - if (VpeDebug.PRINT_VISUAL_MOUSE_EVENT) { System.out.println("<<< mouseUp"); //$NON-NLS-1$ } - if (mouseDownSelectionFlag) { - mouseEvent.preventDefault(); - mouseEvent.stopPropagation(); - mouseDownSelectionFlag = false; - } } finally { switcher.stopActiveEditor(); } @@ -1239,12 +1233,13 @@ try { nsIDOMNode visualNode = VisualDomUtil.getTargetNode(mouseEvent); if (visualNode != null) { + if (VpeDebug.PRINT_VISUAL_MOUSE_EVENT) { + System.out.println(MessageFormat.format( + "<<< mouseClick visualNode: {0} ({1})", //$NON-NLS-1$ + visualNode.getNodeName(), + visualNode)); + } if (!mouseUpSelectionReasonFlag) { - if (VpeDebug.PRINT_VISUAL_MOUSE_EVENT) { - System.out - .println("<<< mouseClick visualNode: " + visualNode.getNodeName() + //$NON-NLS-1$ - " (" + visualNode + ")"); //$NON-NLS-1$ //$NON-NLS-2$ - } if (visualBuilder.isContentArea(visualNode)) { // selectionBuilder.setClickContentAreaSelection(); }