Author: mareshkau Date: 2010-08-25 05:25:27 -0400 (Wed, 25 Aug 2010) New Revision: 24410 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/context/DropContext.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/context/InnerDragBuffer.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 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/editor/dnd/context/JSPViewerDropAdapter.java Log: https://jira.jboss.org/browse/JBIDE-6860 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/context/DropContext.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/context/DropContext.java 2010-08-25 08:18:54 UTC (rev 24409) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/context/DropContext.java 2010-08-25 09:25:27 UTC (rev 24410) @@ -246,7 +246,7 @@ Object ooo = LocalSelectionTransfer.getTransfer().getSelection(); if(ooo instanceof StructuredSelection) { ooo = ((StructuredSelection)ooo).getFirstElement(); - InnerDragBuffer.object = ooo; + InnerDragBuffer.setInnerDragObject(ooo); } mimeData = ooo == null ? null : ooo.toString(); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/context/InnerDragBuffer.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/context/InnerDragBuffer.java 2010-08-25 08:18:54 UTC (rev 24409) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/editors/dnd/context/InnerDragBuffer.java 2010-08-25 09:25:27 UTC (rev 24410) @@ -11,6 +11,15 @@ package org.jboss.tools.common.model.ui.editors.dnd.context; public class InnerDragBuffer { - public static Object object = null; + + private static Object innerDragObject = null; + public static Object getInnerDragObject() { + return innerDragObject; + } + + public static void setInnerDragObject(Object innerDragObject) { + InnerDragBuffer.innerDragObject = innerDragObject; + } + } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 2010-08-25 08:18:54 UTC (rev 24409) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/texteditors/xmleditor/XMLTextEditor.java 2010-08-25 09:25:27 UTC (rev 24410) @@ -508,7 +508,7 @@ } // Drop from VPE to Source is forbidden if(dropContext.getFlavor().equals("text/html")) { //$NON-NLS-1$ - if(InnerDragBuffer.object != null) { + if(InnerDragBuffer.getInnerDragObject()!= null) { event.detail = DND.DROP_NONE; } return; 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 2010-08-25 08:18:54 UTC (rev 24409) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2010-08-25 09:25:27 UTC (rev 24410) @@ -278,8 +278,8 @@ } private DropResolver getDropResolverForInternalDrop() { - if (InnerDragBuffer.object instanceof Node) { - return getDropResolverForNode((Node) InnerDragBuffer.object); + if (InnerDragBuffer.getInnerDragObject() instanceof Node) { + return getDropResolverForNode((Node) InnerDragBuffer.getInnerDragObject()); } else { return getSimpleDropResolver(false); } @@ -467,12 +467,13 @@ } private void rememberDragNode(Node node) { - InnerDragBuffer.object = node; - Display.getDefault().asyncExec(new Runnable() { - public void run() { - InnerDragBuffer.object = null; - } - }); + InnerDragBuffer.setInnerDragObject(node); + //commented by Maksim Areshkau as fix for https://jira.jboss.org/browse/JBIDE-6860 +// Display.getDefault().asyncExec(new Runnable() { +// public void run() { +// InnerDragBuffer.setInnerDragObject(null); +// } +// }); } private boolean isDraggable(nsIDOMElement element) { @@ -524,7 +525,7 @@ textWidget.replaceTextRange(selectionRange.x, selectionRange.y, ""); //$NON-NLS-1$ dropAny(DndUtil.kUnicodeMime, text); - } else if (InnerDragBuffer.object instanceof Node) { + } else if (InnerDragBuffer.getInnerDragObject() instanceof Node) { VpeSourceDropInfo sourceDropInfo = getDropInfo(); if (sourceDropInfo.getContainer() != null) { if (VpeDebug.PRINT_VISUAL_INNER_DRAGDROP_EVENT) { @@ -539,14 +540,14 @@ if (sourceDropInfo.canDrop()) { VpeDnDHelper dropper = new VpeDnDHelper(); dropper.setDndData(false, true); - Node node = (Node) InnerDragBuffer.object; + Node node = (Node) InnerDragBuffer.getInnerDragObject(); dropper.drop(vpeController.getPageContext(), new VpeSourceInnerDragInfo(node, 0, 0), sourceDropInfo); // select dropped node, JBIDE-6239 setSelectedNode(node); - InnerDragBuffer.object = null; + InnerDragBuffer.setInnerDragObject(null); } } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/JSPViewerDropAdapter.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/JSPViewerDropAdapter.java 2010-08-25 08:18:54 UTC (rev 24409) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dnd/context/JSPViewerDropAdapter.java 2010-08-25 09:25:27 UTC (rev 24410) @@ -189,13 +189,13 @@ if(testOnly) { return editor != null && editor.isEditable() && dropContext.getFlavor() != null; } else { - if(InnerDragBuffer.object instanceof Node && editor instanceof IJSPTextEditor) { + if(InnerDragBuffer.getInnerDragObject() instanceof Node && editor instanceof IJSPTextEditor) { int offset = 0; if(refChild instanceof NodeImpl) { offset = ((NodeImpl)refChild).getIndex(); } - ((IJSPTextEditor)editor).getVPEController().drop((Node)InnerDragBuffer.object, parentNode, offset); - InnerDragBuffer.object = null; + ((IJSPTextEditor)editor).getVPEController().drop((Node)InnerDragBuffer.getInnerDragObject(), parentNode, offset); + InnerDragBuffer.setInnerDragObject(null); } else { int pos = getDropPosition(parentNode, refChild); editor.selectAndReveal(pos, 0);