Merge branch '4122' into 'master'

[Context Menu] Access edited object only if an editor is active

See merge request !137

org.fortiss.tooling.base.ui/src/org/fortiss/tooling/base/ui/utils/.ratings

 AbstractNameEditingSupport.java c57336a0e0da18711a1610ca667dfea76728807f GREEN
 ActionUtils.java 322f43d4f92f992daef8ac88eb0f9197c840c89b GREEN
-ContextMenuUtils.java 0f20d4918d0ca48d937c734aaa0c0e55e8fb4610 GREEN
+ContextMenuUtils.java 7fbc7e303c42510063841e8ec097563d2c235c0e GREEN
 DragAndDropBaseUtils.java d375377f9124f6113b2a295e6b0e09ac8966e564 GREEN
 EllipseLayoutUIUtils.java 4dd9dbd96a45e8c455c019caa19e4a50f18336af GREEN
 FXDNDUtils.java 6ce94e239e68f9e2b3cc0524b072606f4a120076 GREEN

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 -> {

org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/.ratings

@@ -4,7 +4,7 @@ DataBindingUtils.java 631c47881caa13fc567679a7e4416eb777af0713 GREEN
 DragAndDropUtils.java 7aab91518aa12d76533a345bf6ed0be9ac7ff0e5 GREEN
 EObjectSelectionUtils.java 128cf8f96c6b9478171dff3deda662d5934f5f44 GREEN
 HierarchicalNameViewerComparator.java 199d82e392d4e437810cc65c0fc521dab52038e0 GREEN
-KernelUIUtils.java 46d3279ef3523b104f89a6c526109f72d36f72f2 GREEN
+KernelUIUtils.java dd58b2c618b7c847aa8cfa2d3bd9956b40b73cdd GREEN
 MessageUtilsExtended.java a08055b2f0005eebfa91662374d9ec4ce4f78aab GREEN
 ObservableUtils.java 34abfd1dfaf9c0acbb31caf1f525e7b39416c116 GREEN
 PropertiesConstantUtils.java 59b1a1e4d594bb98db3aa396f2ff6474ba405920 GREEN

org.fortiss.tooling.kernel.ui/src/org/fortiss/tooling/kernel/ui/util/KernelUIUtils.java

@@ -48,7 +48,7 @@ public class KernelUIUtils {
 		if(editorClazz.isInstance(editor)) {
 			return (E)editor;
 		}
-		if(editor.getSite() instanceof MultiPageEditorSite) {
+		if(editor != null && editor.getSite() instanceof MultiPageEditorSite) {
 			MultiPageEditorSite multiEditor = (MultiPageEditorSite)editor.getSite();
 			ExtendableMultiPageEditor multiPage =
 					(ExtendableMultiPageEditor)multiEditor.getMultiPageEditor();