From df60c7f6695d67680b52d112d74737631146eedc Mon Sep 17 00:00:00 2001
From: Johannes Eder <eder@fortiss.org>
Date: Mon, 10 Aug 2020 16:33:19 +0200
Subject: [PATCH] YELLOW
* created protected method do enable/disable auto layout context menu in
diagram editors
Issue-Ref: 4012
Issue-Url: https://af3-developer.fortiss.org/issues/4012
Signed-off-by: Johannes Eder <eder@fortiss.org>
---
.../fortiss/tooling/base/ui/editor/fx/controller/.ratings | 2 +-
.../ui/editor/fx/controller/EObjectDiagramController.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings
index cea49252d..9f414a6cc 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/.ratings
@@ -1,6 +1,6 @@
CurvedLinkLayoutedContentAnchorangeController.java e22faedbe98c3dab660b5d2df8ebd004e116c5ba GREEN
CurvedLinkLayoutedDiagramAnchorangeController.java f2e5e2a7cc9b6a070871e200e57371286bb15222 GREEN
-EObjectDiagramController.java 27b008c02e174d66184ba8ad76ae81b082f1069f GREEN
+EObjectDiagramController.java 5e9d2491f0feb483fb1c116a04a7d6417be2800e YELLOW
EObjectEllipticResizableContentControllerBase.java f12e8f5a646a23fe428ed4768bf041c8b885ec81 GREEN
EObjectModelChangeProvider.java f4b60cebb088a5c81ca92a41614e1a5d40030502 GREEN
EObjectRectangularResizableContentControllerBase.java cde6c13659611d927691c03ecd2621cff2414b03 GREEN
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectDiagramController.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectDiagramController.java
index 27b008c02..5e9d2491f 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/editor/fx/controller/EObjectDiagramController.java
+++ b/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(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) {
--
GitLab