Closes #260 - Support for drag-n-drop of function block to function b…

…lock Signed-off-by: Erle Czar Mantos <[email protected]>
eclipse-vorto · Jun 14, 2016 · a8c21d7 · a8c21d7
1 parent 6c4fdab
commit a8c21d7
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 24 deletions.
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
@@ -56,6 +56,11 @@ public static DropTargetListener functionblockViewPartDropListener(Viewer viewer
 								FunctionblockModelElement.class,
 								DatatypeModelElement.class),
 						new AddLocalReferenceDropAction(DatatypeModelElement.class))
+				.addDropAction(
+						new TargetClassSourceClassValidator(
+								FunctionblockModelElement.class,
+								FunctionblockModelElement.class),
+						new AddLocalReferenceDropAction(FunctionblockModelElement.class))
 				.addDropAction(
 						new TargetClassModelTypeValidator(
 								VortoModelProject.class, ModelType.Functionblock),

diff --git a/...ective/src/org/eclipse/vorto/perspective/dnd/dropaction/AddSharedReferenceDropAction.java b/...ective/src/org/eclipse/vorto/perspective/dnd/dropaction/AddSharedReferenceDropAction.java
@@ -29,48 +29,48 @@
  * A drop action for dropping an IModelProject to another IModelProject
  *
  */
-public class AddSharedReferenceDropAction implements IDropAction<IModelElement,ModelResource> {
+public class AddSharedReferenceDropAction implements IDropAction<IModelElement, ModelResource> {
 
 	private Class<?> droppedObjectClass = null;
-	
+
 	private IModelRepository modelRepo = ModelRepositoryFactory.getModelRepository();
 
 	public AddSharedReferenceDropAction(Class<?> droppedObjectClass) {
 		this.droppedObjectClass = droppedObjectClass;
 	}
 
 	@Override
-	public IModelElement performDrop(IModelElement receivingModelElement,
-			ModelResource modelElementToBeDropped) {
+	public IModelElement performDrop(IModelElement receivingModelElement, ModelResource modelElementToBeDropped) {
 
 		if (droppedObjectClass.isInstance(modelElementToBeDropped)
 				&& !receivingModelElement.equals(modelElementToBeDropped)) {
-			ModelResource modelToAddAsReference = downloadAndSaveModel(receivingModelElement.getProject(), modelElementToBeDropped.getId());
-
-		    receivingModelElement.addModelReference(modelToAddAsReference.getId());
+			ModelResource modelToAddAsReference = downloadAndSaveModel(receivingModelElement.getProject(),
+					modelElementToBeDropped.getId());
+
+			receivingModelElement.addModelReference(modelToAddAsReference.getId());
 			receivingModelElement.save();
 			return receivingModelElement;
 		}
-		
+
 		return null;
 	}
-	
+
 	// Download and save model from repository to local project.
-		// It also recursively do the same for the model references.
-		private ModelResource downloadAndSaveModel(IModelProject project, ModelId modelId) {
-			ModelResource model = modelRepo.getModel(modelId);
-			if (model != null) {
-				for (ModelId reference : model.getReferences()) {
-					downloadAndSaveModel(project, reference);
-				}
-				MessageDisplayFactory.getMessageDisplay().display("Downloading " + modelId.toString());
-				byte[] modelContent = modelRepo.downloadContent(model.getId());
-				project.addModelElement(model.getId(),new ByteArrayInputStream(modelContent));
-			} else {
-				MessageDisplayFactory.getMessageDisplay().displayError(
-						"Model " + modelId.toString() + " not found in repository.");
+	// It also recursively do the same for the model references.
+	private ModelResource downloadAndSaveModel(IModelProject project, ModelId modelId) {
+		ModelResource model = modelRepo.getModel(modelId);
+		if (model != null) {
+			for (ModelId reference : model.getReferences()) {
+				downloadAndSaveModel(project, reference);
 			}
-
-			return model;
+			MessageDisplayFactory.getMessageDisplay().display("Downloading " + modelId.toString());
+			byte[] modelContent = modelRepo.downloadContent(model.getId());
+			project.addModelElement(model.getId(), new ByteArrayInputStream(modelContent));
+		} else {
+			MessageDisplayFactory.getMessageDisplay()
+					.displayError("Model " + modelId.toString() + " not found in repository.");
 		}
+
+		return model;
+	}
 }