From 87e64224c39cc4b139488f67ea865ba6c2eef930 Mon Sep 17 00:00:00 2001
From: Tiziano Munaro <munaro@fortiss.org>
Date: Fri, 12 Mar 2021 17:22:24 +0100
Subject: [PATCH] [Context Menu] Access edited object only if an editor is
active
Issue-Ref: 4122
Issue-Url: https://git.fortiss.org/af3/af3/-/issues/4122
Signed-off-by: Tiziano Munaro <munaro@fortiss.org>
---
.../src/org/fortiss/tooling/base/ui/utils/.ratings | 2 +-
.../fortiss/tooling/base/ui/utils/ContextMenuUtils.java | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/utils/.ratings b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/utils/.ratings
index a9b216ff7..2f06dcd1f 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/utils/.ratings
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/utils/.ratings
@@ -1,6 +1,6 @@
AbstractNameEditingSupport.java c57336a0e0da18711a1610ca667dfea76728807f GREEN
ActionUtils.java 322f43d4f92f992daef8ac88eb0f9197c840c89b GREEN
-ContextMenuUtils.java 0f20d4918d0ca48d937c734aaa0c0e55e8fb4610 GREEN
+ContextMenuUtils.java 7fbc7e303c42510063841e8ec097563d2c235c0e YELLOW
DragAndDropBaseUtils.java d375377f9124f6113b2a295e6b0e09ac8966e564 GREEN
EllipseLayoutUIUtils.java 4dd9dbd96a45e8c455c019caa19e4a50f18336af GREEN
FXDNDUtils.java 6ce94e239e68f9e2b3cc0524b072606f4a120076 GREEN
diff --git a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/utils/ContextMenuUtils.java b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/utils/ContextMenuUtils.java
index 0f20d4918..7fbc7e303 100644
--- a/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/utils/ContextMenuUtils.java
+++ b/org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/utils/ContextMenuUtils.java
@@ -32,6 +32,7 @@ import org.fortiss.tooling.kernel.extension.data.Prototype;
import org.fortiss.tooling.kernel.service.ICommandStackService;
import org.fortiss.tooling.kernel.service.IElementCompositorService;
import org.fortiss.tooling.kernel.service.IPrototypeService;
+import org.fortiss.tooling.kernel.ui.extension.IModelEditor;
import org.fortiss.tooling.kernel.ui.service.IModelEditorBindingService;
import javafx.scene.control.Menu;
@@ -49,8 +50,10 @@ public final class ContextMenuUtils {
IPrototypeService pers = IPrototypeService.getInstance();
IElementCompositorService ecs = IElementCompositorService.getInstance();
ICommandStackService css = ICommandStackService.getInstance();
- EObject editedObject =
- IModelEditorBindingService.getInstance().getActiveEditor().getEditedObject();
+ IModelEditor<EObject> activeEditor =
+ IModelEditorBindingService.getInstance().getActiveEditor();
+ boolean isMenuForEditedObject =
+ activeEditor != null && target == activeEditor.getEditedObject();
List<MenuItem> result = new ArrayList<>();
Menu newMenu = new Menu("New ...");
@@ -60,7 +63,7 @@ public final class ContextMenuUtils {
// If the context menu is created for the currently edited object, offer all composable
// elements. Otherwise (i.e., if context menu is created for a structural element within
// the currently edited object), offer only (composable) connectors.
- if((target == editedObject || prototypeCopy instanceof IConnector) &&
+ if((isMenuForEditedObject || prototypeCopy instanceof IConnector) &&
ecs.canCompose(target, prototypeCopy, context)) {
MenuItem mi = new MenuItem(p.getName());
mi.setOnAction(evt -> {
--
GitLab