Author: estherbin Date: 2008-09-03 12:24:26 -0400 (Wed, 03 Sep 2008) New Revision: 10051 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java Log: fix bugs. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2008-09-03 15:12:30 UTC (rev 10050) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2008-09-03 16:24:26 UTC (rev 10051) @@ -30,6 +30,7 @@ import org.mozilla.interfaces.nsISupportsString; import org.mozilla.interfaces.nsITransferable; import org.mozilla.xpcom.Mozilla; +import org.mozilla.xpcom.XPCOMException; /** * @author Max Areshkau @@ -178,15 +179,18 @@ final nsIDOMEventTarget target = event.getTarget(); final nsIDOMNode targetDomNode = (nsIDOMNode) target.queryInterface(nsIDOMNode.NS_IDOMNODE_IID); - final nsIDOMNode selectedVisualNode = controller.getXulRunnerEditor().getLastSelectedNode(); - - if ((targetDomNode.getFirstChild() != null) && (targetDomNode.getFirstChild().getNodeType() == nsIDOMNode.TEXT_NODE)) { - selectionController.getSelection(nsISelectionController.SELECTION_NORMAL).collapse(targetDomNode.getFirstChild(), - visualCaretInfo.getRageOffset()); +// final nsIDOMNode selectedVisualNode = controller.getXulRunnerEditor().getLastSelectedNode(); + try { + if ((targetDomNode.getFirstChild() != null) && (targetDomNode.getFirstChild().getNodeType() == nsIDOMNode.TEXT_NODE)) { + selectionController.getSelection(nsISelectionController.SELECTION_NORMAL).collapse(targetDomNode.getFirstChild(), + visualCaretInfo.getRageOffset()); + } else if ((targetDomNode.getNodeType() != nsIDOMNode.TEXT_NODE)) { + selectionController.getSelection(nsISelectionController.SELECTION_NORMAL).collapse(targetDomNode, 0); + } + } catch (XPCOMException xpcome) { + event.stopPropagation(); + event.preventDefault(); } -// }else if((targetDomNode.getNodeType()!=nsIDOMNode.TEXT_NODE)){ -// selectionController.getSelection(nsISelectionController.SELECTION_NORMAL).collapse(targetDomNode,visualCaretInfo.getRageOffset()); -// }