Merge branch '4004' into 'master'

[4004] context menu entry for delete action in data dictionary

See merge request !331

org.fortiss.af3.expression.ui/src/org/fortiss/af3/expression/ui/editor/fx/.ratings

 DataDictionaryFXEditor.java 225c54161a107a8f17caa1f3ffdaee607ba19cfd GREEN
 DataDictionaryFXEditorBinding.java 02fd7a3dfde670b9cfd09a783c090833444c418d GREEN
 DataDictionaryFXEditorContentProvider.java fb4e6ecacda004d3302279b2cce7fc58cd36524c GREEN
-DataDictionaryFXEditorUIProvider.java 8d274efce83461d51a705938bc3dcd93bbf38107 GREEN
+DataDictionaryFXEditorUIProvider.java 54aeec99d138b24d055cbf7cbe729b3cce41634c GREEN
 DataDictionaryFXEvaluator.java 55cbb923079b04ff66a7679904ec1c77a5a0b917 GREEN
 DataDictionaryFXEvaluatorBinding.java aab93436c2b25c6b8673cec7526e2d40756c1e10 GREEN

org.fortiss.af3.expression.ui/src/org/fortiss/af3/expression/ui/editor/fx/DataDictionaryFXEditorUIProvider.java

@@ -15,7 +15,8 @@
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.expression.ui.editor.fx;
 
-import static org.fortiss.tooling.base.ui.editor.fx.controller.ContextMenuUtil.createPrototypeMenu;
+import static org.fortiss.tooling.base.ui.utils.ContextMenuUtils.createDeleteMenu;
+import static org.fortiss.tooling.base.ui.utils.ContextMenuUtils.createPrototypeMenu;
 import static org.fortiss.tooling.base.ui.utils.FXDNDUtils.canCompose;
 import static org.fortiss.tooling.base.ui.utils.FXDNDUtils.compose;
 
@@ -146,6 +147,7 @@ final class DataDictionaryFXEditorUIProvider extends DynamicTreeTableUIProviderB
 		}
 		ContextMenu contextMenu = new ContextMenu();
 		contextMenu.getItems().addAll(createPrototypeMenu(element, null));
+		contextMenu.getItems().add(createDeleteMenu(element));
 		return contextMenu;
 	}
 }

org.fortiss.af3.expression.ui/src/org/fortiss/af3/expression/ui/handler/.ratings

 ArrayHandler.java 1d17548dffca9839e552a283c0d7b1ec0d4aa741 GREEN
 DataDictionaryHandler.java f421407a82eba44a53558314ac3028a9271e89d3 GREEN
-EnumerationHandler.java 8b716e6f98f619d07b14931f9c799ceefd6d39e7 GREEN
+EnumerationHandler.java ce7548f6665d24cbfe2b826b8aaa187a2dc4fc02 GREEN
 FunctionDefinitionHandler.java 9e0ea3284373c3fce7d9816337caa49d385bf6cd GREEN
 LibraryFunctionDefinitionHandler.java 6f216d33f71fd3bb5b9e229b2f7e3d29a38b6c8c GREEN
 LibraryTypeDefinitionHandler.java a78a38fc457296502fa947ff804adfafc65542c6 GREEN
 MemberHandler.java fc612dc4983bd1e34477a530392be5e996586c68 GREEN
-StructureHandler.java 08619790c52ec966643c6c8b7c6f138e88f8d1e3 GREEN
+StructureHandler.java 18e3a76a72cb9608e569ecd3d83d2177d3fecb7a GREEN

org.fortiss.af3.expression.ui/src/org/fortiss/af3/expression/ui/handler/EnumerationHandler.java

@@ -15,8 +15,12 @@
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.expression.ui.handler;
 
+import static java.util.stream.Collectors.toList;
 import static org.fortiss.af3.expression.ui.AF3ExpressionUIActivator.PLUGIN_ID;
 
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
 import org.fortiss.af3.expression.model.definitions.Enumeration;
 import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
 import org.fortiss.tooling.kernel.ui.extension.base.ModelElementHandlerBase;
@@ -45,4 +49,10 @@ public final class EnumerationHandler extends ModelElementHandlerBase<Enumeratio
 	protected String getIconPath(Enumeration element) {
 		return "icons/enumeration.gif";
 	}
+
+	/** {@inheritDoc} */
+	@Override
+	public List<EObject> getSubnodes(Enumeration element) {
+		return element.getMembers().stream().collect(toList());
+	}
 }

org.fortiss.af3.expression.ui/src/org/fortiss/af3/expression/ui/handler/StructureHandler.java

@@ -15,8 +15,12 @@
 +--------------------------------------------------------------------------*/
 package org.fortiss.af3.expression.ui.handler;
 
+import static java.util.stream.Collectors.toList;
 import static org.fortiss.af3.expression.ui.AF3ExpressionUIActivator.PLUGIN_ID;
 
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
 import org.fortiss.af3.expression.model.definitions.Structure;
 import org.fortiss.tooling.kernel.ui.extension.IModelElementHandler;
 import org.fortiss.tooling.kernel.ui.extension.base.ModelElementHandlerBase;
@@ -45,4 +49,10 @@ public final class StructureHandler extends ModelElementHandlerBase<Structure> {
 	protected String getIconPath(Structure element) {
 		return "icons/structure.png";
 	}
+
+	/** {@inheritDoc} */
+	@Override
+	public List<EObject> getSubnodes(Structure element) {
+		return element.getMembers().stream().collect(toList());
+	}
 }

org.fortiss.af3.operatorpanel.ui/src/org/fortiss/af3/operatorpanel/ui/editor/fx/.ratings

 OP3DDisplayFXEditor.java b4fabe39853ecc881d353c0bccecaf8c2b42ccfd GREEN
 OP3DDisplayFXEditorBinding.java 376b3569e467d5e782182dbdbd648aaacb9ae87a GREEN
 OP3DDisplayFXEditorContentProvider.java bf0eb313b06b4ace9cd74676cf1b7dd1ff344fe3 GREEN
-OP3DDisplayFXEditorUIProvider.java 4258601c3b7de3b3bcef19a01fd38407286fd8c1 GREEN
+OP3DDisplayFXEditorUIProvider.java 1b25305ad572eaf9f9150cd8bcd36d115ded8c76 GREEN
 OperatorPanelControllerFactory.java f952a43ebe7fdc3306e6ec500597c3c289bf07c9 GREEN
 OperatorPanelFXEditor.java f3f4a848984763fafdc57e4499f0318829d27e47 GREEN
 OperatorPanelFXEditorBinding.java c7c24316d9f315a57509b84577bd7fee31cd54cb GREEN

org.fortiss.af3.operatorpanel.ui/src/org/fortiss/af3/operatorpanel/ui/editor/fx/OP3DDisplayFXEditorUIProvider.java

@@ -16,7 +16,7 @@
 package org.fortiss.af3.operatorpanel.ui.editor.fx;
 
 import static org.fortiss.af3.operatorpanel.ui.handler.InfoUtils.getInfo;
-import static org.fortiss.tooling.base.ui.editor.fx.controller.ContextMenuUtil.createPrototypeMenu;
+import static org.fortiss.tooling.base.ui.utils.ContextMenuUtils.createPrototypeMenu;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.jface.viewers.IStructuredSelection;