Merge pull request eclipse-vorto#124 from bsinno/bug/92-EntityDropped…

…OnEnums Don't allow entities to be dropped to enums. Closes eclipse-vorto#92
bosch-io · Mar 28, 2016 · 9618e25 · 9618e25
2 parents 8f48306 + 76b2b0b
commit 9618e25
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/...pse.vorto.perspective/src/org/eclipse/vorto/perspective/dnd/ModelDropListenerFactory.java b/...pse.vorto.perspective/src/org/eclipse/vorto/perspective/dnd/ModelDropListenerFactory.java
@@ -23,6 +23,7 @@
 import org.eclipse.vorto.perspective.dnd.dropaction.CreateProjectDropAction;
 import org.eclipse.vorto.perspective.dnd.dropaction.ModelProjectDropAction;
 import org.eclipse.vorto.perspective.dnd.dropaction.RepositoryResourceDropAction;
+import org.eclipse.vorto.perspective.dnd.dropvalidator.DatatypeValidator;
 import org.eclipse.vorto.perspective.dnd.dropvalidator.ModelTypeValidator;
 import org.eclipse.vorto.perspective.dnd.dropvalidator.TargetClassModelTypeValidator;
 import org.eclipse.vorto.perspective.dnd.dropvalidator.TargetClassSourceClassValidator;
@@ -32,7 +33,7 @@ public class ModelDropListenerFactory {
 	public static DropTargetListener datatypeViewPartDropListener(Viewer viewer) {
 		return new ModelDropListener(viewer)
 				.addDropAction(
-						new TargetClassSourceClassValidator(
+						new DatatypeValidator(
 								DatatypeModelProject.class,
 								DatatypeModelProject.class),
 						new ModelProjectDropAction(DatatypeModelProject.class))

diff --git a/...to.perspective/src/org/eclipse/vorto/perspective/dnd/dropvalidator/DatatypeValidator.java b/...to.perspective/src/org/eclipse/vorto/perspective/dnd/dropvalidator/DatatypeValidator.java
@@ -0,0 +1,23 @@
+package org.eclipse.vorto.perspective.dnd.dropvalidator;
+
+import org.eclipse.vorto.core.api.model.datatype.Entity;
+import org.eclipse.vorto.core.api.model.datatype.Enum;
+import org.eclipse.vorto.core.api.model.model.Model;
+import org.eclipse.vorto.core.model.IModelProject;
+
+public class DatatypeValidator extends TargetClassSourceClassValidator {
+
+	public DatatypeValidator(Class<?> targetClass, Class<?> sourceClass) {
+		super(targetClass, sourceClass);
+	}
+
+	@Override
+	public boolean allow(IModelProject receivingProject, Object droppedObject) {
+		boolean entityDroppedToEnum = entityDroppedToEnum(receivingProject.getModel(), ((IModelProject) droppedObject).getModel());
+		return super.allow(receivingProject, droppedObject) && !entityDroppedToEnum;
+	}
+
+	private boolean entityDroppedToEnum(Model targetModel, Model droppedModel) {
+		return targetModel instanceof Enum && droppedModel instanceof Entity;
+	}
+}