Merge remote-tracking branch 'remotes/origin/master' into 4014

org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings

 CurvedLinkLayoutedContentAnchorangeController.java e22faedbe98c3dab660b5d2df8ebd004e116c5ba GREEN
 CurvedLinkLayoutedDiagramAnchorangeController.java f2e5e2a7cc9b6a070871e200e57371286bb15222 GREEN
-EObjectDiagramController.java 27b008c02e174d66184ba8ad76ae81b082f1069f GREEN
+EObjectDiagramController.java ccccc925eb7966b274aa7354f4e9d4c534b250c5 GREEN
 EObjectEllipticResizableContentControllerBase.java f12e8f5a646a23fe428ed4768bf041c8b885ec81 GREEN
 EObjectModelChangeProvider.java f4b60cebb088a5c81ca92a41614e1a5d40030502 GREEN
 EObjectRectangularResizableContentControllerBase.java cde6c13659611d927691c03ecd2621cff2414b03 GREEN

org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectDiagramController.java

@@ -87,12 +87,17 @@ public class EObjectDiagramController<T extends EObject> extends DefaultDiagramC
 				getViewer().getFeatures().getCurrentZoomFactor());
 		List<MenuItem> result = createPrototypeMenu(modelParent, edc);
 		result.add(createDisplayMenu(getViewer()));
-		if(modelParent instanceof IHierarchicElement) {
+		if(modelParent instanceof IHierarchicElement && enableAutoLayout()) {
 			result.add(createAutoLayoutMenu((IHierarchicElement)modelParent));
 		}
 		return result;
 	}
 
+	/** Indicating if auto layout context menu will be created. */
+	protected boolean enableAutoLayout() {
+		return true;
+	}
+
 	/** {@inheritDoc} */
 	@Override
 	public boolean handleExternalDNDDragOver(Dragboard db, DiagramCoordinate diagramLocation) {