Only use MoveAndReconnect for FBAddToSubAppLayoutEditPolicy

eclipse-4diac · May 16, 2024 · 60ed6bf · 60ed6bf
1 parent 29b23fc
commit 60ed6bf
Showing 1 changed file with 7 additions and 40 deletions.
diff --git a/...ation/src/org/eclipse/fordiac/ide/application/policies/FBAddToSubAppLayoutEditPolicy.java b/...ation/src/org/eclipse/fordiac/ide/application/policies/FBAddToSubAppLayoutEditPolicy.java
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Copyright (c) 2013, 2016 AIT, fortiss GmbH
  * 				 2018 Johannes Kepler University
- * 				 2021 Primetals Technologies Austria GmbH
+ * 				 2021, 2024 Primetals Technologies Austria GmbH
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -16,16 +16,16 @@
  *                 the AddtoSubapp functionality.
  *   Michael Oberlehner, Lukas Wais
  *   	- implemented drag and drop, added move to parent
+ *   Sebastian Hollersbacher
+ *   	- Added MoveAndReconnect
  *******************************************************************************/
 package org.eclipse.fordiac.ide.application.policies;
 
 import java.util.List;
 
 import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureCanvas;
 import org.eclipse.draw2d.geometry.Insets;
 import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.fordiac.ide.application.commands.AddElementsToSubAppCommand;
 import org.eclipse.fordiac.ide.application.commands.MoveAndReconnectCommand;
 import org.eclipse.fordiac.ide.application.editparts.SubAppForFBNetworkEditPart;
 import org.eclipse.fordiac.ide.gef.policies.EmptyXYLayoutEditPolicy;
@@ -37,12 +37,10 @@
 import org.eclipse.gef.GraphicalEditPart;
 import org.eclipse.gef.Request;
 import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
-import org.eclipse.gef.editparts.ZoomManager;
 import org.eclipse.gef.requests.ChangeBoundsRequest;
 
 /**
- * This policy creates an AddFBToSubAppCommand when user moves selected FBs over
+ * This policy creates an MoveAndReconnectCommand when user moves selected FBs over
  * a subapp. When this is possible the subapp is marked as selected.
  */
 public class FBAddToSubAppLayoutEditPolicy extends EmptyXYLayoutEditPolicy {
@@ -55,44 +53,17 @@ protected Command getAddCommand(final Request request) {
 		if (isDragAndDropRequestFromSubAppToSubApp(request, getTargetEditPart(request))) {
 			final List<? extends EditPart> editParts = ((ChangeBoundsRequest) request).getEditParts();
 			final SubApp dropSubApp = (SubApp) getTargetEditPart(request).getModel();
-			final List<FBNetworkElement> fbEls = collectDraggedFBs(editParts, dropSubApp);
-			final Point destination = getTranslatedAndZoomedPoint((ChangeBoundsRequest) request);
-
-			if (!fbEls.isEmpty()) {
-				return new MoveAndReconnectCommand(fbEls, new Point(destination.x, destination.y));
-			}
-			return new AddElementsToSubAppCommand(dropSubApp, editParts);
+			final List<FBNetworkElement> fbEls = editParts.stream().map(EditPart::getModel)
+					.filter(FBNetworkElement.class::isInstance).map(FBNetworkElement.class::cast).toList();
+			return new MoveAndReconnectCommand(fbEls, new Point(0, 0), dropSubApp.getSubAppNetwork());
 		}
 		return super.getAddCommand(request);
 	}
 
-	private static List<FBNetworkElement> collectDraggedFBs(final List<? extends EditPart> editParts,
-			final SubApp dropSubApp) {
-		return editParts.stream().filter(ep -> ep.getModel() instanceof FBNetworkElement).map(EditPart::getModel)
-				.filter(FBNetworkElement.class::isInstance).map(FBNetworkElement.class::cast)
-				.filter(el -> el.isNestedInSubApp() && isChildFromDropTarget(el, dropSubApp)).toList();
-	}
-
 	public static boolean isDragAndDropRequestFromSubAppToSubApp(final Request generic, final EditPart targetEditPart) {
 		return (generic instanceof ChangeBoundsRequest) && (targetEditPart instanceof SubAppForFBNetworkEditPart);
 	}
 
-	private static boolean isChildFromDropTarget(final FBNetworkElement draggedFB, final SubApp dropTarget) {
-		if ((draggedFB.getOuterFBNetworkElement() == null)
-				|| (draggedFB.getOuterFBNetworkElement().getOuterFBNetworkElement() == null)) {
-			return false;
-
-		}
-		return draggedFB.getOuterFBNetworkElement().getOuterFBNetworkElement().equals(dropTarget);
-	}
-
-	private org.eclipse.draw2d.geometry.Point getTranslatedAndZoomedPoint(final ChangeBoundsRequest request) {
-		final FigureCanvas viewerControl = (FigureCanvas) getTargetEditPart(request).getViewer().getControl();
-		final org.eclipse.draw2d.geometry.Point location = viewerControl.getViewport().getViewLocation();
-		return new org.eclipse.draw2d.geometry.Point(request.getLocation().x + location.x,
-				request.getLocation().y + location.y).scale(1.0 / getZoomManager().getZoom());
-	}
-
 	@Override
 	protected void showLayoutTargetFeedback(final Request request) {
 		if (REQ_ADD.equals(request.getType()) && (null == moveHandle)) {
@@ -103,10 +74,6 @@ protected void showLayoutTargetFeedback(final Request request) {
 		}
 	}
 
-	private ZoomManager getZoomManager() {
-		return ((ScalableFreeformRootEditPart) (getHost().getRoot())).getZoomManager();
-	}
-
 	@Override
 	protected void eraseLayoutTargetFeedback(final Request request) {
 		if (moveHandle != null) {