Author: yradtsevich Date: 2010-04-05 10:42:59 -0400 (Mon, 05 Apr 2010) New Revision: 21264 Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDropInfo.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDropInfo.java Removed: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceInnerDropInfo.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualInnerDropInfo.java 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/editor/VpeVisualDomBuilder.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java Log: https://jira.jboss.org/jira/browse/JBIDE-5042 Enhance DnD support in VPE VPE Refactoring in progress. - Classes renamed: VpeVisualInnerDropInfo->VpeVisualDropInfo, VpeSourceInnerDropInfo->VpeSourceDropInfo . 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-04-05 13:49:06 UTC (rev 21263) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD.java 2010-04-05 14:42:59 UTC (rev 21264) @@ -34,12 +34,12 @@ import org.jboss.tools.vpe.VpeDebug; import org.jboss.tools.vpe.dnd.DndUtil.DragTransferData; import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.editor.VpeSourceDropInfo; import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo; -import org.jboss.tools.vpe.editor.VpeSourceInnerDropInfo; import org.jboss.tools.vpe.editor.VpeVisualCaretInfo; import org.jboss.tools.vpe.editor.VpeVisualDomBuilder; +import org.jboss.tools.vpe.editor.VpeVisualDropInfo; import org.jboss.tools.vpe.editor.VpeVisualInnerDragInfo; -import org.jboss.tools.vpe.editor.VpeVisualInnerDropInfo; import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; import org.jboss.tools.vpe.editor.mozilla.MozillaDropInfo; @@ -386,7 +386,7 @@ nsIDOMNode caretParent = null; long caretOffset = 0; if (innerDragInfo != null) { - VpeVisualInnerDropInfo visualDropInfo = getInnerDropInfo(event); + VpeVisualDropInfo visualDropInfo = getDropInfo(event); if (visualDropInfo.getDropContainer() != null) { if (VpeDebug.PRINT_VISUAL_INNER_DRAGDROP_EVENT) { System.out.print(" container: " //$NON-NLS-1$ @@ -403,13 +403,13 @@ } VpeSourceInnerDragInfo sourceInnerDragInfo = vpeController.getVisualBuilder() .getSourceInnerDragInfo(innerDragInfo); - VpeSourceInnerDropInfo sourceDropInfo - = getSourceInnerDropInfo(sourceInnerDragInfo.getNode(), + VpeSourceDropInfo sourceDropInfo + = getSourceDropInfo(sourceInnerDragInfo.getNode(), visualDropInfo, true); canDrop = sourceDropInfo.canDrop(); if (canDrop) { - VpeVisualInnerDropInfo newVisualDropInfo - = getInnerDropInfo(sourceDropInfo.getContainer(), + VpeVisualDropInfo newVisualDropInfo + = getDropInfo(sourceDropInfo.getContainer(), sourceDropInfo.getOffset()); if (newVisualDropInfo != null) { correctVisualDropPosition(event, @@ -434,7 +434,7 @@ System.out.print("<<<<<< innerDrop"); //$NON-NLS-1$ } if (innerDragInfo != null) { - VpeVisualInnerDropInfo visualDropInfo = getInnerDropInfo(event); + VpeVisualDropInfo visualDropInfo = getDropInfo(event); if (visualDropInfo.getDropContainer() != null) { if (VpeDebug.PRINT_VISUAL_INNER_DRAGDROP_EVENT) { System.out @@ -447,12 +447,12 @@ VpeSourceInnerDragInfo sourceInnerDragInfo = vpeController.getVisualBuilder() .getSourceInnerDragInfo(innerDragInfo); - VpeSourceInnerDropInfo sourceDropInfo - = getSourceInnerDropInfo(sourceInnerDragInfo.getNode(), + VpeSourceDropInfo sourceDropInfo + = getSourceDropInfo(sourceInnerDragInfo.getNode(), visualDropInfo, true); if (sourceDropInfo.canDrop()) { - VpeVisualInnerDropInfo newVisualDropInfo - = getInnerDropInfo(sourceDropInfo.getContainer(), + VpeVisualDropInfo newVisualDropInfo + = getDropInfo(sourceDropInfo.getContainer(), sourceDropInfo.getOffset()); if (newVisualDropInfo != null) { correctVisualDropPosition(event, @@ -473,8 +473,8 @@ } private void correctVisualDropPosition(nsIDOMMouseEvent mouseEvent, - VpeVisualInnerDropInfo newVisualDropInfo, - VpeVisualInnerDropInfo oldVisualDropInfo) { + VpeVisualDropInfo newVisualDropInfo, + VpeVisualDropInfo oldVisualDropInfo) { nsIDOMNode newVisualDropContainer = newVisualDropInfo .getDropContainer(); nsIDOMNode oldVisualDropContainer = oldVisualDropInfo @@ -506,8 +506,8 @@ } } - private VpeSourceInnerDropInfo getSourceInnerDropInfo(Node sourceDragNode, - VpeVisualInnerDropInfo visualDropInfo, boolean checkParentTemplates) { + private VpeSourceDropInfo getSourceDropInfo(Node sourceDragNode, + VpeVisualDropInfo visualDropInfo, boolean checkParentTemplates) { nsIDOMNode visualDropContainer = visualDropInfo.getDropContainer(); long visualDropOffset = visualDropInfo.getDropOffset(); Node sourceDropContainer = null; @@ -588,14 +588,14 @@ // break; } if (sourceDropContainer != null) { - return getSourceInnerDropInfo(sourceDragNode, sourceDropContainer, + return getSourceDropInfo(sourceDragNode, sourceDropContainer, sourceDropOffset, checkParentTemplates); } else { - return new VpeSourceInnerDropInfo(null, 0, false); + return new VpeSourceDropInfo(null, 0, false); } } - private VpeSourceInnerDropInfo getSourceInnerDropInfo(Node dragNode, + private VpeSourceDropInfo getSourceDropInfo(Node dragNode, Node container, int offset, boolean checkParentsTemplates) { // Thread.dumpStack(); boolean canDrop = false; @@ -609,16 +609,16 @@ } if (!canDrop) { if (!checkParentsTemplates) - return new VpeSourceInnerDropInfo(container, offset, + return new VpeSourceDropInfo(container, offset, canDrop); // offset = ((NodeImpl)container).getIndex(); // container = container.getParentNode(); // TODO Max Areshkau unclear logic , if we can drop on element // why we trying to drop // this on parent - // return getSourceInnerDropInfo(dragNode, container, offset, + // return getSourceDropInfo(dragNode, container, offset, // false); - return new VpeSourceInnerDropInfo(container, offset, canDrop); + return new VpeSourceDropInfo(container, offset, canDrop); } break; case Node.TEXT_NODE: @@ -630,9 +630,9 @@ break; } if (canDrop) { - return new VpeSourceInnerDropInfo(container, offset, canDrop); + return new VpeSourceDropInfo(container, offset, canDrop); } else { - return new VpeSourceInnerDropInfo(null, 0, canDrop); + return new VpeSourceDropInfo(null, 0, canDrop); } } @@ -646,7 +646,7 @@ private void externalDrop(nsIDOMMouseEvent mouseEvent, String flavor, String data) { vpeController.onHideTooltip(); - VpeVisualInnerDropInfo visualDropInfo = getInnerDropInfo(mouseEvent); + VpeVisualDropInfo visualDropInfo = getDropInfo(mouseEvent); Point range = vpeController.getSelectionBuilder().getSourceSelectionRangeAtVisualNode( visualDropInfo.getDropContainer(), (int) visualDropInfo .getDropOffset()); @@ -700,7 +700,7 @@ // Node sourceDragNode = ((Document) getModel().getAdapter( // Document.class)).createElement(tagname); // if (visualDropInfo.getDropContainer() != null) { - // sourceDropInfo = vpeController.getVisualBuilder().getSourceInnerDropInfo( + // sourceDropInfo = vpeController.getVisualBuilder().getSourceDropInfo( // sourceDragNode, visualDropInfo, true); // range = vpeController.getSelectionBuilder().getSourceSelectionRange( // sourceDropInfo.getContainer(), sourceDropInfo @@ -770,7 +770,7 @@ && !TLDUtil.isTaglib(object)) { IFile f = (IFile) EclipseResourceUtil.getResource(object); canDrop = f != null; - VpeVisualInnerDropInfo visualDropInfo = getInnerDropInfo(mouseEvent); + VpeVisualDropInfo visualDropInfo = getDropInfo(mouseEvent); caretParent = visualDropInfo.getDropContainer(); caretOffset = visualDropInfo.getDropOffset(); } else { @@ -778,15 +778,15 @@ if (tagname.indexOf("taglib") >= 0)tagname = "taglib"; //$NON-NLS-1$ //$NON-NLS-2$ Node sourceDragNode = ((Document) vpeController.getModel().getAdapter( Document.class)).createElement(tagname); - VpeVisualInnerDropInfo visualDropInfo = getInnerDropInfo(mouseEvent); + VpeVisualDropInfo visualDropInfo = getDropInfo(mouseEvent); if (visualDropInfo.getDropContainer() != null) { - VpeSourceInnerDropInfo sourceDropInfo - = getSourceInnerDropInfo( + VpeSourceDropInfo sourceDropInfo + = getSourceDropInfo( sourceDragNode, visualDropInfo, true); canDrop = sourceDropInfo.canDrop(); if (canDrop) { - VpeVisualInnerDropInfo newVisualDropInfo - = getInnerDropInfo( + VpeVisualDropInfo newVisualDropInfo + = getDropInfo( sourceDropInfo.getContainer(), sourceDropInfo.getOffset()); if (newVisualDropInfo != null) { @@ -801,7 +801,7 @@ } } else if (XulRunnerEditor.TRANS_FLAVOR_kFileMime.equals(flavor) || XulRunnerEditor.TRANS_FLAVOR_kURLMime.equals(flavor)) { - VpeVisualInnerDropInfo visualDropInfo = getInnerDropInfo(mouseEvent); + VpeVisualDropInfo visualDropInfo = getDropInfo(mouseEvent); caretParent = visualDropInfo.getDropContainer(); caretOffset = visualDropInfo.getDropOffset(); canDrop = true; @@ -934,7 +934,7 @@ // return null; } - private VpeVisualInnerDropInfo getInnerDropInfo(nsIDOMEvent event) { + private VpeVisualDropInfo getDropInfo(nsIDOMEvent event) { nsIDOMNSUIEvent nsuiEvent = (nsIDOMNSUIEvent) event.queryInterface(nsIDOMNSUIEvent.NS_IDOMNSUIEVENT_IID); nsIDOMNode dropContainer = null; @@ -961,7 +961,7 @@ if (originalNode == null || originalNode.getParentNode() == null || originalNode.getParentNode().getNodeType() == Node.DOCUMENT_NODE) { - return new VpeVisualInnerDropInfo(null, 0); + return new VpeVisualDropInfo(null, 0); } if (originalNode.getNodeType() == Node.TEXT_NODE) { dropContainer = nsuiEvent.getRangeParent(); @@ -1055,11 +1055,11 @@ } } } - VpeVisualInnerDropInfo info = new VpeVisualInnerDropInfo(dropContainer, dropOffset); + VpeVisualDropInfo info = new VpeVisualDropInfo(dropContainer, dropOffset); return info; } - private VpeVisualInnerDropInfo getInnerDropInfo(Node sourceDropContainer, + private VpeVisualDropInfo getDropInfo(Node sourceDropContainer, int sourceDropOffset) { nsIDOMNode visualDropContainer = null; long visualDropOffset = 0; @@ -1111,7 +1111,7 @@ if (visualDropContainer == null) { return null; } - return new VpeVisualInnerDropInfo(visualDropContainer, visualDropOffset); + return new VpeVisualDropInfo(visualDropContainer, visualDropOffset); } private nsIDOMNode getNearChild(nsIDOMNode container, int x, int y) { @@ -1164,11 +1164,11 @@ return closestNode; } // this method is never used -// public VpeSourceInnerDropInfo canExternalDropMacro(XModelObject object, Node parentNode, int offset) { +// public VpeSourceDropInfo canExternalDropMacro(XModelObject object, Node parentNode, int offset) { // String tagname = vpeController.getTagName(object); // Node sourceDragNode = ((Document) vpeController.getModel().getAdapter(Document.class)) // .createElement(tagname); -// return vpeController.getVisualBuilder().getSourceInnerDropInfo(sourceDragNode, parentNode, +// return vpeController.getVisualBuilder().getSourceDropInfo(sourceDragNode, parentNode, // offset, false); // } Copied: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDropInfo.java (from rev 21263, trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceInnerDropInfo.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDropInfo.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceDropInfo.java 2010-04-05 14:42:59 UTC (rev 21264) @@ -0,0 +1,43 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.editor; + +import org.w3c.dom.Node; + +public class VpeSourceDropInfo { + private Node container; + private int offset; + private boolean canDrop; + + public VpeSourceDropInfo(Node container, int offset, boolean canDrop) { + this.container = container; + this.offset = offset; + this.canDrop = canDrop; + } + + public Node getContainer() { + return container; + } + + public int getOffset() { + return offset; + } + + public boolean canDrop() { + return canDrop; + } + + public void setContainer(Node container) { + this.container = container; + } + + +} Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceInnerDropInfo.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceInnerDropInfo.java 2010-04-05 13:49:06 UTC (rev 21263) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeSourceInnerDropInfo.java 2010-04-05 14:42:59 UTC (rev 21264) @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.vpe.editor; - -import org.w3c.dom.Node; - -public class VpeSourceInnerDropInfo { - private Node container; - private int offset; - private boolean canDrop; - - public VpeSourceInnerDropInfo(Node container, int offset, boolean canDrop) { - this.container = container; - this.offset = offset; - this.canDrop = canDrop; - } - - public Node getContainer() { - return container; - } - - public int getOffset() { - return offset; - } - - public boolean canDrop() { - return canDrop; - } - - public void setContainer(Node container) { - this.container = container; - } - - -} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2010-04-05 13:49:06 UTC (rev 21263) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2010-04-05 14:42:59 UTC (rev 21264) @@ -1599,13 +1599,13 @@ ((VpeElementMapping) mapping).getTemplate().innerDrop( pageContext, new VpeSourceInnerDragInfo(dragNode, 0, 0), - new VpeSourceInnerDropInfo(container, offset, true)); + new VpeSourceDropInfo(container, offset, true)); } else { if (oldMapping instanceof VpeElementMapping) { ((VpeElementMapping) oldMapping).getTemplate().innerDrop( pageContext, new VpeSourceInnerDragInfo(dragNode, 0, 0), - new VpeSourceInnerDropInfo(container, offset, true)); + new VpeSourceDropInfo(container, offset, true)); } else { /* TODO: implement this case or completely * remove this method? @@ -1622,7 +1622,7 @@ } public void innerDrop(VpeSourceInnerDragInfo dragInfo, - VpeSourceInnerDropInfo dropInfo) { + VpeSourceDropInfo dropInfo) { dropper.drop(pageContext, dragInfo, dropInfo); } Copied: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDropInfo.java (from rev 21263, trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualInnerDropInfo.java) =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDropInfo.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDropInfo.java 2010-04-05 14:42:59 UTC (rev 21264) @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.vpe.editor; + +import org.mozilla.interfaces.nsIDOMNode; + +public class VpeVisualDropInfo { + private nsIDOMNode dropContainer; + private long dropOffset; + + public VpeVisualDropInfo(nsIDOMNode dropContainer, long dropOffset) { + this.dropContainer = dropContainer; + this.dropOffset = dropOffset; + } + + public nsIDOMNode getDropContainer() { + return dropContainer; + } + + public long getDropOffset() { + return dropOffset; + } + public void setDropOffset(long dropOffset) { + this.dropOffset = dropOffset; + } + + public void release() { + dropContainer = null; + } +} Deleted: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualInnerDropInfo.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualInnerDropInfo.java 2010-04-05 13:49:06 UTC (rev 21263) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualInnerDropInfo.java 2010-04-05 14:42:59 UTC (rev 21264) @@ -1,38 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.vpe.editor; - -import org.mozilla.interfaces.nsIDOMNode; - -public class VpeVisualInnerDropInfo { - private nsIDOMNode dropContainer; - private long dropOffset; - - public VpeVisualInnerDropInfo(nsIDOMNode dropContainer, long dropOffset) { - this.dropContainer = dropContainer; - this.dropOffset = dropOffset; - } - - public nsIDOMNode getDropContainer() { - return dropContainer; - } - - public long getDropOffset() { - return dropOffset; - } - public void setDropOffset(long dropOffset) { - this.dropOffset = dropOffset; - } - - public void release() { - dropContainer = null; - } -} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2010-04-05 13:49:06 UTC (rev 21263) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAbstractTemplate.java 2010-04-05 14:42:59 UTC (rev 21264) @@ -24,7 +24,7 @@ import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo; -import org.jboss.tools.vpe.editor.VpeSourceInnerDropInfo; +import org.jboss.tools.vpe.editor.VpeSourceDropInfo; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.NodeData; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; @@ -957,7 +957,7 @@ * @param dragInfo The information on the dragged element */ public void innerDrop(VpePageContext pageContext, - VpeSourceInnerDragInfo dragInfo, VpeSourceInnerDropInfo dropInfo) { + VpeSourceInnerDragInfo dragInfo, VpeSourceDropInfo dropInfo) { // TODO Max Areshkau add DnD support // if (dragger != null) { // dragger.drop(pageContext, dragInfo, dropInfo); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2010-04-05 13:49:06 UTC (rev 21263) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplate.java 2010-04-05 14:42:59 UTC (rev 21264) @@ -13,7 +13,7 @@ import org.eclipse.jface.text.IRegion; import org.jboss.tools.jst.jsp.editor.ITextFormatter; import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo; -import org.jboss.tools.vpe.editor.VpeSourceInnerDropInfo; +import org.jboss.tools.vpe.editor.VpeSourceDropInfo; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.NodeData; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; @@ -256,7 +256,7 @@ * The information on the drop container */ void innerDrop(VpePageContext pageContext, VpeSourceInnerDragInfo dragInfo, - VpeSourceInnerDropInfo dropInfo); + VpeSourceDropInfo dropInfo); /** * Returns <code>VpeTagDescription</code> Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java 2010-04-05 13:49:06 UTC (rev 21263) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/dnd/VpeDnd.java 2010-04-05 14:42:59 UTC (rev 21264) @@ -13,7 +13,7 @@ import java.util.HashSet; import org.jboss.tools.vpe.editor.VpeSourceInnerDragInfo; -import org.jboss.tools.vpe.editor.VpeSourceInnerDropInfo; +import org.jboss.tools.vpe.editor.VpeSourceDropInfo; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.w3c.dom.Document; @@ -182,7 +182,7 @@ } } - public void drop(VpePageContext pageContext, VpeSourceInnerDragInfo dragInfo, VpeSourceInnerDropInfo dropInfo){ + public void drop(VpePageContext pageContext, VpeSourceInnerDragInfo dragInfo, VpeSourceDropInfo dropInfo){ Node container = dropInfo.getContainer(); int offset = dropInfo.getOffset(); Node node = dragInfo.getNode();