Merge pull request #370 from bsinno/bug/369_dragdrop_modelrepo

Fixes #369 - Bug in Drag/Drop from Model Repository Browser
eclipse-vorto · Jul 28, 2016 · 334e93d · 334e93d
2 parents 90fa690 + 81654a0
commit 334e93d
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/...rg.eclipse.vorto.perspective/src/org/eclipse/vorto/perspective/dnd/ModelDropListener.java b/...rg.eclipse.vorto.perspective/src/org/eclipse/vorto/perspective/dnd/ModelDropListener.java
@@ -75,14 +75,18 @@ public boolean performDrop(Object data) {
 				}
 			}
 
-			if (result != null) {
+			if (target != null) {
 				ModelProjectTreeViewer viewer = (ModelProjectTreeViewer) this.getViewer();
 				viewer.getLocalModelWorkspace().refreshCurrent();
-				IModelElement targetModelElement = findTarget((IModelElement) target,
-						(Collection<IModelElement>) viewer.getInput());
-				if (targetModelElement != null) {
-					viewer.expandToLevel(targetModelElement, 1);
+
+				if (target instanceof IModelElement) {
+					IModelElement targetModelElement = findTarget((IModelElement) target,
+							(Collection<IModelElement>) viewer.getInput());
+					if (targetModelElement != null) {
+						viewer.expandToLevel(targetModelElement, 1);
+					}
 				}
+
 				return true;
 			}
 
@@ -103,13 +107,20 @@ private IModelElement findTarget(IModelElement target, Collection<IModelElement>
 	private Object getTarget() {
 		Object target = this.getCurrentTarget();
 
-		if (target instanceof IModelElement) {
+		if (target == null) {
+			Viewer viewer = this.getViewer();
+			if (viewer instanceof ModelProjectTreeViewer) {
+				target = ((ModelProjectTreeViewer) viewer).getLocalModelWorkspace().getProjectBrowser().getSelectedProject();
+			}
+		} else if (target instanceof IModelElement) {
 			// Get the latest version of this IModelElement
 			IModelProject project = localModelBrowser.getProjectBrowser().getSelectedProject();
-			return project.getModelElementById(((IModelElement) target).getId());
+			target = project.getModelElementById(((IModelElement) target).getId());
+		} else {
+			throw new RuntimeException("Target is not an IModelElement");
 		}
 
-		throw new RuntimeException("Target is not an IModelElement");
+		return target;
 	}
 
 	public boolean validateDrop(Object target, int operation, TransferData transferType) {