From 40c315ecfc80c123d50ccd3aec45257998646226 Mon Sep 17 00:00:00 2001 From: Florian Barbin Date: Tue, 18 Jun 2024 11:20:36 +0200 Subject: [PATCH] [2759] Reactivate the SelectionDialog In addition, this commit introduces the generic concept of Dialog to make it possible to define any kind of dialog for diagram node tools. Bug: https://github.com/eclipse-sirius/sirius-web/issues/2759 Signed-off-by: Florian Barbin --- CHANGELOG.adoc | 1 + doc/reference/variables.adoc | 13 + package-lock.json | 3 + .../CompatibilityPaletteProvider.java | 4 +- .../services/diagrams/ToolProvider.java | 14 +- ...eSingleClickOnDiagramElementToolInput.java | 5 +- .../dto/SingleClickOnDiagramElementTool.java | 12 +- .../diagrams/dto/ToolVariable.java | 21 + .../diagrams/dto/ToolVariableType.java | 33 + ...ClickOnDiagramElementToolEventHandler.java | 50 +- .../main/resources/schema/diagram.graphqls | 42 +- ...OnDiagramElementToolEventHandlerTests.java | 124 +- ...ramToolReferencePositionProviderTests.java | 6 +- .../tests/graphql/PaletteQueryRunner.java | 4 +- .../SingleClickOnDiagramElementTool.java | 16 +- .../src/dialog/DialogContext.tsx | 79 ++ .../src/dialog/DialogContext.types.ts | 33 + .../src/dialog/diagramDialogExtensionPoint.ts | 19 + .../diagramDialogExtensionPoint.types.ts | 26 + .../src/dialog/useDialog.tsx | 22 + .../src/dialog/useDialog.types.ts | 22 + .../sirius-components-diagrams/src/index.ts | 4 + .../src/renderer/palette/Palette.tsx | 20 +- .../src/renderer/palette/Palette.types.ts | 15 +- .../representation/DiagramRepresentation.tsx | 11 +- .../selection/SelectionEventProcessor.java | 8 + .../sirius-components-selection/package.json | 2 + .../src/SelectionDialog.tsx | 16 +- .../view/ViewDiagramIntegrationTests.java | 3 +- ...tElementLabelProviderIntegrationTests.java | 3 +- .../ExpandCollapseDiagramControllerTests.java | 5 +- .../ModelOperationDiagramControllerTests.java | 3 +- .../UnsynchronizedDiagramControllerTests.java | 2 +- .../VisibilityDiagramControllerTests.java | 16 +- .../extension/DefaultExtensionRegistry.tsx | 21 +- .../builder/generated/DiagramBuilders.java | 6 +- .../generated/DialogDescriptionBuilder.java | 31 + .../builder/generated/NodeToolBuilder.java | 8 +- ...=> SelectionDialogDescriptionBuilder.java} | 30 +- .../DiagramItemProviderAdapterFactory.java | 32 +- .../DialogDescriptionItemProvider.java | 115 ++ .../provider/NodeToolItemProvider.java | 8 +- ...lectionDialogDescriptionItemProvider.java} | 57 +- .../full/obj16/SelectionDialogDescription.svg | 1 + .../src/main/resources/plugin.properties | 406 +++--- .../view/diagram/ArrangeLayoutDirection.java | 30 +- .../view/diagram/DiagramDescription.java | 30 +- .../view/diagram/DiagramFactory.java | 7 +- .../view/diagram/DiagramPackage.java | 1144 +++++++++-------- .../view/diagram/DialogDescription.java | 27 + .../view/diagram/InsideLabelPosition.java | 48 +- .../view/diagram/LabelDescription.java | 24 +- .../view/diagram/LabelOverflowStrategy.java | 25 +- .../view/diagram/LabelTextAlign.java | 26 +- .../components/view/diagram/NodeTool.java | 27 +- ...n.java => SelectionDialogDescription.java} | 27 +- .../diagram/impl/DiagramDescriptionImpl.java | 49 +- .../view/diagram/impl/DiagramFactoryImpl.java | 14 +- .../view/diagram/impl/DiagramPackageImpl.java | 65 +- .../diagram/impl/DialogDescriptionImpl.java | 46 + .../diagram/impl/LabelDescriptionImpl.java | 58 +- .../view/diagram/impl/NodeToolImpl.java | 62 +- ...va => SelectionDialogDescriptionImpl.java} | 43 +- .../diagram/util/DiagramAdapterFactory.java | 36 +- .../view/diagram/util/DiagramSwitch.java | 41 +- .../src/main/resources/model/diagram.ecore | 5 +- .../src/main/resources/model/diagram.genmodel | 9 +- .../components/view/emf/ViewConverter.java | 6 +- .../view/emf/diagram/ToolConverter.java | 2 +- .../view/emf/diagram/ViewPaletteProvider.java | 8 +- 70 files changed, 2069 insertions(+), 1162 deletions(-) create mode 100644 packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ToolVariable.java create mode 100644 packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ToolVariableType.java create mode 100644 packages/diagrams/frontend/sirius-components-diagrams/src/dialog/DialogContext.tsx create mode 100644 packages/diagrams/frontend/sirius-components-diagrams/src/dialog/DialogContext.types.ts create mode 100644 packages/diagrams/frontend/sirius-components-diagrams/src/dialog/diagramDialogExtensionPoint.ts create mode 100644 packages/diagrams/frontend/sirius-components-diagrams/src/dialog/diagramDialogExtensionPoint.types.ts create mode 100644 packages/diagrams/frontend/sirius-components-diagrams/src/dialog/useDialog.tsx create mode 100644 packages/diagrams/frontend/sirius-components-diagrams/src/dialog/useDialog.types.ts create mode 100644 packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DialogDescriptionBuilder.java rename packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/{SelectionDescriptionBuilder.java => SelectionDialogDescriptionBuilder.java} (59%) create mode 100644 packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/DialogDescriptionItemProvider.java rename packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/{SelectionDescriptionItemProvider.java => SelectionDialogDescriptionItemProvider.java} (64%) create mode 100644 packages/view/backend/sirius-components-view-diagram-edit/src/main/resources/icons/full/obj16/SelectionDialogDescription.svg create mode 100644 packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DialogDescription.java rename packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/{SelectionDescription.java => SelectionDialogDescription.java} (78%) create mode 100644 packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DialogDescriptionImpl.java rename packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/{SelectionDescriptionImpl.java => SelectionDialogDescriptionImpl.java} (79%) diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc index e4f158110d6..5929a492242 100644 --- a/CHANGELOG.adoc +++ b/CHANGELOG.adoc @@ -55,6 +55,7 @@ More existing APIs will be migrated to this new common pattern. - https://github.com/eclipse-sirius/sirius-web/issues/3575[#3575] [core] Restore support for studio palette colors - https://github.com/eclipse-sirius/sirius-web/issues/3582[#3582] [tree] Restore the initial direct edit tree item label for the explorer - https://github.com/eclipse-sirius/sirius-web/issues/3611[#3611] [diagram] Fix missing creation tool image in the contextual palette +- https://github.com/eclipse-sirius/sirius-web/issues/2759[#2759] [diagram] Reactivate the Selection Dialog === New Features diff --git a/doc/reference/variables.adoc b/doc/reference/variables.adoc index e15d175a9a5..d20541f31ed 100644 --- a/doc/reference/variables.adoc +++ b/doc/reference/variables.adoc @@ -145,3 +145,16 @@ Used to compute the nodes which should be considered as target of the edge - `self`: The current element on which the operation is performed - `editingContext`: The editing context is an abstraction used to access all the semantic data - `environment`: The environment may contain some information on the application currently running + +== NodeTool + +=== SelectionDialogDescription + +If a `SelectionDialogDescription` is defined on the `NodeTool`, the following variable becomes available: +- `selectedObject`: own the semantic element selected by the user in the selection dialog. + +=== SelectionDialogDescription#SelectionCandidatesExpression + +Used to compute the list of elements that should be displayed in the selection dialog +- `self`: The current diagram element on which the tool is currently applied. +- `targetElement` The semantic target element of the diagram element in the `self` variable. diff --git a/package-lock.json b/package-lock.json index 4c01da00f33..6efc00b26a7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15212,6 +15212,7 @@ "devDependencies": { "@apollo/client": "3.10.4", "@eclipse-sirius/sirius-components-core": "*", + "@eclipse-sirius/sirius-components-diagrams": "*", "@eclipse-sirius/sirius-components-tsconfig": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", @@ -15229,6 +15230,7 @@ "peerDependencies": { "@apollo/client": "3.10.4", "@eclipse-sirius/sirius-components-core": "*", + "@eclipse-sirius/sirius-components-diagrams": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", "@xstate/react": "1.6.3", @@ -24221,6 +24223,7 @@ "requires": { "@apollo/client": "3.10.4", "@eclipse-sirius/sirius-components-core": "*", + "@eclipse-sirius/sirius-components-diagrams": "*", "@eclipse-sirius/sirius-components-tsconfig": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityPaletteProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityPaletteProvider.java index 5206e49c133..19fcb5a100f 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityPaletteProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/CompatibilityPaletteProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2022, 2023 Obeo. + * Copyright (c) 2022, 2024 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -133,7 +133,7 @@ private ITool convertTool(org.eclipse.sirius.components.diagrams.tools.ITool too if (tool instanceof org.eclipse.sirius.components.diagrams.tools.SingleClickOnDiagramElementTool singleClickOnDiagramElementTool) { convertedTool = new SingleClickOnDiagramElementTool(singleClickOnDiagramElementTool.getId(), singleClickOnDiagramElementTool.getLabel(), singleClickOnDiagramElementTool.getIconURL(), singleClickOnDiagramElementTool.getTargetDescriptions(), - singleClickOnDiagramElementTool.getSelectionDescriptionId(), singleClickOnDiagramElementTool.isAppliesToDiagramRoot()); + singleClickOnDiagramElementTool.getDialogDescriptionId(), singleClickOnDiagramElementTool.isAppliesToDiagramRoot()); } if (tool instanceof org.eclipse.sirius.components.diagrams.tools.SingleClickOnTwoDiagramElementsTool singleClickOnTwoDiagramElementsTool) { List candidates = new ArrayList<>(); diff --git a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ToolProvider.java b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ToolProvider.java index 50fe33c0cc5..b6c7a80046b 100644 --- a/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ToolProvider.java +++ b/packages/compatibility/backend/sirius-components-compatibility/src/main/java/org/eclipse/sirius/components/compatibility/services/diagrams/ToolProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2023 Obeo. + * Copyright (c) 2019, 2024 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -234,9 +234,9 @@ private SingleClickOnDiagramElementTool convertNodeCreationDescription(Map imagePath = this.toolImageProvider.getIcon(nodeCreationTool); List targetDescriptions = this.getParentNodeDescriptions(nodeCreationTool.getNodeMappings(), id2NodeDescriptions); var selectModelElementVariableOpt = new SelectModelElementVariableProvider().getSelectModelElementVariable(nodeCreationTool.getVariable()); - String selectionDescriptionId = null; + String dialogDescriptionId = null; if (selectModelElementVariableOpt.isPresent()) { - selectionDescriptionId = this.identifierProvider.getIdentifier(selectModelElementVariableOpt.get()); + dialogDescriptionId = this.identifierProvider.getIdentifier(selectModelElementVariableOpt.get()); } // @formatter:off return SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool(id) @@ -245,7 +245,7 @@ private SingleClickOnDiagramElementTool convertNodeCreationDescription(Map imagePath = this.toolImageProvider.getIcon(containerCreationDescription); List targetDescriptions = this.getParentNodeDescriptions(containerCreationDescription.getContainerMappings(), id2NodeDescriptions); var selectModelElementVariableOpt = new SelectModelElementVariableProvider().getSelectModelElementVariable(containerCreationDescription.getVariable()); - String selectionDescriptionId = null; + String dialogDescriptionId = null; if (selectModelElementVariableOpt.isPresent()) { - selectionDescriptionId = this.identifierProvider.getIdentifier(selectModelElementVariableOpt.get()); + dialogDescriptionId = this.identifierProvider.getIdentifier(selectModelElementVariableOpt.get()); } // @formatter:off return SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool(id) @@ -268,7 +268,7 @@ private SingleClickOnDiagramElementTool convertContainerCreationDescription(Map< .handler(this.createContainerCreationHandler(interpreter, containerCreationDescription)) .targetDescriptions(targetDescriptions) .appliesToDiagramRoot(this.atLeastOneRootMapping(containerCreationDescription.getContainerMappings())) - .selectionDescriptionId(selectionDescriptionId) + .dialogDescriptionId(dialogDescriptionId) .build(); // @formatter:on } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnDiagramElementToolInput.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnDiagramElementToolInput.java index 00118815ab9..eb53994fe3a 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnDiagramElementToolInput.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/InvokeSingleClickOnDiagramElementToolInput.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2023 Obeo and others. + * Copyright (c) 2019, 2024 Obeo and others. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -12,6 +12,7 @@ *******************************************************************************/ package org.eclipse.sirius.components.collaborative.diagrams.dto; +import java.util.List; import java.util.UUID; import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramInput; @@ -22,5 +23,5 @@ * @author pcdavid */ public record InvokeSingleClickOnDiagramElementToolInput(UUID id, String editingContextId, String representationId, String diagramElementId, String toolId, double startingPositionX, - double startingPositionY, String selectedObjectId) implements IDiagramInput { + double startingPositionY, List variables) implements IDiagramInput { } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/SingleClickOnDiagramElementTool.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/SingleClickOnDiagramElementTool.java index 8897ec94994..790ebcb032e 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/SingleClickOnDiagramElementTool.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/SingleClickOnDiagramElementTool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023 Obeo. + * Copyright (c) 2023, 2024 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -22,7 +22,7 @@ * * @author mcharfadi */ -public record SingleClickOnDiagramElementTool(String id, String label, List iconURL, List targetDescriptions, String selectionDescriptionId, +public record SingleClickOnDiagramElementTool(String id, String label, List iconURL, List targetDescriptions, String dialogDescriptionId, boolean appliesToDiagramRoot) implements ITool { public SingleClickOnDiagramElementTool { @@ -53,7 +53,7 @@ public static final class Builder { private List targetDescriptions; - private String selectionDescriptionId; + private String dialogDescriptionId; private boolean appliesToDiagramRoot; @@ -81,13 +81,13 @@ public Builder appliesToDiagramRoot(boolean appliesToDiagramRoot) { return this; } - public Builder selectionDescriptionId(String selectionDescriptionId) { - this.selectionDescriptionId = selectionDescriptionId; + public Builder dialogDescriptionId(String dialogDescriptionId) { + this.dialogDescriptionId = dialogDescriptionId; return this; } public SingleClickOnDiagramElementTool build() { - return new SingleClickOnDiagramElementTool(this.id, this.label, this.iconURL, this.targetDescriptions, this.selectionDescriptionId, this.appliesToDiagramRoot); + return new SingleClickOnDiagramElementTool(this.id, this.label, this.iconURL, this.targetDescriptions, this.dialogDescriptionId, this.appliesToDiagramRoot); } } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ToolVariable.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ToolVariable.java new file mode 100644 index 00000000000..c150712e80c --- /dev/null +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ToolVariable.java @@ -0,0 +1,21 @@ +/******************************************************************************* + * Copyright (c) 2024 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.components.collaborative.diagrams.dto; + +/** + * Represents a ToolVariable entry. + * @author fbarbin + */ +public record ToolVariable(String name, String value, ToolVariableType type) { + +} diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ToolVariableType.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ToolVariableType.java new file mode 100644 index 00000000000..255c3b93f6f --- /dev/null +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/dto/ToolVariableType.java @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2024 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.components.collaborative.diagrams.dto; + +/** + * Represent the Type of the Tool Variable. + * + * @author fbarbin + */ +public enum ToolVariableType { + /** + * The Value is a simple string. + */ + STRING, + /** + * The value represents an Object ID. + */ + OBJECT_ID, + /** + * The value represent an Array of Object IDs, separated by a ",". + */ + OBJECT_ID_ARRAY +} diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandler.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandler.java index cff192b79b1..15c951b5c25 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandler.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandler.java @@ -12,6 +12,7 @@ *******************************************************************************/ package org.eclipse.sirius.components.collaborative.diagrams.handlers; +import java.util.List; import java.util.Objects; import java.util.Optional; @@ -27,6 +28,7 @@ import org.eclipse.sirius.components.collaborative.diagrams.api.IToolService; import org.eclipse.sirius.components.collaborative.diagrams.dto.InvokeSingleClickOnDiagramElementToolInput; import org.eclipse.sirius.components.collaborative.diagrams.dto.InvokeSingleClickOnDiagramElementToolSuccessPayload; +import org.eclipse.sirius.components.collaborative.diagrams.dto.ToolVariable; import org.eclipse.sirius.components.collaborative.diagrams.messages.ICollaborativeDiagramMessageService; import org.eclipse.sirius.components.core.api.Environment; import org.eclipse.sirius.components.core.api.ErrorPayload; @@ -62,6 +64,8 @@ @Service public class InvokeSingleClickOnDiagramElementToolEventHandler implements IDiagramEventHandler { + private static final String OBJECT_ID_ARRAY_SEPARATOR = ","; + private final Logger logger = LoggerFactory.getLogger(InvokeSingleClickOnDiagramElementToolEventHandler.class); private final IObjectService objectService; @@ -76,6 +80,7 @@ public class InvokeSingleClickOnDiagramElementToolEventHandler implements IDiagr private final IRepresentationDescriptionSearchService representationDescriptionSearchService; + public InvokeSingleClickOnDiagramElementToolEventHandler(IObjectService objectService, IDiagramQueryService diagramQueryService, IToolService toolService, ICollaborativeDiagramMessageService messageService, MeterRegistry meterRegistry, IRepresentationDescriptionSearchService representationDescriptionSearchService) { this.objectService = Objects.requireNonNull(objectService); @@ -114,7 +119,7 @@ public void handle(One payloadSink, Many changeDesc // @formatter:on if (optionalTool.isPresent()) { IStatus status = this.executeTool(editingContext, diagramContext, input.diagramElementId(), optionalTool.get(), input.startingPositionX(), input.startingPositionY(), - input.selectedObjectId()); + input.variables()); if (status instanceof Success success) { WorkbenchSelection newSelection = null; Object newSelectionParameter = success.getParameters().get(Success.NEW_SELECTION); @@ -134,7 +139,7 @@ public void handle(One payloadSink, Many changeDesc } private IStatus executeTool(IEditingContext editingContext, IDiagramContext diagramContext, String diagramElementId, SingleClickOnDiagramElementTool tool, double startingPositionX, - double startingPositionY, String selectedObjectId) { + double startingPositionY, List variables) { IStatus result = new Failure(""); Diagram diagram = diagramContext.getDiagram(); Optional node = this.diagramQueryService.findNodeById(diagram, diagramElementId); @@ -149,24 +154,47 @@ private IStatus executeTool(IEditingContext editingContext, IDiagramContext diag if (self.isPresent()) { VariableManager variableManager = this.populateVariableManager(editingContext, diagramContext, node, edge, self); - String selectionDescriptionId = tool.getSelectionDescriptionId(); - if (selectionDescriptionId != null && selectedObjectId != null) { - var selectionDescriptionOpt = this.representationDescriptionSearchService.findById(editingContext, selectionDescriptionId); - var selectedObjectOpt = this.objectService.getObject(editingContext, selectedObjectId); - if (selectionDescriptionOpt.isPresent() && selectedObjectOpt.isPresent()) { - variableManager.put(SingleClickOnDiagramElementTool.SELECTED_OBJECT, selectedObjectOpt.get()); - } + String dialogDescriptionId = tool.getDialogDescriptionId(); + if (dialogDescriptionId != null && !variables.isEmpty()) { + this.handleDialogVariables(editingContext, variableManager, variables); } - if (selectionDescriptionId == null || selectedObjectId != null) { + + //We do not apply the tool if a dialog is defined but no variables have been provided + if (dialogDescriptionId == null || !variables.isEmpty()) { result = tool.getHandler().apply(variableManager); Position newPosition = Position.at(startingPositionX, startingPositionY); - diagramContext.getDiagramEvents().add(new SinglePositionEvent(diagramElementId, newPosition)); } } return result; } + private void handleDialogVariables(IEditingContext editingContext, VariableManager variableManager, List variables) { + variables.forEach(toolVariable -> { + this.handleToolVariable(toolVariable, editingContext, variableManager); + }); + } + + private void handleToolVariable(ToolVariable toolvariable, IEditingContext editingContext, VariableManager variableManager) { + switch (toolvariable.type()) { + case STRING -> variableManager.put(toolvariable.name(), toolvariable.value()); + case OBJECT_ID -> { + var optionalObject = this.objectService.getObject(editingContext, toolvariable.value()); + variableManager.put(toolvariable.name(), optionalObject.orElse(null)); + } + case OBJECT_ID_ARRAY -> { + String value = toolvariable.value(); + List objectsIds = List.of(value.split(OBJECT_ID_ARRAY_SEPARATOR)); + List objects = objectsIds.stream() + .map(objectId -> this.objectService.getObject(editingContext, objectId)) + .map(optionalObject -> optionalObject.orElse(null)) + .toList(); + variableManager.put(toolvariable.name(), objects); + } + default -> this.logger.warn("Unexpected value: " + toolvariable.type()); + } + } + private Optional getCurrentContext(IEditingContext editingContext, String diagramElementId, SingleClickOnDiagramElementTool tool, Diagram diagram, Optional node, Optional edge) { Optional self = Optional.empty(); diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/resources/schema/diagram.graphqls b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/resources/schema/diagram.graphqls index 78da0641f8f..9c434a73e7a 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/resources/schema/diagram.graphqls +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/main/resources/schema/diagram.graphqls @@ -8,10 +8,7 @@ input DiagramEventInput { diagramId: ID! } -union DiagramEventPayload = - ErrorPayload - | SubscribersUpdatedEventPayload - | DiagramRefreshedEventPayload +union DiagramEventPayload = ErrorPayload | SubscribersUpdatedEventPayload | DiagramRefreshedEventPayload type DiagramRefreshedEventPayload { id: ID! @@ -213,7 +210,7 @@ type Edge { routingPoints: [Position]! sourceAnchorRelativePosition: Ratio! targetAnchorRelativePosition: Ratio! - centerLabelEditable : Boolean! + centerLabelEditable: Boolean! } type EdgeStyle { @@ -282,7 +279,7 @@ type SingleClickOnDiagramElementTool implements Tool { label: String! iconURL: [String!]! appliesToDiagramRoot: Boolean! - selectionDescriptionId: String + dialogDescriptionId: String targetDescriptions: [DiagramElementDescription!]! } @@ -357,8 +354,12 @@ extend type Mutation { arrangeAll(input: ArrangeAllInput!): ArrangeAllPayload! deleteFromDiagram(input: DeleteFromDiagramInput!): DeleteFromDiagramPayload! editLabel(input: EditLabelInput!): EditLabelPayload! - invokeSingleClickOnDiagramElementTool(input: InvokeSingleClickOnDiagramElementToolInput!): InvokeSingleClickOnDiagramElementToolPayload! - invokeSingleClickOnTwoDiagramElementsTool(input: InvokeSingleClickOnTwoDiagramElementsToolInput!): InvokeSingleClickOnTwoDiagramElementsToolPayload! + invokeSingleClickOnDiagramElementTool( + input: InvokeSingleClickOnDiagramElementToolInput! + ): InvokeSingleClickOnDiagramElementToolPayload! + invokeSingleClickOnTwoDiagramElementsTool( + input: InvokeSingleClickOnTwoDiagramElementsToolInput! + ): InvokeSingleClickOnTwoDiagramElementsToolPayload! updateNodeBounds(input: UpdateNodeBoundsInput!): UpdateNodeBoundsPayload! updateNodePosition(input: UpdateNodePositionInput!): UpdateNodePositionPayload! dropOnDiagram(input: DropOnDiagramInput!): DropOnDiagramPayload! @@ -442,7 +443,7 @@ input InvokeSingleClickOnTwoDiagramElementsToolInput { } union InvokeSingleClickOnTwoDiagramElementsToolPayload = - ErrorPayload + ErrorPayload | InvokeSingleClickOnTwoDiagramElementsToolSuccessPayload type InvokeSingleClickOnTwoDiagramElementsToolSuccessPayload { @@ -455,16 +456,26 @@ input InvokeSingleClickOnDiagramElementToolInput { id: ID! editingContextId: ID! representationId: ID! - selectedObjectId: String + variables: [ToolVariable!]! diagramElementId: ID! startingPositionX: Float! startingPositionY: Float! toolId: ID! } -union InvokeSingleClickOnDiagramElementToolPayload = - ErrorPayload - | InvokeSingleClickOnDiagramElementToolSuccessPayload +input ToolVariable { + name: String! + value: String! + type: ToolVariableType! +} + +enum ToolVariableType { + STRING + OBJECT_ID + OBJECT_ID_ARRAY +} + +union InvokeSingleClickOnDiagramElementToolPayload = ErrorPayload | InvokeSingleClickOnDiagramElementToolSuccessPayload type InvokeSingleClickOnDiagramElementToolSuccessPayload { id: ID! @@ -499,9 +510,7 @@ input UpdateNodePositionInput { newPositionY: Float! } -union UpdateNodePositionPayload = - ErrorPayload - | UpdateNodePositionSuccessPayload +union UpdateNodePositionPayload = ErrorPayload | UpdateNodePositionSuccessPayload type UpdateNodePositionSuccessPayload { id: ID! @@ -588,7 +597,6 @@ input PinDiagramElementInput { pinned: Boolean! } - union PinDiagramElementPayload = ErrorPayload | SuccessPayload input UpdateCollapsingStateInput { diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandlerTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandlerTests.java index 5940a4557c5..3fec4e84db0 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandlerTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/handlers/InvokeSingleClickOnDiagramElementToolEventHandlerTests.java @@ -14,11 +14,13 @@ import static org.assertj.core.api.Assertions.assertThat; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.UUID; +import java.util.function.Function; import org.eclipse.sirius.components.collaborative.api.ChangeDescription; import org.eclipse.sirius.components.collaborative.api.ChangeKind; @@ -28,6 +30,8 @@ import org.eclipse.sirius.components.collaborative.diagrams.api.IToolService; import org.eclipse.sirius.components.collaborative.diagrams.dto.InvokeSingleClickOnDiagramElementToolInput; import org.eclipse.sirius.components.collaborative.diagrams.dto.InvokeSingleClickOnDiagramElementToolSuccessPayload; +import org.eclipse.sirius.components.collaborative.diagrams.dto.ToolVariable; +import org.eclipse.sirius.components.collaborative.diagrams.dto.ToolVariableType; import org.eclipse.sirius.components.collaborative.diagrams.messages.ICollaborativeDiagramMessageService; import org.eclipse.sirius.components.core.api.ErrorPayload; import org.eclipse.sirius.components.core.api.IEditingContext; @@ -60,7 +64,9 @@ import org.eclipse.sirius.components.diagrams.description.NodeDescription; import org.eclipse.sirius.components.diagrams.tools.ITool; import org.eclipse.sirius.components.diagrams.tools.SingleClickOnDiagramElementTool; +import org.eclipse.sirius.components.representations.IStatus; import org.eclipse.sirius.components.representations.Success; +import org.eclipse.sirius.components.representations.VariableManager; import org.junit.jupiter.api.Test; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; @@ -75,6 +81,28 @@ */ public class InvokeSingleClickOnDiagramElementToolEventHandlerTests { + /** + * + */ + private static final String NAME_VARIABLE_VALUE = "nameVariableValue"; + + /** + * + */ + private static final String NAME_VARIABLE = "name"; + + /** + * + */ + private static final String SELECTED_OBJECTS = "selectedObjects"; + + /** + * + */ + private static final String SELECTED_OBJECT = "selectedObject"; + + private static final String DIALOG_DESCRIPTION_ID = "dialogDescriptionId"; + private static final String DIAGRAM_ID = "diagramId"; private static final String EDGE_1_ID = "edge1"; @@ -89,11 +117,15 @@ public class InvokeSingleClickOnDiagramElementToolEventHandlerTests { private static final String OBJECT_1_ID = "object1"; + private static final String OBJECT_2_ID = "object2"; + + private static final String OBJECT_3_ID = "object3"; + private static final String LINK_1_ID = "link1"; private static final String REPRESENTATION_ID = "representationId"; - private static final String SELECTED_OBJECT_ID = "selectedObjectId"; + private static final List VARIABLES = List.of(); private static final String TOOL_ID = "toolId"; @@ -125,7 +157,7 @@ public Optional findToolById(IEditingContext editingContext, Diagram diag var handler = new InvokeSingleClickOnDiagramElementToolEventHandler(objectService, diagramQueryService, toolService, new ICollaborativeDiagramMessageService.NoOp(), new SimpleMeterRegistry(), representationDescriptionSearchService); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), EDITING_CONTEXT_ID, REPRESENTATION_ID, DIAGRAM_ID, TOOL_ID, 5.0, 8.0, SELECTED_OBJECT_ID); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), EDITING_CONTEXT_ID, REPRESENTATION_ID, DIAGRAM_ID, TOOL_ID, 5.0, 8.0, VARIABLES); IEditingContext editingContext = () -> EDITING_CONTEXT_ID; @@ -178,7 +210,78 @@ public Optional findToolById(IEditingContext editingContext, Diagram diag var handler = new InvokeSingleClickOnDiagramElementToolEventHandler(objectService, diagramQueryService, toolService, new ICollaborativeDiagramMessageService.NoOp(), new SimpleMeterRegistry(), representationDescriptionSearchService); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), EDITING_CONTEXT_ID, REPRESENTATION_ID, NODE_1_ID, TOOL_ID, 5.0, 8.0, SELECTED_OBJECT_ID); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), EDITING_CONTEXT_ID, REPRESENTATION_ID, NODE_1_ID, TOOL_ID, 5.0, 8.0, VARIABLES); + + IEditingContext editingContext = () -> EDITING_CONTEXT_ID; + + assertThat(handler.canHandle(input)).isTrue(); + + Many changeDescriptionSink = Sinks.many().unicast().onBackpressureBuffer(); + One payloadSink = Sinks.one(); + + IDiagramContext diagramContext = new DiagramContext(new TestDiagramBuilder().getDiagram(DIAGRAM_ID)); + handler.handle(payloadSink, changeDescriptionSink, editingContext, diagramContext, input); + + ChangeDescription changeDescription = changeDescriptionSink.asFlux().blockFirst(); + assertThat(changeDescription.getKind()).isEqualTo(ChangeKind.SEMANTIC_CHANGE); + + IPayload payload = payloadSink.asMono().block(); + assertThat(payload).isInstanceOf(InvokeSingleClickOnDiagramElementToolSuccessPayload.class); + } + + @Test + public void testInvokeToolOnNodeWithDialogDescription() { + var object1 = new Object(); + var object2 = new Object(); + var object3 = new Object(); + + var objectService = new IObjectService.NoOp() { + @Override + public Optional getObject(IEditingContext editingContext, String objectId) { + Object object = switch (objectId) { + case OBJECT_1_ID -> object1; + case OBJECT_2_ID -> object2; + case OBJECT_3_ID -> object3; + default -> null; + }; + return Optional.of(object); + } + }; + + var nodeDescription = this.createNodeDescription(NODE_DESCRIPTION_ID); + var node1 = this.createNode(NODE_1_ID, NODE_DESCRIPTION_ID, OBJECT_1_ID); + + var diagramQueryService = new IDiagramQueryService.NoOp() { + @Override + public Optional findNodeById(Diagram diagram, String nodeId) { + return Optional.of(node1); + } + }; + + final Map computedVariables = new HashMap<>(); + + Function toolHandler = variableManager -> { + computedVariables.putAll(variableManager.getVariables()); + return new Success(ChangeKind.SEMANTIC_CHANGE, Map.of()); + }; + + var tool = this.createTool(TOOL_ID, false, List.of(nodeDescription), DIALOG_DESCRIPTION_ID, toolHandler); + + var toolService = new IToolService.NoOp() { + @Override + public Optional findToolById(IEditingContext editingContext, Diagram diagram, String toolId) { + return Optional.of(tool); + } + }; + var representationDescriptionSearchService = new IRepresentationDescriptionSearchService.NoOp(); + + var handler = new InvokeSingleClickOnDiagramElementToolEventHandler(objectService, diagramQueryService, toolService, new ICollaborativeDiagramMessageService.NoOp(), new SimpleMeterRegistry(), + representationDescriptionSearchService); + + var variables = List.of(new ToolVariable(SELECTED_OBJECT, OBJECT_2_ID, ToolVariableType.OBJECT_ID), new ToolVariable(NAME_VARIABLE, NAME_VARIABLE_VALUE, ToolVariableType.STRING), + new ToolVariable(SELECTED_OBJECTS, OBJECT_1_ID + "," + OBJECT_2_ID + "," + OBJECT_3_ID, ToolVariableType.OBJECT_ID_ARRAY)); + + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), EDITING_CONTEXT_ID, REPRESENTATION_ID, NODE_1_ID, TOOL_ID, 5.0, 8.0, variables); IEditingContext editingContext = () -> EDITING_CONTEXT_ID; @@ -195,6 +298,7 @@ public Optional findToolById(IEditingContext editingContext, Diagram diag IPayload payload = payloadSink.asMono().block(); assertThat(payload).isInstanceOf(InvokeSingleClickOnDiagramElementToolSuccessPayload.class); + assertThat(computedVariables).containsEntry(SELECTED_OBJECT, object2).containsEntry(NAME_VARIABLE, NAME_VARIABLE_VALUE).containsEntry(SELECTED_OBJECTS, List.of(object1, object2, object3)); } @Test @@ -234,7 +338,7 @@ public Optional findToolById(IEditingContext editingContext, Diagram diag var handler = new InvokeSingleClickOnDiagramElementToolEventHandler(objectService, diagramQueryService, toolService, new ICollaborativeDiagramMessageService.NoOp(), new SimpleMeterRegistry(), representationDescriptionSearchService); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), EDITING_CONTEXT_ID, REPRESENTATION_ID, "anotherNodeId", TOOL_ID, 5.0, 8.0, SELECTED_OBJECT_ID); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), EDITING_CONTEXT_ID, REPRESENTATION_ID, "anotherNodeId", TOOL_ID, 5.0, 8.0, VARIABLES); IEditingContext editingContext = () -> EDITING_CONTEXT_ID; @@ -290,7 +394,7 @@ public Optional findToolById(IEditingContext editingContext, Diagram diag var handler = new InvokeSingleClickOnDiagramElementToolEventHandler(objectService, diagramQueryService, toolService, new ICollaborativeDiagramMessageService.NoOp(), new SimpleMeterRegistry(), representationDescriptionSearchService); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), EDITING_CONTEXT_ID, REPRESENTATION_ID, EDGE_1_ID, TOOL_ID, 5.0, 8.0, SELECTED_OBJECT_ID); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), EDITING_CONTEXT_ID, REPRESENTATION_ID, EDGE_1_ID, TOOL_ID, 5.0, 8.0, VARIABLES); IEditingContext editingContext = () -> EDITING_CONTEXT_ID; @@ -346,7 +450,7 @@ public Optional findToolById(IEditingContext editingContext, Diagram diag var handler = new InvokeSingleClickOnDiagramElementToolEventHandler(objectService, diagramQueryService, toolService, new ICollaborativeDiagramMessageService.NoOp(), new SimpleMeterRegistry(), representationDescriptionSearchService); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), EDITING_CONTEXT_ID, REPRESENTATION_ID, "anotherEdgeId", TOOL_ID, 5.0, 8.0, SELECTED_OBJECT_ID); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), EDITING_CONTEXT_ID, REPRESENTATION_ID, "anotherEdgeId", TOOL_ID, 5.0, 8.0, VARIABLES); IEditingContext editingContext = () -> EDITING_CONTEXT_ID; @@ -366,12 +470,16 @@ public Optional findToolById(IEditingContext editingContext, Diagram diag } private SingleClickOnDiagramElementTool createTool(String toolId, boolean appliesToDiagramRoot, List diagramElementsDescriptions) { + return this.createTool(toolId, appliesToDiagramRoot, diagramElementsDescriptions, null, variableManager -> new Success(ChangeKind.SEMANTIC_CHANGE, Map.of())); + } + + private SingleClickOnDiagramElementTool createTool(String toolId, boolean appliesToDiagramRoot, List diagramElementsDescriptions, String dialogDescriptionId, Function handler) { return SingleClickOnDiagramElementTool.newSingleClickOnDiagramElementTool(toolId) .label(TOOL_LABEL) .iconURL(List.of(TOOL_IMAGE_URL)) .targetDescriptions(diagramElementsDescriptions) - .selectionDescriptionId(null) - .handler(variableManager -> new Success(ChangeKind.SEMANTIC_CHANGE, Map.of())) + .dialogDescriptionId(dialogDescriptionId) + .handler(handler) .appliesToDiagramRoot(appliesToDiagramRoot) .build(); } diff --git a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/providers/GenericDiagramToolReferencePositionProviderTests.java b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/providers/GenericDiagramToolReferencePositionProviderTests.java index b990fbe31bb..664de00e5c0 100644 --- a/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/providers/GenericDiagramToolReferencePositionProviderTests.java +++ b/packages/diagrams/backend/sirius-components-collaborative-diagrams/src/test/java/org/eclipse/sirius/components/collaborative/diagrams/providers/GenericDiagramToolReferencePositionProviderTests.java @@ -42,7 +42,7 @@ public void canHandle() { var diagramToolReferencePositionProvider = new GenericDiagramToolReferencePositionProvider(); InvokeSingleClickOnDiagramElementToolInput inputInvokeSingleClick = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), "", "", - "", "", 0, 0, ""); + "", "", 0, 0, List.of()); assertThat(diagramToolReferencePositionProvider.canHandle(inputInvokeSingleClick)).isTrue(); DropNodeInput inputDropNode = new DropNodeInput(UUID.randomUUID(), "", "", "", "", 0, 0); assertThat(diagramToolReferencePositionProvider.canHandle(inputDropNode)).isTrue(); @@ -60,12 +60,12 @@ public void getReferencePositionInvokeSingleClickOnDiagramElementTool() { IDiagramContext diagramContext = new DiagramContext(new TestDiagramBuilder().getDiagram(diagramId)); // Test click on diagram InvokeSingleClickOnDiagramElementToolInput inputInvokeSingleClickOnDiagram = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), "", "", - diagramId, "", 3, 2, ""); + diagramId, "", 3, 2, List.of()); var result = diagramToolReferencePositionProvider.getReferencePosition(inputInvokeSingleClickOnDiagram, diagramContext); this.assertResult(result, null, new Position(3, 2)); // Test click on container InvokeSingleClickOnDiagramElementToolInput inputInvokeSingleClickOnContainer = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), "", "", - CONTAINER_ID, "", 3, 2, ""); + CONTAINER_ID, "", 3, 2, List.of()); result = diagramToolReferencePositionProvider.getReferencePosition(inputInvokeSingleClickOnContainer, diagramContext); this.assertResult(result, CONTAINER_ID, new Position(3, 2)); } diff --git a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/graphql/PaletteQueryRunner.java b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/graphql/PaletteQueryRunner.java index 4e40b973527..798a8b58693 100644 --- a/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/graphql/PaletteQueryRunner.java +++ b/packages/diagrams/backend/sirius-components-diagrams-tests/src/main/java/org/eclipse/sirius/components/diagrams/tests/graphql/PaletteQueryRunner.java @@ -54,7 +54,7 @@ query getPalette($editingContextId: ID!, $representationId: ID!, $diagramElement } } } - + fragment ToolFields on Tool { __typename id @@ -65,7 +65,7 @@ query getPalette($editingContextId: ID!, $representationId: ID!, $diagramElement id } appliesToDiagramRoot - selectionDescriptionId + dialogDescriptionId } } """; diff --git a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnDiagramElementTool.java b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnDiagramElementTool.java index f51e7cc5ab2..570b757d87d 100644 --- a/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnDiagramElementTool.java +++ b/packages/diagrams/backend/sirius-components-diagrams/src/main/java/org/eclipse/sirius/components/diagrams/tools/SingleClickOnDiagramElementTool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2023 Obeo. + * Copyright (c) 2019, 2024 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -45,7 +45,7 @@ public final class SingleClickOnDiagramElementTool implements ITool { private boolean appliesToDiagramRoot; - private String selectionDescriptionId; + private String dialogDescriptionId; private SingleClickOnDiagramElementTool() { // Prevent instantiation @@ -78,8 +78,8 @@ public String getLabel() { return this.label; } - public String getSelectionDescriptionId() { - return this.selectionDescriptionId; + public String getDialogDescriptionId() { + return this.dialogDescriptionId; } @Override @@ -113,7 +113,7 @@ public static final class Builder { private boolean appliesToDiagramRoot; - private String selectionDescriptionId; + private String dialogDescriptionId; private Builder(String id) { this.id = Objects.requireNonNull(id); @@ -144,8 +144,8 @@ public Builder handler(Function handler) { return this; } - public Builder selectionDescriptionId(String selectionDescriptionId) { - this.selectionDescriptionId = selectionDescriptionId; + public Builder dialogDescriptionId(String dialogDescriptionId) { + this.dialogDescriptionId = dialogDescriptionId; return this; } @@ -157,7 +157,7 @@ public SingleClickOnDiagramElementTool build() { tool.handler = Objects.requireNonNull(this.handler); tool.targetDescriptions = Objects.requireNonNull(this.targetDescriptions); tool.appliesToDiagramRoot = this.appliesToDiagramRoot; - tool.selectionDescriptionId = this.selectionDescriptionId; + tool.dialogDescriptionId = this.dialogDescriptionId; return tool; } } diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/DialogContext.tsx b/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/DialogContext.tsx new file mode 100644 index 00000000000..99f321335d5 --- /dev/null +++ b/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/DialogContext.tsx @@ -0,0 +1,79 @@ +/******************************************************************************* + * Copyright (c) 2024 Obeo and others. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ + +import { useData } from '@eclipse-sirius/sirius-components-core'; +import React, { useState } from 'react'; +import { GQLToolVariable } from '../renderer/palette/Palette.types'; +import { DialogContextProviderState, DialogContextValue } from './DialogContext.types'; +import { diagramDialogContributionExtensionPoint } from './diagramDialogExtensionPoint'; +import { DiagramDialogContribution, DialogComponentProps } from './diagramDialogExtensionPoint.types'; + +const defaultValue: DialogContextValue = { + showDialog: () => {}, +}; + +export const DialogContext = React.createContext(defaultValue); + +export const DialogContextProvider = ({ children }) => { + const [state, setState] = useState({ + dialogDescriptionId: undefined, + dialogKindId: undefined, + editingContextId: undefined, + targetObjectId: undefined, + onConfirm: () => {}, + open: false, + }); + + const { data: dialogContributions } = useData(diagramDialogContributionExtensionPoint); + const showDialog = ( + dialogKindId: string, + editingContextId: string, + dialogDescriptionId, + targetObjectId, + onConfirm: (variables: GQLToolVariable[]) => void + ) => { + setState({ open: true, dialogKindId, editingContextId, dialogDescriptionId, targetObjectId, onConfirm }); + }; + + const onFinish = (toolVariables: GQLToolVariable[]) => { + state.onConfirm(toolVariables); + setState((prevState) => ({ ...prevState, open: false, dialogKindId: undefined })); + }; + + const onClose = () => { + setState((prevState) => ({ ...prevState, open: false, dialogKindId: undefined })); + }; + + let DialogComponent: React.ComponentType | undefined; + const dialogComponentProps: DialogComponentProps = { + dialogDescriptionId: state.dialogDescriptionId ?? '', + editingContextId: state.editingContextId ?? '', + targetObjectId: state.targetObjectId ?? '', + onFinish, + onClose, + }; + if (state.open && state.dialogKindId) { + const dialogContribution: DiagramDialogContribution | undefined = dialogContributions.find((dialogContribution) => + dialogContribution.canHandle(state.dialogKindId as string) + ); + if (dialogContribution) { + DialogComponent = dialogContribution.component; + } + } + return ( + + {children} + {state.open && DialogComponent && } + + ); +}; diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/DialogContext.types.ts b/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/DialogContext.types.ts new file mode 100644 index 00000000000..39dd0130f5b --- /dev/null +++ b/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/DialogContext.types.ts @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2024 Obeo and others. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ + +import { GQLToolVariable } from '../renderer/palette/Palette.types'; + +export interface DialogContextValue { + showDialog: ( + dialogKindId: string, + editingContextId: string, + dialogDescriptionId: string, + targetObjectId: string, + onConfirm: (variables: GQLToolVariable[]) => void + ) => void; +} + +export interface DialogContextProviderState { + open: boolean; + dialogKindId: string | undefined; + editingContextId: string | undefined; + dialogDescriptionId: string | undefined; + targetObjectId: string | undefined; + onConfirm: (variables: GQLToolVariable[]) => void; +} diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/diagramDialogExtensionPoint.ts b/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/diagramDialogExtensionPoint.ts new file mode 100644 index 00000000000..39845b80d80 --- /dev/null +++ b/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/diagramDialogExtensionPoint.ts @@ -0,0 +1,19 @@ +/******************************************************************************* + * Copyright (c) 2024 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +import { DataExtensionPoint } from '@eclipse-sirius/sirius-components-core'; +import { DiagramDialogContribution } from './diagramDialogExtensionPoint.types'; + +export const diagramDialogContributionExtensionPoint: DataExtensionPoint> = { + identifier: 'diagram#diagramDialogContribution', + fallback: [], +}; diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/diagramDialogExtensionPoint.types.ts b/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/diagramDialogExtensionPoint.types.ts new file mode 100644 index 00000000000..64083f7f1e1 --- /dev/null +++ b/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/diagramDialogExtensionPoint.types.ts @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2024 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ + +import { GQLToolVariable } from '../renderer/palette/Palette.types'; +export interface DiagramDialogContribution { + canHandle: (dialogKindId: string) => boolean; + component: React.ComponentType; +} + +export interface DialogComponentProps { + editingContextId: string; + dialogDescriptionId: string; + targetObjectId: string; + onClose: () => void; + onFinish: (variables: GQLToolVariable[]) => void; +} diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/useDialog.tsx b/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/useDialog.tsx new file mode 100644 index 00000000000..1d422c4bd6b --- /dev/null +++ b/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/useDialog.tsx @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2024 Obeo and others. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ + +import { useContext } from 'react'; +import { DialogContext } from './DialogContext'; +import { UseDialogValue } from './useDialog.types'; + +export const useDialog = (): UseDialogValue => { + const { showDialog } = useContext(DialogContext); + + return { showDialog }; +}; diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/useDialog.types.ts b/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/useDialog.types.ts new file mode 100644 index 00000000000..789f91a1539 --- /dev/null +++ b/packages/diagrams/frontend/sirius-components-diagrams/src/dialog/useDialog.types.ts @@ -0,0 +1,22 @@ +/******************************************************************************* + * Copyright (c) 2024 Obeo and others. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +import { GQLToolVariable } from '../renderer/palette/Palette.types'; +export interface UseDialogValue { + showDialog: ( + dialogKindId: string, + editingContextID: string, + dialogDescriptionId: string, + targetObjectId: string, + onConfirm: (variables: GQLToolVariable[]) => void + ) => void; +} diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/index.ts b/packages/diagrams/frontend/sirius-components-diagrams/src/index.ts index a1a58ad62c6..28167e90b06 100644 --- a/packages/diagrams/frontend/sirius-components-diagrams/src/index.ts +++ b/packages/diagrams/frontend/sirius-components-diagrams/src/index.ts @@ -20,6 +20,8 @@ export { convertLineStyle, isListLayoutStrategy } from './converter/convertDiagr export { AlignmentMap } from './converter/convertDiagram.types'; export { convertHandles } from './converter/convertHandles'; export { convertInsideLabel, convertLabelStyle, convertOutsideLabels } from './converter/convertLabel'; +export { diagramDialogContributionExtensionPoint } from './dialog/diagramDialogExtensionPoint'; +export type { DiagramDialogContribution, DialogComponentProps } from './dialog/diagramDialogExtensionPoint.types'; export type { GQLNodeDescription } from './graphql/query/nodeDescriptionFragment.types'; export type { GQLDiagram, GQLNodeLayoutData } from './graphql/subscription/diagramFragment.types'; export type { GQLEdge } from './graphql/subscription/edgeFragment.types'; @@ -52,5 +54,7 @@ export type { DiagramPaletteToolContextValue } from './renderer/palette/DiagramP export { DiagramPaletteToolContext } from './renderer/palette/DiagramPaletteToolContext'; export { DiagramPaletteToolContribution } from './renderer/palette/DiagramPaletteToolContribution'; export type { DiagramPaletteToolContributionComponentProps } from './renderer/palette/DiagramPaletteToolContribution.types'; +export { GQLToolVariableType } from './renderer/palette/Palette.types'; +export type { GQLToolVariable } from './renderer/palette/Palette.types'; export { DiagramRepresentation } from './representation/DiagramRepresentation'; export type { GQLDiagramDescription } from './representation/DiagramRepresentation.types'; diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/Palette.tsx b/packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/Palette.tsx index 479db750975..8d26d15c059 100644 --- a/packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/Palette.tsx +++ b/packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/Palette.tsx @@ -23,6 +23,7 @@ import React, { useCallback, useContext, useEffect, useState } from 'react'; import { useReactFlow, useViewport } from 'reactflow'; import { DiagramContext } from '../../contexts/DiagramContext'; import { DiagramContextValue } from '../../contexts/DiagramContext.types'; +import { useDialog } from '../../dialog/useDialog'; import { PinIcon } from '../../icons/PinIcon'; import { UnpinIcon } from '../../icons/UnpinIcon'; import { EdgeData, NodeData } from '../DiagramRenderer.types'; @@ -55,6 +56,7 @@ import { GQLRepresentationDescription, GQLSingleClickOnDiagramElementTool, GQLTool, + GQLToolVariable, GQLUpdateCollapsingStateData, GQLUpdateCollapsingStateInput, GQLUpdateCollapsingStateVariables, @@ -95,7 +97,7 @@ const ToolFields = gql` id } appliesToDiagramRoot - selectionDescriptionId + dialogDescriptionId } } `; @@ -225,6 +227,7 @@ export const Palette = ({ const { addErrorMessage, addMessages } = useMultiToast(); const { showDeletionConfirmation } = useDeletionConfirmationDialog(); + const { showDialog } = useDialog(); const diagramPaletteToolComponents = useContext(DiagramPaletteToolContext) .filter((contribution) => contribution.props.canHandle(diagramId, diagramElementId)) @@ -324,7 +327,7 @@ export const Palette = ({ >(invokeSingleClickOnDiagramElementToolMutation); const invokeSingleClickTool = useCallback( - async (tool: GQLTool) => { + async (tool: GQLTool, variables: GQLToolVariable[]) => { if (isSingleClickOnDiagramElementTool(tool)) { const { id: toolId } = tool; const input: GQLInvokeSingleClickOnDiagramElementToolInput = { @@ -335,7 +338,7 @@ export const Palette = ({ toolId, startingPositionX: x, startingPositionY: y, - selectedObjectId: null, + variables, }; const { data } = await invokeSingleClickOnDiagramElementTool({ @@ -432,7 +435,16 @@ export const Palette = ({ collapseExpandElement(diagramElementId, GQLCollapsingState.COLLAPSED); break; default: - invokeSingleClickTool(tool); + if (isSingleClickOnDiagramElementTool(tool)) { + if (tool.dialogDescriptionId) { + const onConfirm = (variables: GQLToolVariable[]) => { + invokeSingleClickTool(tool, variables); + }; + showDialog('SELECTION_DIALOG_ID', editingContextId, tool.dialogDescriptionId, diagramElementId, onConfirm); + } else { + invokeSingleClickTool(tool, []); + } + } break; } }; diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/Palette.types.ts b/packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/Palette.types.ts index a6ce455a33e..a198ad1c41a 100644 --- a/packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/Palette.types.ts +++ b/packages/diagrams/frontend/sirius-components-diagrams/src/renderer/palette/Palette.types.ts @@ -73,7 +73,18 @@ export interface GQLInvokeSingleClickOnDiagramElementToolInput { toolId: string; startingPositionX: number; startingPositionY: number; - selectedObjectId: string | null; + variables: GQLToolVariable[]; +} +export interface GQLToolVariable { + name: string; + value: string; + type: GQLToolVariableType; +} + +export enum GQLToolVariableType { + string = 'STRING', + objectId = 'OBJECT_ID', + objectIdArray = 'OBJECT_ID_ARRAY', } export interface GQLTool { @@ -85,7 +96,7 @@ export interface GQLTool { export interface GQLSingleClickOnDiagramElementTool extends GQLTool { appliesToDiagramRoot: boolean; - selectionDescriptionId: string; + dialogDescriptionId: string; } export interface GQLGetToolSectionsVariables { diff --git a/packages/diagrams/frontend/sirius-components-diagrams/src/representation/DiagramRepresentation.tsx b/packages/diagrams/frontend/sirius-components-diagrams/src/representation/DiagramRepresentation.tsx index 7dcbec8c969..b3fb6974083 100644 --- a/packages/diagrams/frontend/sirius-components-diagrams/src/representation/DiagramRepresentation.tsx +++ b/packages/diagrams/frontend/sirius-components-diagrams/src/representation/DiagramRepresentation.tsx @@ -19,6 +19,7 @@ import { DiagramContext } from '../contexts/DiagramContext'; import { DiagramDescriptionContext } from '../contexts/DiagramDescriptionContext'; import { NodeTypeContext } from '../contexts/NodeContext'; import { NodeTypeContextValue } from '../contexts/NodeContext.types'; +import { DialogContextProvider } from '../dialog/DialogContext'; import { diagramEventSubscription } from '../graphql/subscription/diagramEventSubscription'; import { GQLDiagramEventPayload, @@ -187,10 +188,12 @@ export const DiagramRepresentation = ({ data-representation-label={state.diagramRefreshedEventPayload.diagram.metadata.label}> - + + + diff --git a/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/SelectionEventProcessor.java b/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/SelectionEventProcessor.java index 5fd7ef82ac4..1a5585aabc9 100644 --- a/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/SelectionEventProcessor.java +++ b/packages/selection/backend/sirius-components-collaborative-selection/src/main/java/org/eclipse/sirius/components/collaborative/selection/SelectionEventProcessor.java @@ -51,6 +51,8 @@ */ public class SelectionEventProcessor implements ISelectionEventProcessor { + private static final String TARGET_ELEMENT = "targetElement"; + private final Logger logger = LoggerFactory.getLogger(SelectionEventProcessor.class); private final IEditingContext editingContext; @@ -133,7 +135,13 @@ private IRepresentationRefreshPolicy getDefaultRefreshPolicy() { private Selection refreshSelection() { VariableManager variableManager = new VariableManager(); var optionalObject = this.objectService.getObject(this.editingContext, this.objectId); + var optionalTargetElement = optionalObject + .filter(IRepresentation.class::isInstance) + .map(IRepresentation.class::cast) + .map(IRepresentation::getTargetObjectId) + .flatMap(targetObjectId -> this.objectService.getObject(this.editingContext, targetObjectId)); variableManager.put(VariableManager.SELF, optionalObject.orElse(null)); + variableManager.put(TARGET_ELEMENT, optionalTargetElement.orElse(null)); variableManager.put(IEditingContext.EDITING_CONTEXT, this.editingContext); variableManager.put(GetOrCreateRandomIdProvider.PREVIOUS_REPRESENTATION_ID, this.id); diff --git a/packages/selection/frontend/sirius-components-selection/package.json b/packages/selection/frontend/sirius-components-selection/package.json index 75f802b534d..cd55cad13f0 100644 --- a/packages/selection/frontend/sirius-components-selection/package.json +++ b/packages/selection/frontend/sirius-components-selection/package.json @@ -32,6 +32,7 @@ "peerDependencies": { "@apollo/client": "3.10.4", "@eclipse-sirius/sirius-components-core": "*", + "@eclipse-sirius/sirius-components-diagrams": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", "@xstate/react": "1.6.3", @@ -42,6 +43,7 @@ "devDependencies": { "@apollo/client": "3.10.4", "@eclipse-sirius/sirius-components-core": "*", + "@eclipse-sirius/sirius-components-diagrams": "*", "@eclipse-sirius/sirius-components-tsconfig": "*", "@material-ui/core": "4.12.4", "@material-ui/icons": "4.11.3", diff --git a/packages/selection/frontend/sirius-components-selection/src/SelectionDialog.tsx b/packages/selection/frontend/sirius-components-selection/src/SelectionDialog.tsx index 13541f758e4..9965a4da815 100644 --- a/packages/selection/frontend/sirius-components-selection/src/SelectionDialog.tsx +++ b/packages/selection/frontend/sirius-components-selection/src/SelectionDialog.tsx @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021, 2023 Obeo. + * Copyright (c) 2021, 2024 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -12,6 +12,7 @@ *******************************************************************************/ import { gql, useSubscription } from '@apollo/client'; import { IconOverlay, Toast } from '@eclipse-sirius/sirius-components-core'; +import { DialogComponentProps, GQLToolVariableType } from '@eclipse-sirius/sirius-components-diagrams'; import Button from '@material-ui/core/Button'; import Dialog from '@material-ui/core/Dialog'; import DialogActions from '@material-ui/core/DialogActions'; @@ -26,7 +27,6 @@ import { createStyles, makeStyles } from '@material-ui/core/styles'; import CropDinIcon from '@material-ui/icons/CropDin'; import { useMachine } from '@xstate/react'; import { useEffect } from 'react'; -import { SelectionDialogProps } from './SelectionDialog.types'; import { HandleCompleteEvent, HandleSelectionUpdatedEvent, @@ -35,8 +35,8 @@ import { SchemaValue, SelectionDialogContext, SelectionDialogEvent, - selectionDialogMachine, ShowToastEvent, + selectionDialogMachine, } from './SelectionDialogMachine'; import { GQLSelectionEventSubscription } from './SelectionEvent.types'; @@ -71,13 +71,15 @@ const useSelectionObjectModalStyles = makeStyles((_theme) => }) ); +export const SELECTION_DIALOG_ID: string = 'SELECTION_DIALOG_ID'; + export const SelectionDialog = ({ editingContextId, - selectionRepresentationId, + dialogDescriptionId, targetObjectId, onClose, onFinish, -}: SelectionDialogProps) => { +}: DialogComponentProps) => { const classes = useSelectionObjectModalStyles(); const [{ value, context }, dispatch] = useMachine( @@ -92,7 +94,7 @@ export const SelectionDialog = ({ input: { id, editingContextId, - selectionId: selectionRepresentationId, + selectionId: dialogDescriptionId, targetObjectId: targetObjectId, }, }, @@ -174,7 +176,7 @@ export const SelectionDialog = ({ color="primary" onClick={() => { if (selectedObjectId) { - onFinish(selectedObjectId); + onFinish([{ name: 'selectedObject', value: selectedObjectId, type: GQLToolVariableType.objectId }]); } }}> Finish diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/test/java/org/eclipse/sirius/web/sample/tests/integration/view/ViewDiagramIntegrationTests.java b/packages/sirius-web/backend/sirius-web-sample-application/src/test/java/org/eclipse/sirius/web/sample/tests/integration/view/ViewDiagramIntegrationTests.java index 952dd9da04a..df465bdbec3 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/test/java/org/eclipse/sirius/web/sample/tests/integration/view/ViewDiagramIntegrationTests.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/test/java/org/eclipse/sirius/web/sample/tests/integration/view/ViewDiagramIntegrationTests.java @@ -21,6 +21,7 @@ import com.jayway.jsonpath.JsonPath; import java.time.Duration; +import java.util.List; import java.util.Map; import java.util.UUID; import java.util.function.Predicate; @@ -412,7 +413,7 @@ mutation invokeSingleClickOnDiagramElementTool($input: InvokeSingleClickOnDiagra toolId, 0d, 0d, - null + List.of() ); var invokeToolExecutionInput = ExecutionInput.newExecutionInput() diff --git a/packages/sirius-web/backend/sirius-web-sample-application/src/test/java/org/eclipse/sirius/web/sample/tests/integration/view/ViewInitialDirectEditElementLabelProviderIntegrationTests.java b/packages/sirius-web/backend/sirius-web-sample-application/src/test/java/org/eclipse/sirius/web/sample/tests/integration/view/ViewInitialDirectEditElementLabelProviderIntegrationTests.java index daae39b646c..5aa771d9ae7 100644 --- a/packages/sirius-web/backend/sirius-web-sample-application/src/test/java/org/eclipse/sirius/web/sample/tests/integration/view/ViewInitialDirectEditElementLabelProviderIntegrationTests.java +++ b/packages/sirius-web/backend/sirius-web-sample-application/src/test/java/org/eclipse/sirius/web/sample/tests/integration/view/ViewInitialDirectEditElementLabelProviderIntegrationTests.java @@ -21,6 +21,7 @@ import com.jayway.jsonpath.JsonPath; import java.time.Duration; +import java.util.List; import java.util.Map; import java.util.UUID; import java.util.function.Predicate; @@ -416,7 +417,7 @@ mutation invokeSingleClickOnDiagramElementTool($input: InvokeSingleClickOnDiagra toolId, 0d, 0d, - null + List.of() ); var invokeToolExecutionInput = ExecutionInput.newExecutionInput() diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/ExpandCollapseDiagramControllerTests.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/ExpandCollapseDiagramControllerTests.java index c9b952314f0..b7c5e901252 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/ExpandCollapseDiagramControllerTests.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/ExpandCollapseDiagramControllerTests.java @@ -19,6 +19,7 @@ import com.jayway.jsonpath.JsonPath; import java.time.Duration; +import java.util.List; import java.util.Optional; import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; @@ -136,7 +137,7 @@ public void givenDiagramWithCollapsedNodesByDefaultWhenToolExpandingNodesIsInvok Runnable expandNodes = () -> { String expandToolId = this.expandCollapseDiagramDescriptionProvider.getExpandNodeToolId(); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), collapsedNodeId.get(), expandToolId, 0, 0, null); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), collapsedNodeId.get(), expandToolId, 0, 0, List.of()); var result = this.invokeSingleClickOnDiagramElementToolMutationRunner.run(input); String typename = JsonPath.read(result, "$.data.invokeSingleClickOnDiagramElementTool.__typename"); @@ -182,7 +183,7 @@ public void givenDiagramWithCollapsedNodesByDefaultWhenToolCollapsingNodesIsInvo Runnable collapseNodes = () -> { String collapseToolId = this.expandCollapseDiagramDescriptionProvider.getCollapseNodeToolId(); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), expandedNodeId.get(), collapseToolId, 0, 0, null); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), expandedNodeId.get(), collapseToolId, 0, 0, List.of()); var invokeSingleClickOnDiagramElementToolResult = this.invokeSingleClickOnDiagramElementToolMutationRunner.run(input); String invokeSingleClickOnDiagramElementToolResultTypename = JsonPath.read(invokeSingleClickOnDiagramElementToolResult, "$.data.invokeSingleClickOnDiagramElementTool.__typename"); diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/ModelOperationDiagramControllerTests.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/ModelOperationDiagramControllerTests.java index 0104fb603e1..6b59c861631 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/ModelOperationDiagramControllerTests.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/ModelOperationDiagramControllerTests.java @@ -18,6 +18,7 @@ import com.jayway.jsonpath.JsonPath; import java.time.Duration; +import java.util.List; import java.util.Optional; import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; @@ -107,7 +108,7 @@ public void givenDiagramWhenToolWithComplexModelOperationsIsExecutedThenItWorksA Runnable createNode = () -> { var createNodeToolId = this.modelOperationDiagramDescriptionProvider.getCreateNodeToolId(); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), diagramId.get(), createNodeToolId, 0, 0, null); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), diagramId.get(), createNodeToolId, 0, 0, List.of()); var result = this.invokeSingleClickOnDiagramElementToolMutationRunner.run(input); String typename = JsonPath.read(result, "$.data.invokeSingleClickOnDiagramElementTool.__typename"); diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/UnsynchronizedDiagramControllerTests.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/UnsynchronizedDiagramControllerTests.java index 2036e072390..b36e97bf1dd 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/UnsynchronizedDiagramControllerTests.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/UnsynchronizedDiagramControllerTests.java @@ -132,7 +132,7 @@ public void givenUnsynchronousDiagramWhenNodeIsCreatedThenItAppearsInTheDiagram( Runnable createNode = () -> { var createNodeToolId = this.unsynchronizedDiagramDescriptionProvider.getCreateNodeToolId(); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), diagramId.get(), createNodeToolId, 0, 0, null); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), diagramId.get(), createNodeToolId, 0, 0, List.of()); var result = this.invokeSingleClickOnDiagramElementToolMutationRunner.run(input); String typename = JsonPath.read(result, "$.data.invokeSingleClickOnDiagramElementTool.__typename"); diff --git a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/VisibilityDiagramControllerTests.java b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/VisibilityDiagramControllerTests.java index f2ac701b1ca..008304ef17c 100644 --- a/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/VisibilityDiagramControllerTests.java +++ b/packages/sirius-web/backend/sirius-web/src/test/java/org/eclipse/sirius/web/application/controllers/diagrams/VisibilityDiagramControllerTests.java @@ -148,7 +148,7 @@ public void givenDiagramWithHiddenNodesByDefaultWhenToolRevealingNodesIsInvokedT Runnable revealNodes = () -> { String revealNodeToolId = this.visibilityDiagramDescriptionProvider.getRevealNodeToolId(); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), hiddenNodeId.get(), revealNodeToolId, 0, 0, null); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), hiddenNodeId.get(), revealNodeToolId, 0, 0, List.of()); var result = this.invokeSingleClickOnDiagramElementToolMutationRunner.run(input); String typename = JsonPath.read(result, "$.data.invokeSingleClickOnDiagramElementTool.__typename"); @@ -194,7 +194,7 @@ public void givenDiagramWithHiddenNodesByDefaultWhenToolHiddingNodesIsInvokedThe Runnable hideNodes = () -> { String hideNodeToolId = this.visibilityDiagramDescriptionProvider.getHideNodeToolId(); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), revealedNodeId.get(), hideNodeToolId, 0, 0, null); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), revealedNodeId.get(), hideNodeToolId, 0, 0, List.of()); var invokeSingleClickOnDiagramElementToolResult = this.invokeSingleClickOnDiagramElementToolMutationRunner.run(input); String invokeSingleClickOnDiagramElementToolResultTypename = JsonPath.read(invokeSingleClickOnDiagramElementToolResult, "$.data.invokeSingleClickOnDiagramElementTool.__typename"); @@ -244,7 +244,7 @@ public void givenDiagramWithFadedNodesByDefaultWhenToolFadingNodesIsInvokedThenN Runnable fadeNodes = () -> { String fadeNodeToolId = this.visibilityDiagramDescriptionProvider.getFadeNodeToolId(); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), unfadedNodeId.get(), fadeNodeToolId, 0, 0, null); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), unfadedNodeId.get(), fadeNodeToolId, 0, 0, List.of()); var invokeSingleClickOnDiagramElementToolResult = this.invokeSingleClickOnDiagramElementToolMutationRunner.run(input); String invokeSingleClickOnDiagramElementToolResultTypename = JsonPath.read(invokeSingleClickOnDiagramElementToolResult, "$.data.invokeSingleClickOnDiagramElementTool.__typename"); @@ -292,7 +292,7 @@ public void givenDiagramWithFadedNodesByDefaultWhenToolUnFadingNodesIsInvokedThe Runnable unfadeNodes = () -> { String unfadeNodeToolId = this.visibilityDiagramDescriptionProvider.getUnfadeNodeToolId(); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), fadedNodeId.get(), unfadeNodeToolId, 0, 0, null); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), fadedNodeId.get(), unfadeNodeToolId, 0, 0, List.of()); var result = this.invokeSingleClickOnDiagramElementToolMutationRunner.run(input); String typename = JsonPath.read(result, "$.data.invokeSingleClickOnDiagramElementTool.__typename"); @@ -337,7 +337,7 @@ public void givenDiagramWithFadedAndHiddenNodesWhenToolResettingVisibilityModifi Runnable fadeNode = () -> { String fadeNodeToolId = this.visibilityDiagramDescriptionProvider.getFadeNodeToolId(); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), nodeToFadeId.get(), fadeNodeToolId, 0, 0, null); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), nodeToFadeId.get(), fadeNodeToolId, 0, 0, List.of()); var result = this.invokeSingleClickOnDiagramElementToolMutationRunner.run(input); String typename = JsonPath.read(result, "$.data.invokeSingleClickOnDiagramElementTool.__typename"); @@ -346,7 +346,7 @@ public void givenDiagramWithFadedAndHiddenNodesWhenToolResettingVisibilityModifi Runnable hideNode = () -> { String hideNodeToolId = this.visibilityDiagramDescriptionProvider.getHideNodeToolId(); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), nodeToHideId.get(), hideNodeToolId, 0, 0, null); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), nodeToHideId.get(), hideNodeToolId, 0, 0, List.of()); var result = this.invokeSingleClickOnDiagramElementToolMutationRunner.run(input); String typename = JsonPath.read(result, "$.data.invokeSingleClickOnDiagramElementTool.__typename"); @@ -355,7 +355,7 @@ public void givenDiagramWithFadedAndHiddenNodesWhenToolResettingVisibilityModifi Runnable resetFadedNodeVisibility = () -> { String resetNodeToolId = this.visibilityDiagramDescriptionProvider.getResetNodeToolId(); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), nodeToFadeId.get(), resetNodeToolId, 0, 0, null); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), nodeToFadeId.get(), resetNodeToolId, 0, 0, List.of()); var result = this.invokeSingleClickOnDiagramElementToolMutationRunner.run(input); String typename = JsonPath.read(result, "$.data.invokeSingleClickOnDiagramElementTool.__typename"); @@ -365,7 +365,7 @@ public void givenDiagramWithFadedAndHiddenNodesWhenToolResettingVisibilityModifi Runnable resetHiddenNodeVisibility = () -> { String resetNodeToolId = this.visibilityDiagramDescriptionProvider.getResetNodeToolId(); - var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), nodeToHideId.get(), resetNodeToolId, 0, 0, null); + var input = new InvokeSingleClickOnDiagramElementToolInput(UUID.randomUUID(), PapayaIdentifiers.PAPAYA_PROJECT.toString(), diagramId.get(), nodeToHideId.get(), resetNodeToolId, 0, 0, List.of()); var result = this.invokeSingleClickOnDiagramElementToolMutationRunner.run(input); String typename = JsonPath.read(result, "$.data.invokeSingleClickOnDiagramElementTool.__typename"); diff --git a/packages/sirius-web/frontend/sirius-web-application/src/extension/DefaultExtensionRegistry.tsx b/packages/sirius-web/frontend/sirius-web-application/src/extension/DefaultExtensionRegistry.tsx index c28289cd534..b15f567b565 100644 --- a/packages/sirius-web/frontend/sirius-web-application/src/extension/DefaultExtensionRegistry.tsx +++ b/packages/sirius-web/frontend/sirius-web-application/src/extension/DefaultExtensionRegistry.tsx @@ -20,7 +20,11 @@ import { workbenchViewContributionExtensionPoint, } from '@eclipse-sirius/sirius-components-core'; import { DeckRepresentation } from '@eclipse-sirius/sirius-components-deck'; -import { DiagramRepresentation } from '@eclipse-sirius/sirius-components-diagrams'; +import { + DiagramDialogContribution, + DiagramRepresentation, + diagramDialogContributionExtensionPoint, +} from '@eclipse-sirius/sirius-components-diagrams'; import { FormDescriptionEditorRepresentation } from '@eclipse-sirius/sirius-components-formdescriptioneditors'; import { DetailsView, @@ -39,6 +43,7 @@ import MenuIcon from '@material-ui/icons/Menu'; import WarningIcon from '@material-ui/icons/Warning'; import { OnboardArea } from '../onboarding/OnboardArea'; +import { SELECTION_DIALOG_ID, SelectionDialog } from '@eclipse-sirius/sirius-components-selection'; const getType = (representation: RepresentationMetadata): string | null => { const query = representation.kind.substring(representation.kind.indexOf('?') + 1, representation.kind.length); const params = new URLSearchParams(query); @@ -127,4 +132,18 @@ defaultExtensionRegistry.putData(representationFactoryExtensionPoint, { data: representationFactories, }); +const diagramDialogContributions: DiagramDialogContribution[] = [ + { + canHandle: (dialogKindId: string) => { + return SELECTION_DIALOG_ID === dialogKindId; + }, + component: SelectionDialog, + }, +]; + +defaultExtensionRegistry.putData(diagramDialogContributionExtensionPoint, { + identifier: `siriusweb_${diagramDialogContributionExtensionPoint.identifier}`, + data: diagramDialogContributions, +}); + export { defaultExtensionRegistry }; diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramBuilders.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramBuilders.java index eec100cc5c6..0e23e028330 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramBuilders.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DiagramBuilders.java @@ -311,13 +311,13 @@ public DeleteViewBuilder newDeleteView() { } /** - * Instantiate a SelectionDescriptionBuilder . + * Instantiate a SelectionDialogDescriptionBuilder . * * @author BuilderGenerator * @generated */ - public SelectionDescriptionBuilder newSelectionDescription() { - return new SelectionDescriptionBuilder(); + public SelectionDialogDescriptionBuilder newSelectionDialogDescription() { + return new SelectionDialogDescriptionBuilder(); } /** diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DialogDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DialogDescriptionBuilder.java new file mode 100644 index 00000000000..e42ef60833d --- /dev/null +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/DialogDescriptionBuilder.java @@ -0,0 +1,31 @@ +/******************************************************************************* + * Copyright (c) 2023, 2024 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.components.view.builder.generated; + +/** + * Builder for org.eclipse.sirius.components.view.diagram.DialogDescription. + * + * @author BuilderGenerator + * @generated + */ +public abstract class DialogDescriptionBuilder { + + /** + * Builder for org.eclipse.sirius.components.view.diagram.DialogDescription. + * @generated + */ + protected abstract org.eclipse.sirius.components.view.diagram.DialogDescription getDialogDescription(); + + +} + diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeToolBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeToolBuilder.java index 6aaafa25409..466a7e13096 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeToolBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/NodeToolBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023 Obeo. + * Copyright (c) 2023, 2024 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -74,12 +74,12 @@ public NodeToolBuilder body(org.eclipse.sirius.components.view.Operation ... val } /** - * Setter for SelectionDescription. + * Setter for DialogDescription. * * @generated */ - public NodeToolBuilder selectionDescription(org.eclipse.sirius.components.view.diagram.SelectionDescription value) { - this.getNodeTool().setSelectionDescription(value); + public NodeToolBuilder dialogDescription(org.eclipse.sirius.components.view.diagram.DialogDescription value) { + this.getNodeTool().setDialogDescription(value); return this; } diff --git a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectionDescriptionBuilder.java b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectionDialogDescriptionBuilder.java similarity index 59% rename from packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectionDescriptionBuilder.java rename to packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectionDialogDescriptionBuilder.java index c38870ee386..35de1b11d04 100644 --- a/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectionDescriptionBuilder.java +++ b/packages/view/backend/sirius-components-view-builder/src/main/java/org/eclipse/sirius/components/view/builder/generated/SelectionDialogDescriptionBuilder.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023 Obeo. + * Copyright (c) 2023, 2024 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -13,33 +13,33 @@ package org.eclipse.sirius.components.view.builder.generated; /** - * Builder for SelectionDescriptionBuilder. + * Builder for SelectionDialogDescriptionBuilder. * * @author BuilderGenerator * @generated */ -public class SelectionDescriptionBuilder { +public class SelectionDialogDescriptionBuilder { /** - * Create instance org.eclipse.sirius.components.view.diagram.SelectionDescription. + * Create instance org.eclipse.sirius.components.view.diagram.SelectionDialogDescription. * @generated */ - private org.eclipse.sirius.components.view.diagram.SelectionDescription selectionDescription = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createSelectionDescription(); + private org.eclipse.sirius.components.view.diagram.SelectionDialogDescription selectionDialogDescription = org.eclipse.sirius.components.view.diagram.DiagramFactory.eINSTANCE.createSelectionDialogDescription(); /** - * Return instance org.eclipse.sirius.components.view.diagram.SelectionDescription. + * Return instance org.eclipse.sirius.components.view.diagram.SelectionDialogDescription. * @generated */ - protected org.eclipse.sirius.components.view.diagram.SelectionDescription getSelectionDescription() { - return this.selectionDescription; + protected org.eclipse.sirius.components.view.diagram.SelectionDialogDescription getSelectionDialogDescription() { + return this.selectionDialogDescription; } /** - * Return instance org.eclipse.sirius.components.view.diagram.SelectionDescription. + * Return instance org.eclipse.sirius.components.view.diagram.SelectionDialogDescription. * @generated */ - public org.eclipse.sirius.components.view.diagram.SelectionDescription build() { - return this.getSelectionDescription(); + public org.eclipse.sirius.components.view.diagram.SelectionDialogDescription build() { + return this.getSelectionDialogDescription(); } /** @@ -47,8 +47,8 @@ public org.eclipse.sirius.components.view.diagram.SelectionDescription build() { * * @generated */ - public SelectionDescriptionBuilder selectionCandidatesExpression(java.lang.String value) { - this.getSelectionDescription().setSelectionCandidatesExpression(value); + public SelectionDialogDescriptionBuilder selectionCandidatesExpression(java.lang.String value) { + this.getSelectionDialogDescription().setSelectionCandidatesExpression(value); return this; } /** @@ -56,8 +56,8 @@ public SelectionDescriptionBuilder selectionCandidatesExpression(java.lang.Strin * * @generated */ - public SelectionDescriptionBuilder selectionMessage(java.lang.String value) { - this.getSelectionDescription().setSelectionMessage(value); + public SelectionDialogDescriptionBuilder selectionMessage(java.lang.String value) { + this.getSelectionDialogDescription().setSelectionMessage(value); return this; } diff --git a/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/DiagramItemProviderAdapterFactory.java b/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/DiagramItemProviderAdapterFactory.java index fbb82d38a9c..ecd5b030ddf 100644 --- a/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/DiagramItemProviderAdapterFactory.java +++ b/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/DiagramItemProviderAdapterFactory.java @@ -337,15 +337,6 @@ public class DiagramItemProviderAdapterFactory extends DiagramAdapterFactory imp */ protected DeleteViewItemProvider deleteViewItemProvider; - /** - * This keeps track of the one adapter used for all - * {@link org.eclipse.sirius.components.view.diagram.SelectionDescription} instances. - * - * @generated - */ - protected SelectionDescriptionItemProvider selectionDescriptionItemProvider; - /** * This keeps track of the one adapter used for all * {@link org.eclipse.sirius.components.view.diagram.DiagramToolSection} instances. + * + * + * @generated + */ + protected SelectionDialogDescriptionItemProvider selectionDialogDescriptionItemProvider; + + /** + * This creates an adapter for a {@link org.eclipse.sirius.components.view.diagram.SelectionDialogDescription}. * * @generated */ @Override - public Adapter createSelectionDescriptionAdapter() { - if (this.selectionDescriptionItemProvider == null) { - this.selectionDescriptionItemProvider = new SelectionDescriptionItemProvider(this); + public Adapter createSelectionDialogDescriptionAdapter() { + if (this.selectionDialogDescriptionItemProvider == null) { + this.selectionDialogDescriptionItemProvider = new SelectionDialogDescriptionItemProvider(this); } - return this.selectionDescriptionItemProvider; + return this.selectionDialogDescriptionItemProvider; } /** @@ -1092,8 +1092,8 @@ public void dispose() { this.createViewItemProvider.dispose(); if (this.deleteViewItemProvider != null) this.deleteViewItemProvider.dispose(); - if (this.selectionDescriptionItemProvider != null) - this.selectionDescriptionItemProvider.dispose(); + if (this.selectionDialogDescriptionItemProvider != null) + this.selectionDialogDescriptionItemProvider.dispose(); if (this.diagramToolSectionItemProvider != null) this.diagramToolSectionItemProvider.dispose(); if (this.nodeToolSectionItemProvider != null) diff --git a/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/DialogDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/DialogDescriptionItemProvider.java new file mode 100644 index 00000000000..3c0369aeaef --- /dev/null +++ b/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/DialogDescriptionItemProvider.java @@ -0,0 +1,115 @@ +/******************************************************************************* + * Copyright (c) 2024 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.components.view.diagram.provider; + +import java.util.Collection; +import java.util.List; + +import org.eclipse.emf.common.notify.AdapterFactory; +import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.ResourceLocator; +import org.eclipse.emf.edit.provider.IChildCreationExtender; +import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; +import org.eclipse.emf.edit.provider.IItemLabelProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.emf.edit.provider.IItemPropertySource; +import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITreeItemContentProvider; +import org.eclipse.emf.edit.provider.ItemProviderAdapter; + +/** + * This is the item provider adapter for a {@link org.eclipse.sirius.components.view.diagram.DialogDescription} object. + * + * + * @generated + */ +public class DialogDescriptionItemProvider extends ItemProviderAdapter +implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { + /** + * This constructs an instance from a factory and a notifier. + * + * @generated + */ + public DialogDescriptionItemProvider(AdapterFactory adapterFactory) { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * + * @generated + */ + @Override + public List getPropertyDescriptors(Object object) { + if (this.itemPropertyDescriptors == null) { + super.getPropertyDescriptors(object); + + } + return this.itemPropertyDescriptors; + } + + /** + * + * + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() { + return true; + } + + /** + * This returns the label text for the adapted class. + * + * @generated + */ + @Override + public String getText(Object object) { + return this.getString("_UI_DialogDescription_type"); + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached children and by creating + * a viewer notification, which it passes to {@link #fireNotifyChanged}. + * + * @generated + */ + @Override + public void notifyChanged(Notification notification) { + this.updateChildren(notification); + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be created + * under this object. + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + + /** + * Return the resource locator for this item provider's resources. + * + * @generated + */ + @Override + public ResourceLocator getResourceLocator() { + return ((IChildCreationExtender) this.adapterFactory).getResourceLocator(); + } + +} diff --git a/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/NodeToolItemProvider.java b/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/NodeToolItemProvider.java index 11d840a266a..cfc52e3843c 100644 --- a/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/NodeToolItemProvider.java +++ b/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/NodeToolItemProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021, 2023 Obeo. + * Copyright (c) 2021, 2024 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -81,7 +81,7 @@ protected void addIconURLsExpressionPropertyDescriptor(Object object) { public Collection getChildrenFeatures(Object object) { if (this.childrenFeatures == null) { super.getChildrenFeatures(object); - this.childrenFeatures.add(DiagramPackage.Literals.NODE_TOOL__SELECTION_DESCRIPTION); + this.childrenFeatures.add(DiagramPackage.Literals.NODE_TOOL__DIALOG_DESCRIPTION); } return this.childrenFeatures; } @@ -145,7 +145,7 @@ public void notifyChanged(Notification notification) { case DiagramPackage.NODE_TOOL__ICON_UR_LS_EXPRESSION: this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; - case DiagramPackage.NODE_TOOL__SELECTION_DESCRIPTION: + case DiagramPackage.NODE_TOOL__DIALOG_DESCRIPTION: this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } @@ -162,7 +162,7 @@ public void notifyChanged(Notification notification) { protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(this.createChildParameter(DiagramPackage.Literals.NODE_TOOL__SELECTION_DESCRIPTION, DiagramFactory.eINSTANCE.createSelectionDescription())); + newChildDescriptors.add(this.createChildParameter(DiagramPackage.Literals.NODE_TOOL__DIALOG_DESCRIPTION, DiagramFactory.eINSTANCE.createSelectionDialogDescription())); } } diff --git a/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/SelectionDescriptionItemProvider.java b/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/SelectionDialogDescriptionItemProvider.java similarity index 64% rename from packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/SelectionDescriptionItemProvider.java rename to packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/SelectionDialogDescriptionItemProvider.java index 5a58bb1d0c2..ed3e9b01cdf 100644 --- a/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/SelectionDescriptionItemProvider.java +++ b/packages/view/backend/sirius-components-view-diagram-edit/src/main/java/org/eclipse/sirius/components/view/diagram/provider/SelectionDialogDescriptionItemProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023 Obeo. + * Copyright (c) 2024 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -17,35 +17,26 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.common.util.ResourceLocator; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IChildCreationExtender; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.sirius.components.view.diagram.DiagramPackage; -import org.eclipse.sirius.components.view.diagram.SelectionDescription; +import org.eclipse.sirius.components.view.diagram.SelectionDialogDescription; /** - * This is the item provider adapter for a {@link org.eclipse.sirius.components.view.diagram.SelectionDescription} + * This is the item provider adapter for a {@link org.eclipse.sirius.components.view.diagram.SelectionDialogDescription} * object. * * @generated */ -public class SelectionDescriptionItemProvider extends ItemProviderAdapter - implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { +public class SelectionDialogDescriptionItemProvider extends DialogDescriptionItemProvider { /** * This constructs an instance from a factory and a notifier. * * @generated */ - public SelectionDescriptionItemProvider(AdapterFactory adapterFactory) { + public SelectionDialogDescriptionItemProvider(AdapterFactory adapterFactory) { super(adapterFactory); } @@ -73,9 +64,9 @@ public List getPropertyDescriptors(Object object) { */ protected void addSelectionCandidatesExpressionPropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SelectionDescription_selectionCandidatesExpression_feature"), - this.getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_selectionCandidatesExpression_feature", "_UI_SelectionDescription_type"), - DiagramPackage.Literals.SELECTION_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + this.getString("_UI_SelectionDialogDescription_selectionCandidatesExpression_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SelectionDialogDescription_selectionCandidatesExpression_feature", "_UI_SelectionDialogDescription_type"), + DiagramPackage.Literals.SELECTION_DIALOG_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** @@ -85,19 +76,19 @@ protected void addSelectionCandidatesExpressionPropertyDescriptor(Object object) */ protected void addSelectionMessagePropertyDescriptor(Object object) { this.itemPropertyDescriptors.add(this.createItemPropertyDescriptor(((ComposeableAdapterFactory) this.adapterFactory).getRootAdapterFactory(), this.getResourceLocator(), - this.getString("_UI_SelectionDescription_selectionMessage_feature"), - this.getString("_UI_PropertyDescriptor_description", "_UI_SelectionDescription_selectionMessage_feature", "_UI_SelectionDescription_type"), - DiagramPackage.Literals.SELECTION_DESCRIPTION__SELECTION_MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + this.getString("_UI_SelectionDialogDescription_selectionMessage_feature"), + this.getString("_UI_PropertyDescriptor_description", "_UI_SelectionDialogDescription_selectionMessage_feature", "_UI_SelectionDialogDescription_type"), + DiagramPackage.Literals.SELECTION_DIALOG_DESCRIPTION__SELECTION_MESSAGE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** - * This returns SelectionDescription.gif. + * This returns SelectionDialogDescription.gif. * - * @generated + * @generated NOT */ @Override public Object getImage(Object object) { - return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/SelectionDescription")); + return this.overlayImage(object, this.getResourceLocator().getImage("full/obj16/SelectionDialogDescription.svg")); } /** @@ -117,8 +108,8 @@ protected boolean shouldComposeCreationImage() { */ @Override public String getText(Object object) { - String label = ((SelectionDescription) object).getSelectionCandidatesExpression(); - return label == null || label.length() == 0 ? this.getString("_UI_SelectionDescription_type") : this.getString("_UI_SelectionDescription_type") + " " + label; + String label = ((SelectionDialogDescription) object).getSelectionCandidatesExpression(); + return label == null || label.length() == 0 ? this.getString("_UI_SelectionDialogDescription_type") : this.getString("_UI_SelectionDialogDescription_type") + " " + label; } /** @@ -132,9 +123,9 @@ public String getText(Object object) { public void notifyChanged(Notification notification) { this.updateChildren(notification); - switch (notification.getFeatureID(SelectionDescription.class)) { - case DiagramPackage.SELECTION_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION: - case DiagramPackage.SELECTION_DESCRIPTION__SELECTION_MESSAGE: + switch (notification.getFeatureID(SelectionDialogDescription.class)) { + case DiagramPackage.SELECTION_DIALOG_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION: + case DiagramPackage.SELECTION_DIALOG_DESCRIPTION__SELECTION_MESSAGE: this.fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; } @@ -152,14 +143,4 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors super.collectNewChildDescriptors(newChildDescriptors, object); } - /** - * Return the resource locator for this item provider's resources. - * - * @generated - */ - @Override - public ResourceLocator getResourceLocator() { - return ((IChildCreationExtender) this.adapterFactory).getResourceLocator(); - } - } diff --git a/packages/view/backend/sirius-components-view-diagram-edit/src/main/resources/icons/full/obj16/SelectionDialogDescription.svg b/packages/view/backend/sirius-components-view-diagram-edit/src/main/resources/icons/full/obj16/SelectionDialogDescription.svg new file mode 100644 index 00000000000..9461283ac30 --- /dev/null +++ b/packages/view/backend/sirius-components-view-diagram-edit/src/main/resources/icons/full/obj16/SelectionDialogDescription.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/packages/view/backend/sirius-components-view-diagram-edit/src/main/resources/plugin.properties b/packages/view/backend/sirius-components-view-diagram-edit/src/main/resources/plugin.properties index da3f69e91f1..72cace7e39c 100644 --- a/packages/view/backend/sirius-components-view-diagram-edit/src/main/resources/plugin.properties +++ b/packages/view/backend/sirius-components-view-diagram-edit/src/main/resources/plugin.properties @@ -4,208 +4,214 @@ # are made available under the terms of the Eclipse Public License v2.0 # which accompanies this distribution, and is available at # https://www.eclipse.org/legal/epl-2.0/ -# +# # SPDX-License-Identifier: EPL-2.0 -# +# # Contributors: # Obeo - initial API and implementation ################################################################################# -pluginName=Diagram Edit Support -providerName=www.example.org -_UI_CreateChild_text={0} -_UI_CreateChild_text2={1} {0} -_UI_CreateChild_text3={1} -_UI_CreateChild_tooltip=Create New {0} Under {1} Feature -_UI_CreateChild_description=Create a new child of type {0} for the {1} feature of the selected {2}. -_UI_CreateSibling_description=Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent. -_UI_PropertyDescriptor_description=The {0} of the {1} +pluginName = Diagram Edit Support +providerName = www.example.org + +_UI_CreateChild_text = {0} +_UI_CreateChild_text2 = {1} {0} +_UI_CreateChild_text3 = {1} +_UI_CreateChild_tooltip = Create New {0} Under {1} Feature +_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}. +_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent. + +_UI_PropertyDescriptor_description = The {0} of the {1} _UI_DiagramDescription_type=Diagram Description _UI_DiagramElementDescription_type=Diagram Element Description -_UI_NodeDescription_type=Node Description -_UI_EdgeDescription_type=Edge Description -_UI_LayoutStrategyDescription_type=Layout Strategy Description -_UI_ListLayoutStrategyDescription_type=List Layout Strategy Description -_UI_FreeFormLayoutStrategyDescription_type=Free Form Layout Strategy Description -_UI_LabelDescription_type=Label Description -_UI_InsideLabelDescription_type=Inside Label Description -_UI_OutsideLabelDescription_type=Outside Label Description -_UI_Style_type=Style -_UI_BorderStyle_type=Border Style -_UI_InsideLabelStyle_type=Inside Label Style -_UI_OutsideLabelStyle_type=Outside Label Style -_UI_NodeLabelStyle_type=Node Label Style -_UI_NodeStyleDescription_type=Node Style Description -_UI_ConditionalNodeStyle_type=Conditional Node Style -_UI_ConditionalInsideLabelStyle_type=Conditional Inside Label Style -_UI_ConditionalOutsideLabelStyle_type=Conditional Outside Label Style -_UI_RectangularNodeStyleDescription_type=Rectangular Node Style Description -_UI_ImageNodeStyleDescription_type=Image Node Style Description -_UI_IconLabelNodeStyleDescription_type=Icon Label Node Style Description -_UI_EdgeStyle_type=Edge Style -_UI_ConditionalEdgeStyle_type=Conditional Edge Style -_UI_DiagramPalette_type=Palette -_UI_NodePalette_type=Node Palette -_UI_EdgePalette_type=Edge Palette -_UI_Tool_type=Tool -_UI_DeleteTool_type=Delete Tool -_UI_DropTool_type=Drop Tool -_UI_EdgeTool_type=Edge Tool -_UI_EdgeReconnectionTool_type=Edge Reconnection Tool -_UI_LabelEditTool_type=Label Edit Tool -_UI_NodeTool_type=Node Tool -_UI_SourceEdgeEndReconnectionTool_type=Source Edge End Reconnection Tool -_UI_TargetEdgeEndReconnectionTool_type=Target Edge End Reconnection Tool -_UI_CreateView_type=Create View -_UI_DeleteView_type=Delete View -_UI_SelectionDescription_type=Selection Description -_UI_ToolSection_type=Tool Section +_UI_NodeDescription_type = Node Description +_UI_EdgeDescription_type = Edge Description +_UI_LayoutStrategyDescription_type = Layout Strategy Description +_UI_ListLayoutStrategyDescription_type = List Layout Strategy Description +_UI_FreeFormLayoutStrategyDescription_type = Free Form Layout Strategy Description +_UI_LabelDescription_type = Label Description +_UI_InsideLabelDescription_type = Inside Label Description +_UI_OutsideLabelDescription_type = Outside Label Description +_UI_Style_type = Style +_UI_BorderStyle_type = Border Style +_UI_InsideLabelStyle_type = Inside Label Style +_UI_OutsideLabelStyle_type = Outside Label Style +_UI_NodeLabelStyle_type = Node Label Style +_UI_NodeStyleDescription_type = Node Style Description +_UI_ConditionalNodeStyle_type = Conditional Node Style +_UI_ConditionalInsideLabelStyle_type = Conditional Inside Label Style +_UI_ConditionalOutsideLabelStyle_type = Conditional Outside Label Style +_UI_RectangularNodeStyleDescription_type = Rectangular Node Style Description +_UI_ImageNodeStyleDescription_type = Image Node Style Description +_UI_IconLabelNodeStyleDescription_type = Icon Label Node Style Description +_UI_EdgeStyle_type = Edge Style +_UI_ConditionalEdgeStyle_type = Conditional Edge Style +_UI_DiagramPalette_type = Palette +_UI_NodePalette_type = Node Palette +_UI_EdgePalette_type = Edge Palette +_UI_Tool_type = Tool +_UI_DeleteTool_type = Delete Tool +_UI_DropTool_type = Drop Tool +_UI_EdgeTool_type = Edge Tool +_UI_EdgeReconnectionTool_type = Edge Reconnection Tool +_UI_LabelEditTool_type = Label Edit Tool +_UI_NodeTool_type = Node Tool +_UI_SourceEdgeEndReconnectionTool_type = Source Edge End Reconnection Tool +_UI_TargetEdgeEndReconnectionTool_type = Target Edge End Reconnection Tool +_UI_CreateView_type = Create View +_UI_DeleteView_type = Delete View +_UI_SelectionDialogDescription_type = Selection Dialog Description +_UI_ToolSection_type = Tool Section _UI_DiagramToolSection_type=Diagram Tool Section -_UI_NodeToolSection_type=Node Tool Section -_UI_EdgeToolSection_type=Edge Tool Section -_UI_DropNodeTool_type=Drop Node Tool -_UI_Unknown_type=Object -_UI_Unknown_datatype=Value -_UI_DiagramDescription_autoLayout_feature=Auto Layout -_UI_DiagramDescription_palette_feature=Palette -_UI_DiagramDescription_nodeDescriptions_feature=Node Descriptions -_UI_DiagramDescription_edgeDescriptions_feature=Edge Descriptions -_UI_DiagramDescription_arrangeLayoutDirection_feature=Arrange Layout Direction -_UI_DiagramElementDescription_name_feature=Name -_UI_DiagramElementDescription_domainType_feature=Domain Type -_UI_DiagramElementDescription_semanticCandidatesExpression_feature=Semantic Candidates Expression -_UI_DiagramElementDescription_preconditionExpression_feature=Precondition Expression -_UI_DiagramElementDescription_synchronizationPolicy_feature=Synchronization Policy -_UI_NodeDescription_collapsible_feature=Collapsible -_UI_NodeDescription_palette_feature=Palette -_UI_NodeDescription_childrenLayoutStrategy_feature=Children Layout Strategy -_UI_NodeDescription_style_feature=Style -_UI_NodeDescription_conditionalStyles_feature=Conditional Styles -_UI_NodeDescription_childrenDescriptions_feature=Children Descriptions -_UI_NodeDescription_borderNodesDescriptions_feature=Border Nodes Descriptions -_UI_NodeDescription_reusedChildNodeDescriptions_feature=Reused Child Node Descriptions -_UI_NodeDescription_reusedBorderNodeDescriptions_feature=Reused Border Node Descriptions -_UI_NodeDescription_userResizable_feature=User Resizable -_UI_NodeDescription_defaultWidthExpression_feature=Default Width Expression -_UI_NodeDescription_defaultHeightExpression_feature=Default Height Expression -_UI_NodeDescription_keepAspectRatio_feature=Keep Aspect Ratio -_UI_NodeDescription_isCollapsedByDefaultExpression_feature=Is Collapsed By Default Expression +_UI_NodeToolSection_type = Node Tool Section +_UI_EdgeToolSection_type = Edge Tool Section +_UI_DropNodeTool_type = Drop Node Tool +_UI_DialogDescription_type = Dialog Description +_UI_Unknown_type = Object + +_UI_Unknown_datatype= Value + +_UI_DiagramDescription_autoLayout_feature = Auto Layout +_UI_DiagramDescription_palette_feature = Palette +_UI_DiagramDescription_nodeDescriptions_feature = Node Descriptions +_UI_DiagramDescription_edgeDescriptions_feature = Edge Descriptions +_UI_DiagramDescription_arrangeLayoutDirection_feature = Arrange Layout Direction +_UI_DiagramElementDescription_name_feature = Name +_UI_DiagramElementDescription_domainType_feature = Domain Type +_UI_DiagramElementDescription_semanticCandidatesExpression_feature = Semantic Candidates Expression +_UI_DiagramElementDescription_preconditionExpression_feature = Precondition Expression +_UI_DiagramElementDescription_synchronizationPolicy_feature = Synchronization Policy +_UI_NodeDescription_collapsible_feature = Collapsible +_UI_NodeDescription_palette_feature = Palette +_UI_NodeDescription_childrenLayoutStrategy_feature = Children Layout Strategy +_UI_NodeDescription_style_feature = Style +_UI_NodeDescription_conditionalStyles_feature = Conditional Styles +_UI_NodeDescription_childrenDescriptions_feature = Children Descriptions +_UI_NodeDescription_borderNodesDescriptions_feature = Border Nodes Descriptions +_UI_NodeDescription_reusedChildNodeDescriptions_feature = Reused Child Node Descriptions +_UI_NodeDescription_reusedBorderNodeDescriptions_feature = Reused Border Node Descriptions +_UI_NodeDescription_userResizable_feature = User Resizable +_UI_NodeDescription_defaultWidthExpression_feature = Default Width Expression +_UI_NodeDescription_defaultHeightExpression_feature = Default Height Expression +_UI_NodeDescription_keepAspectRatio_feature = Keep Aspect Ratio +_UI_NodeDescription_isCollapsedByDefaultExpression_feature = Is Collapsed By Default Expression _UI_NodeDescription_isHiddenByDefaultExpression_feature=Is Hidden By Default Expression _UI_NodeDescription_isFadedByDefaultExpression_feature=Is Faded By Default Expression -_UI_NodeDescription_insideLabel_feature=Inside Label -_UI_NodeDescription_outsideLabels_feature=Outside Labels -_UI_EdgeDescription_beginLabelExpression_feature=Begin Label Expression -_UI_EdgeDescription_centerLabelExpression_feature=Center Label Expression -_UI_EdgeDescription_endLabelExpression_feature=End Label Expression -_UI_EdgeDescription_isDomainBasedEdge_feature=Is Domain Based Edge -_UI_EdgeDescription_palette_feature=Palette -_UI_EdgeDescription_sourceNodeDescriptions_feature=Source Node Descriptions -_UI_EdgeDescription_targetNodeDescriptions_feature=Target Node Descriptions -_UI_EdgeDescription_sourceNodesExpression_feature=Source Nodes Expression -_UI_EdgeDescription_targetNodesExpression_feature=Target Nodes Expression -_UI_EdgeDescription_style_feature=Style -_UI_EdgeDescription_conditionalStyles_feature=Conditional Styles -_UI_ListLayoutStrategyDescription_areChildNodesDraggableExpression_feature=Are Child Nodes Draggable Expression -_UI_ListLayoutStrategyDescription_topGapExpression_feature=Top Gap Expression -_UI_ListLayoutStrategyDescription_bottomGapExpression_feature=Bottom Gap Expression -_UI_LabelDescription_labelExpression_feature=Label Expression -_UI_LabelDescription_overflowStrategy_feature=Overflow Strategy -_UI_LabelDescription_textAlign_feature=Text Align -_UI_InsideLabelDescription_position_feature=Position -_UI_InsideLabelDescription_style_feature=Style -_UI_InsideLabelDescription_conditionalStyles_feature=Conditional Styles -_UI_OutsideLabelDescription_position_feature=Position -_UI_OutsideLabelDescription_style_feature=Style -_UI_OutsideLabelDescription_conditionalStyles_feature=Conditional Styles +_UI_NodeDescription_insideLabel_feature = Inside Label +_UI_NodeDescription_outsideLabels_feature = Outside Labels +_UI_EdgeDescription_beginLabelExpression_feature = Begin Label Expression +_UI_EdgeDescription_centerLabelExpression_feature = Center Label Expression +_UI_EdgeDescription_endLabelExpression_feature = End Label Expression +_UI_EdgeDescription_isDomainBasedEdge_feature = Is Domain Based Edge +_UI_EdgeDescription_palette_feature = Palette +_UI_EdgeDescription_sourceNodeDescriptions_feature = Source Node Descriptions +_UI_EdgeDescription_targetNodeDescriptions_feature = Target Node Descriptions +_UI_EdgeDescription_sourceNodesExpression_feature = Source Nodes Expression +_UI_EdgeDescription_targetNodesExpression_feature = Target Nodes Expression +_UI_EdgeDescription_style_feature = Style +_UI_EdgeDescription_conditionalStyles_feature = Conditional Styles +_UI_ListLayoutStrategyDescription_areChildNodesDraggableExpression_feature = Are Child Nodes Draggable Expression +_UI_ListLayoutStrategyDescription_topGapExpression_feature = Top Gap Expression +_UI_ListLayoutStrategyDescription_bottomGapExpression_feature = Bottom Gap Expression +_UI_LabelDescription_labelExpression_feature = Label Expression +_UI_LabelDescription_overflowStrategy_feature = Overflow Strategy +_UI_LabelDescription_textAlign_feature = Text Align +_UI_InsideLabelDescription_position_feature = Position +_UI_InsideLabelDescription_style_feature = Style +_UI_InsideLabelDescription_conditionalStyles_feature = Conditional Styles +_UI_OutsideLabelDescription_position_feature = Position +_UI_OutsideLabelDescription_style_feature = Style +_UI_OutsideLabelDescription_conditionalStyles_feature = Conditional Styles _UI_ListLayoutStrategyDescription_growableNodes_feature=Growable Nodes -_UI_Style_color_feature=Color -_UI_BorderStyle_borderColor_feature=Border Color -_UI_BorderStyle_borderRadius_feature=Border Radius -_UI_BorderStyle_borderSize_feature=Border Size -_UI_BorderStyle_borderLineStyle_feature=Border Line Style -_UI_InsideLabelStyle_withHeader_feature=With Header -_UI_InsideLabelStyle_displayHeaderSeparator_feature=Display Header Separator -_UI_NodeLabelStyle_labelColor_feature=Label Color -_UI_NodeLabelStyle_showIcon_feature=Show Icon -_UI_NodeLabelStyle_labelIcon_feature=Label Icon -_UI_ConditionalNodeStyle_style_feature=Style -_UI_ConditionalInsideLabelStyle_style_feature=Style -_UI_ConditionalOutsideLabelStyle_style_feature=Style -_UI_RectangularNodeStyleDescription_background_feature=Background -_UI_ImageNodeStyleDescription_shape_feature=Shape +_UI_Style_color_feature = Color +_UI_BorderStyle_borderColor_feature = Border Color +_UI_BorderStyle_borderRadius_feature = Border Radius +_UI_BorderStyle_borderSize_feature = Border Size +_UI_BorderStyle_borderLineStyle_feature = Border Line Style +_UI_InsideLabelStyle_withHeader_feature = With Header +_UI_InsideLabelStyle_displayHeaderSeparator_feature = Display Header Separator +_UI_NodeLabelStyle_labelColor_feature = Label Color +_UI_NodeLabelStyle_showIcon_feature = Show Icon +_UI_NodeLabelStyle_labelIcon_feature = Label Icon +_UI_ConditionalNodeStyle_style_feature = Style +_UI_ConditionalInsideLabelStyle_style_feature = Style +_UI_ConditionalOutsideLabelStyle_style_feature = Style +_UI_RectangularNodeStyleDescription_background_feature = Background +_UI_ImageNodeStyleDescription_shape_feature = Shape _UI_ImageNodeStyleDescription_positionDependentRotation_feature=Position-Dependent Rotation -_UI_IconLabelNodeStyleDescription_background_feature=Background -_UI_EdgeStyle_lineStyle_feature=Line Style -_UI_EdgeStyle_sourceArrowStyle_feature=Source Arrow Style -_UI_EdgeStyle_targetArrowStyle_feature=Target Arrow Style -_UI_EdgeStyle_edgeWidth_feature=Edge Width -_UI_EdgeStyle_showIcon_feature=Show Icon -_UI_EdgeStyle_labelIcon_feature=Label Icon -_UI_DiagramPalette_dropTool_feature=Drop Tool -_UI_DiagramPalette_dropNodeTool_feature=Drop Node Tool -_UI_DiagramPalette_nodeTools_feature=Node Tools -_UI_DiagramPalette_toolSections_feature=Tool Sections -_UI_NodePalette_deleteTool_feature=Delete Tool -_UI_NodePalette_labelEditTool_feature=Label Edit Tool -_UI_NodePalette_dropNodeTool_feature=Drop Node Tool -_UI_NodePalette_nodeTools_feature=Node Tools -_UI_NodePalette_edgeTools_feature=Edge Tools -_UI_NodePalette_toolSections_feature=Tool Sections -_UI_EdgePalette_deleteTool_feature=Delete Tool -_UI_EdgePalette_centerLabelEditTool_feature=Center Label Edit Tool -_UI_EdgePalette_beginLabelEditTool_feature=Begin Label Edit Tool -_UI_EdgePalette_endLabelEditTool_feature=End Label Edit Tool -_UI_EdgePalette_nodeTools_feature=Node Tools -_UI_EdgePalette_edgeReconnectionTools_feature=Edge Reconnection Tools -_UI_EdgePalette_toolSections_feature=Tool Sections -_UI_Tool_name_feature=Name -_UI_Tool_preconditionExpression_feature=Precondition Expression -_UI_Tool_body_feature=Body -_UI_EdgeTool_targetElementDescriptions_feature=Target Element Descriptions -_UI_EdgeTool_iconURLsExpression_feature=Icon URLs Expression -_UI_LabelEditTool_initialDirectEditLabelExpression_feature=Initial Direct Edit Label Expression -_UI_NodeTool_selectionDescription_feature=Selection Description -_UI_NodeTool_iconURLsExpression_feature=Icon URLs Expression -_UI_CreateView_parentViewExpression_feature=Parent View Expression -_UI_CreateView_elementDescription_feature=Element Description -_UI_CreateView_semanticElementExpression_feature=Semantic Element Expression -_UI_CreateView_variableName_feature=Variable Name -_UI_CreateView_containmentKind_feature=Containment Kind -_UI_DeleteView_viewExpression_feature=View Expression -_UI_SelectionDescription_selectionCandidatesExpression_feature=Selection Candidates Expression -_UI_SelectionDescription_selectionMessage_feature=Selection Message -_UI_ToolSection_name_feature=Name -_UI_DiagramToolSection_nodeTools_feature=Node Tools -_UI_NodeToolSection_nodeTools_feature=Node Tools -_UI_NodeToolSection_edgeTools_feature=Edge Tools -_UI_EdgeToolSection_nodeTools_feature=Node Tools -_UI_DropNodeTool_acceptedNodeTypes_feature=Accepted Node Types -_UI_Unknown_feature=Unspecified -_UI_ArrowStyle_None_literal=None -_UI_ArrowStyle_OutputArrow_literal=OutputArrow -_UI_ArrowStyle_InputArrow_literal=InputArrow -_UI_ArrowStyle_OutputClosedArrow_literal=OutputClosedArrow -_UI_ArrowStyle_InputClosedArrow_literal=InputClosedArrow -_UI_ArrowStyle_OutputFillClosedArrow_literal=OutputFillClosedArrow -_UI_ArrowStyle_InputFillClosedArrow_literal=InputFillClosedArrow -_UI_ArrowStyle_Diamond_literal=Diamond -_UI_ArrowStyle_FillDiamond_literal=FillDiamond -_UI_ArrowStyle_InputArrowWithDiamond_literal=InputArrowWithDiamond -_UI_ArrowStyle_InputArrowWithFillDiamond_literal=InputArrowWithFillDiamond -_UI_ArrowStyle_Circle_literal=Circle -_UI_ArrowStyle_FillCircle_literal=FillCircle -_UI_ArrowStyle_CrossedCircle_literal=CrossedCircle -_UI_ArrowStyle_ClosedArrowWithVerticalBar_literal=ClosedArrowWithVerticalBar -_UI_ArrowStyle_ClosedArrowWithDots_literal=ClosedArrowWithDots -_UI_LayoutDirection_Column_literal=Column -_UI_LineStyle_Solid_literal=Solid -_UI_LineStyle_Dash_literal=Dash -_UI_LineStyle_Dot_literal=Dot -_UI_LineStyle_Dash_Dot_literal=Dash_Dot -_UI_NodeContainmentKind_CHILD_NODE_literal=CHILD_NODE -_UI_NodeContainmentKind_BORDER_NODE_literal=BORDER_NODE -_UI_SynchronizationPolicy_SYNCHRONIZED_literal=SYNCHRONIZED -_UI_SynchronizationPolicy_UNSYNCHRONIZED_literal=UNSYNCHRONIZED -_UI_InsideLabelPosition_TOP_CENTER_literal=TOP_CENTER +_UI_IconLabelNodeStyleDescription_background_feature = Background +_UI_EdgeStyle_lineStyle_feature = Line Style +_UI_EdgeStyle_sourceArrowStyle_feature = Source Arrow Style +_UI_EdgeStyle_targetArrowStyle_feature = Target Arrow Style +_UI_EdgeStyle_edgeWidth_feature = Edge Width +_UI_EdgeStyle_showIcon_feature = Show Icon +_UI_EdgeStyle_labelIcon_feature = Label Icon +_UI_DiagramPalette_dropTool_feature = Drop Tool +_UI_DiagramPalette_dropNodeTool_feature = Drop Node Tool +_UI_DiagramPalette_nodeTools_feature = Node Tools +_UI_DiagramPalette_toolSections_feature = Tool Sections +_UI_NodePalette_deleteTool_feature = Delete Tool +_UI_NodePalette_labelEditTool_feature = Label Edit Tool +_UI_NodePalette_dropNodeTool_feature = Drop Node Tool +_UI_NodePalette_nodeTools_feature = Node Tools +_UI_NodePalette_edgeTools_feature = Edge Tools +_UI_NodePalette_toolSections_feature = Tool Sections +_UI_EdgePalette_deleteTool_feature = Delete Tool +_UI_EdgePalette_centerLabelEditTool_feature = Center Label Edit Tool +_UI_EdgePalette_beginLabelEditTool_feature = Begin Label Edit Tool +_UI_EdgePalette_endLabelEditTool_feature = End Label Edit Tool +_UI_EdgePalette_nodeTools_feature = Node Tools +_UI_EdgePalette_edgeReconnectionTools_feature = Edge Reconnection Tools +_UI_EdgePalette_toolSections_feature = Tool Sections +_UI_Tool_name_feature = Name +_UI_Tool_preconditionExpression_feature = Precondition Expression +_UI_Tool_body_feature = Body +_UI_EdgeTool_targetElementDescriptions_feature = Target Element Descriptions +_UI_EdgeTool_iconURLsExpression_feature = Icon UR Ls Expression +_UI_LabelEditTool_initialDirectEditLabelExpression_feature = Initial Direct Edit Label Expression +_UI_NodeTool_dialogDescription_feature = Dialog Description +_UI_NodeTool_iconURLsExpression_feature = Icon UR Ls Expression +_UI_CreateView_parentViewExpression_feature = Parent View Expression +_UI_CreateView_elementDescription_feature = Element Description +_UI_CreateView_semanticElementExpression_feature = Semantic Element Expression +_UI_CreateView_variableName_feature = Variable Name +_UI_CreateView_containmentKind_feature = Containment Kind +_UI_DeleteView_viewExpression_feature = View Expression +_UI_SelectionDialogDescription_selectionCandidatesExpression_feature = Selection Candidates Expression +_UI_SelectionDialogDescription_selectionMessage_feature = Selection Message +_UI_ToolSection_name_feature = Name +_UI_DiagramToolSection_nodeTools_feature = Node Tools +_UI_NodeToolSection_nodeTools_feature = Node Tools +_UI_NodeToolSection_edgeTools_feature = Edge Tools +_UI_EdgeToolSection_nodeTools_feature = Node Tools +_UI_DropNodeTool_acceptedNodeTypes_feature = Accepted Node Types +_UI_Unknown_feature = Unspecified + +_UI_ArrowStyle_None_literal = None +_UI_ArrowStyle_OutputArrow_literal = OutputArrow +_UI_ArrowStyle_InputArrow_literal = InputArrow +_UI_ArrowStyle_OutputClosedArrow_literal = OutputClosedArrow +_UI_ArrowStyle_InputClosedArrow_literal = InputClosedArrow +_UI_ArrowStyle_OutputFillClosedArrow_literal = OutputFillClosedArrow +_UI_ArrowStyle_InputFillClosedArrow_literal = InputFillClosedArrow +_UI_ArrowStyle_Diamond_literal = Diamond +_UI_ArrowStyle_FillDiamond_literal = FillDiamond +_UI_ArrowStyle_InputArrowWithDiamond_literal = InputArrowWithDiamond +_UI_ArrowStyle_InputArrowWithFillDiamond_literal = InputArrowWithFillDiamond +_UI_ArrowStyle_Circle_literal = Circle +_UI_ArrowStyle_FillCircle_literal = FillCircle +_UI_ArrowStyle_CrossedCircle_literal = CrossedCircle +_UI_ArrowStyle_ClosedArrowWithVerticalBar_literal = ClosedArrowWithVerticalBar +_UI_ArrowStyle_ClosedArrowWithDots_literal = ClosedArrowWithDots +_UI_LayoutDirection_Column_literal = Column +_UI_LineStyle_Solid_literal = Solid +_UI_LineStyle_Dash_literal = Dash +_UI_LineStyle_Dot_literal = Dot +_UI_LineStyle_Dash_Dot_literal = Dash_Dot +_UI_NodeContainmentKind_CHILD_NODE_literal = CHILD_NODE +_UI_NodeContainmentKind_BORDER_NODE_literal = BORDER_NODE +_UI_SynchronizationPolicy_SYNCHRONIZED_literal = SYNCHRONIZED +_UI_SynchronizationPolicy_UNSYNCHRONIZED_literal = UNSYNCHRONIZED +_UI_InsideLabelPosition_TOP_CENTER_literal = TOP_CENTER _UI_InsideLabelPosition_TOP_LEFT_literal = TOP_LEFT _UI_InsideLabelPosition_TOP_RIGHT_literal = TOP_RIGHT _UI_InsideLabelPosition_MIDDLE_LEFT_literal = MIDDLE_LEFT @@ -214,15 +220,15 @@ _UI_InsideLabelPosition_MIDDLE_RIGHT_literal = MIDDLE_RIGHT _UI_InsideLabelPosition_BOTTOM_LEFT_literal = BOTTOM_LEFT _UI_InsideLabelPosition_BOTTOM_CENTER_literal = BOTTOM_CENTER _UI_InsideLabelPosition_BOTTOM_RIGHT_literal = BOTTOM_RIGHT -_UI_OutsideLabelPosition_BOTTOM_CENTER_literal=BOTTOM_CENTER -_UI_LabelOverflowStrategy_NONE_literal=NONE -_UI_LabelOverflowStrategy_WRAP_literal=WRAP -_UI_LabelOverflowStrategy_ELLIPSIS_literal=ELLIPSIS -_UI_ArrangeLayoutDirection_UNDEFINED_literal=UNDEFINED -_UI_ArrangeLayoutDirection_RIGHT_literal=RIGHT -_UI_ArrangeLayoutDirection_DOWN_literal=DOWN -_UI_ArrangeLayoutDirection_LEFT_literal=LEFT -_UI_ArrangeLayoutDirection_UP_literal=UP +_UI_OutsideLabelPosition_BOTTOM_CENTER_literal = BOTTOM_CENTER +_UI_LabelOverflowStrategy_NONE_literal = NONE +_UI_LabelOverflowStrategy_WRAP_literal = WRAP +_UI_LabelOverflowStrategy_ELLIPSIS_literal = ELLIPSIS +_UI_ArrangeLayoutDirection_UNDEFINED_literal = UNDEFINED +_UI_ArrangeLayoutDirection_RIGHT_literal = RIGHT +_UI_ArrangeLayoutDirection_DOWN_literal = DOWN +_UI_ArrangeLayoutDirection_LEFT_literal = LEFT +_UI_ArrangeLayoutDirection_UP_literal = UP _UI_LabelTextAlign_LEFT_literal = LEFT _UI_LabelTextAlign_RIGHT_literal = RIGHT _UI_LabelTextAlign_CENTER_literal = CENTER diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/ArrangeLayoutDirection.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/ArrangeLayoutDirection.java index 49a79c3b485..29e5fef2025 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/ArrangeLayoutDirection.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/ArrangeLayoutDirection.java @@ -22,102 +22,102 @@ * A representation of the literals of the enumeration 'Arrange Layout * Direction', and utility methods for working with them. * + * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getArrangeLayoutDirection() * @model * @generated - * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getArrangeLayoutDirection() */ public enum ArrangeLayoutDirection implements Enumerator { /** * The 'UNDEFINED' literal object. * + * @see #UNDEFINED_VALUE * @generated * @ordered - * @see #UNDEFINED_VALUE */ UNDEFINED(0, "UNDEFINED", "UNDEFINED"), /** * The 'RIGHT' literal object. * + * @see #RIGHT_VALUE * @generated * @ordered - * @see #RIGHT_VALUE */ RIGHT(1, "RIGHT", "RIGHT"), /** * The 'DOWN' literal object. * + * @see #DOWN_VALUE * @generated * @ordered - * @see #DOWN_VALUE */ DOWN(2, "DOWN", "DOWN"), /** * The 'LEFT' literal object. * + * @see #LEFT_VALUE * @generated * @ordered - * @see #LEFT_VALUE */ LEFT(3, "LEFT", "LEFT"), /** * The 'UP' literal object. * + * @see #UP_VALUE * @generated * @ordered - * @see #UP_VALUE */ UP(4, "UP", "UP"); /** * The 'UNDEFINED' literal value. * + * @see #UNDEFINED * @model * @generated * @ordered - * @see #UNDEFINED */ public static final int UNDEFINED_VALUE = 0; /** * The 'RIGHT' literal value. * + * @see #RIGHT * @model * @generated * @ordered - * @see #RIGHT */ public static final int RIGHT_VALUE = 1; /** * The 'DOWN' literal value. * + * @see #DOWN * @model * @generated * @ordered - * @see #DOWN */ public static final int DOWN_VALUE = 2; /** * The 'LEFT' literal value. * + * @see #LEFT * @model * @generated * @ordered - * @see #LEFT */ public static final int LEFT_VALUE = 3; /** * The 'UP' literal value. * + * @see #UP * @model * @generated * @ordered - * @see #UP */ public static final int UP_VALUE = 4; @@ -163,7 +163,7 @@ public enum ArrangeLayoutDirection implements Enumerator { * * @generated */ - ArrangeLayoutDirection(int value, String name, String literal) { + private ArrangeLayoutDirection(int value, String name, String literal) { this.value = value; this.name = name; this.literal = literal; @@ -174,7 +174,7 @@ public enum ArrangeLayoutDirection implements Enumerator { * begin-user-doc --> * * @param literal - * the literal. + * the literal. * @return the matching enumerator or null. * @generated */ @@ -193,7 +193,7 @@ public static ArrangeLayoutDirection get(String literal) { * * * @param name - * the name. + * the name. * @return the matching enumerator or null. * @generated */ @@ -212,7 +212,7 @@ public static ArrangeLayoutDirection getByName(String name) { * begin-user-doc --> * * @param value - * the integer value. + * the integer value. * @return the matching enumerator or null. * @generated */ diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DiagramDescription.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DiagramDescription.java index c1ad91c8d56..c6dab1c8f1a 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DiagramDescription.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DiagramDescription.java @@ -32,9 +32,9 @@ * Direction} * * + * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getDiagramDescription() * @model * @generated - * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getDiagramDescription() */ public interface DiagramDescription extends RepresentationDescription { @@ -42,10 +42,10 @@ public interface DiagramDescription extends RepresentationDescription { * Returns the value of the 'Auto Layout' attribute. * * @return the value of the 'Auto Layout' attribute. - * @model required="true" - * @generated * @see #setAutoLayout(boolean) * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getDiagramDescription_AutoLayout() + * @model required="true" + * @generated */ boolean isAutoLayout(); @@ -54,9 +54,9 @@ public interface DiagramDescription extends RepresentationDescription { * Layout}' attribute. * * @param value - * the new value of the 'Auto Layout' attribute. - * @generated + * the new value of the 'Auto Layout' attribute. * @see #isAutoLayout() + * @generated */ void setAutoLayout(boolean value); @@ -65,10 +65,10 @@ public interface DiagramDescription extends RepresentationDescription { * end-user-doc --> * * @return the value of the 'Palette' containment reference. - * @model containment="true" - * @generated * @see #setPalette(DiagramPalette) * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getDiagramDescription_Palette() + * @model containment="true" + * @generated */ DiagramPalette getPalette(); @@ -77,9 +77,9 @@ public interface DiagramDescription extends RepresentationDescription { * Palette}' containment reference. * * @param value - * the new value of the 'Palette' containment reference. - * @generated + * the new value of the 'Palette' containment reference. * @see #getPalette() + * @generated */ void setPalette(DiagramPalette value); @@ -89,9 +89,9 @@ public interface DiagramDescription extends RepresentationDescription { * end-user-doc --> * * @return the value of the 'Node Descriptions' containment reference list. + * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getDiagramDescription_NodeDescriptions() * @model containment="true" * @generated - * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getDiagramDescription_NodeDescriptions() */ EList getNodeDescriptions(); @@ -101,9 +101,9 @@ public interface DiagramDescription extends RepresentationDescription { * end-user-doc --> * * @return the value of the 'Edge Descriptions' containment reference list. + * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getDiagramDescription_EdgeDescriptions() * @model containment="true" * @generated - * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getDiagramDescription_EdgeDescriptions() */ EList getEdgeDescriptions(); @@ -114,11 +114,11 @@ public interface DiagramDescription extends RepresentationDescription { * end-user-doc --> * * @return the value of the 'Arrange Layout Direction' attribute. - * @model default="UNDEFINED" required="true" - * @generated * @see org.eclipse.sirius.components.view.diagram.ArrangeLayoutDirection * @see #setArrangeLayoutDirection(ArrangeLayoutDirection) * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getDiagramDescription_ArrangeLayoutDirection() + * @model default="UNDEFINED" required="true" + * @generated */ ArrangeLayoutDirection getArrangeLayoutDirection(); @@ -128,10 +128,10 @@ public interface DiagramDescription extends RepresentationDescription { * Layout Direction}' attribute. * * @param value - * the new value of the 'Arrange Layout Direction' attribute. - * @generated + * the new value of the 'Arrange Layout Direction' attribute. * @see org.eclipse.sirius.components.view.diagram.ArrangeLayoutDirection * @see #getArrangeLayoutDirection() + * @generated */ void setArrangeLayoutDirection(ArrangeLayoutDirection value); diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DiagramFactory.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DiagramFactory.java index 9376eaf7d18..78b1880f776 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DiagramFactory.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DiagramFactory.java @@ -272,12 +272,13 @@ public interface DiagramFactory extends EFactory { DeleteView createDeleteView(); /** - * Returns a new object of class 'Selection Description'. + * Returns a new object of class 'Selection Dialog Description'. * - * @return a new object of class 'Selection Description'. + * @return a new object of class 'Selection Dialog Description'. * @generated */ - SelectionDescription createSelectionDescription(); + SelectionDialogDescription createSelectionDialogDescription(); /** * Returns a new object of class 'Tool Section'. diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DiagramPackage.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DiagramPackage.java index a497502b24b..1fdbabe564d 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DiagramPackage.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DiagramPackage.java @@ -30,9 +30,9 @@ * * * + * @see org.eclipse.sirius.components.view.diagram.DiagramFactory * @model kind="package" * @generated - * @see org.eclipse.sirius.components.view.diagram.DiagramFactory */ public interface DiagramPackage extends EPackage { @@ -61,9 +61,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.DiagramDescriptionImpl * Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DiagramDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDiagramDescription() + * @generated */ int DIAGRAM_DESCRIPTION = 0; @@ -107,7 +107,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int DIAGRAM_DESCRIPTION__AUTO_LAYOUT = ViewPackage.REPRESENTATION_DESCRIPTION_FEATURE_COUNT; + int DIAGRAM_DESCRIPTION__AUTO_LAYOUT = ViewPackage.REPRESENTATION_DESCRIPTION_FEATURE_COUNT + 0; /** * The feature id for the 'Palette' containment reference. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DiagramElementDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDiagramElementDescription() + * @generated */ int DIAGRAM_ELEMENT_DESCRIPTION = 1; @@ -237,9 +237,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.NodeDescriptionImpl Node * Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.NodeDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeDescription() + * @generated */ int NODE_DESCRIPTION = 2; @@ -292,7 +292,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int NODE_DESCRIPTION__COLLAPSIBLE = DIAGRAM_ELEMENT_DESCRIPTION_FEATURE_COUNT; + int NODE_DESCRIPTION__COLLAPSIBLE = DIAGRAM_ELEMENT_DESCRIPTION_FEATURE_COUNT + 0; /** * The feature id for the 'Palette' containment reference. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.EdgeDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getEdgeDescription() + * @generated */ int EDGE_DESCRIPTION = 3; @@ -523,7 +523,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int EDGE_DESCRIPTION__BEGIN_LABEL_EXPRESSION = DIAGRAM_ELEMENT_DESCRIPTION_FEATURE_COUNT; + int EDGE_DESCRIPTION__BEGIN_LABEL_EXPRESSION = DIAGRAM_ELEMENT_DESCRIPTION_FEATURE_COUNT + 0; /** * The feature id for the 'Center Label Expression' attribute. * - * @generated * @see org.eclipse.sirius.components.view.diagram.LayoutStrategyDescription * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLayoutStrategyDescription() + * @generated */ int LAYOUT_STRATEGY_DESCRIPTION = 4; @@ -665,9 +665,9 @@ public interface DiagramPackage extends EPackage { * '{@link org.eclipse.sirius.components.view.diagram.impl.ListLayoutStrategyDescriptionImpl List Layout * Strategy Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ListLayoutStrategyDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getListLayoutStrategyDescription() + * @generated */ int LIST_LAYOUT_STRATEGY_DESCRIPTION = 5; @@ -678,7 +678,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int LIST_LAYOUT_STRATEGY_DESCRIPTION__ARE_CHILD_NODES_DRAGGABLE_EXPRESSION = LAYOUT_STRATEGY_DESCRIPTION_FEATURE_COUNT; + int LIST_LAYOUT_STRATEGY_DESCRIPTION__ARE_CHILD_NODES_DRAGGABLE_EXPRESSION = LAYOUT_STRATEGY_DESCRIPTION_FEATURE_COUNT + 0; /** * The feature id for the 'Top Gap Expression' attribute. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.FreeFormLayoutStrategyDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getFreeFormLayoutStrategyDescription() + * @generated */ int FREE_FORM_LAYOUT_STRATEGY_DESCRIPTION = 6; @@ -743,7 +743,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int FREE_FORM_LAYOUT_STRATEGY_DESCRIPTION_FEATURE_COUNT = LAYOUT_STRATEGY_DESCRIPTION_FEATURE_COUNT; + int FREE_FORM_LAYOUT_STRATEGY_DESCRIPTION_FEATURE_COUNT = LAYOUT_STRATEGY_DESCRIPTION_FEATURE_COUNT + 0; /** * The number of operations of the 'Free Form Layout Strategy Description' class. @@ -752,15 +752,15 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int FREE_FORM_LAYOUT_STRATEGY_DESCRIPTION_OPERATION_COUNT = LAYOUT_STRATEGY_DESCRIPTION_OPERATION_COUNT; + int FREE_FORM_LAYOUT_STRATEGY_DESCRIPTION_OPERATION_COUNT = LAYOUT_STRATEGY_DESCRIPTION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.LabelDescriptionImpl Label * Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.LabelDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLabelDescription() + * @generated */ int LABEL_DESCRIPTION = 7; @@ -811,9 +811,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.InsideLabelDescriptionImpl * Inside Label Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.InsideLabelDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getInsideLabelDescription() + * @generated */ int INSIDE_LABEL_DESCRIPTION = 8; @@ -849,7 +849,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int INSIDE_LABEL_DESCRIPTION__POSITION = LABEL_DESCRIPTION_FEATURE_COUNT; + int INSIDE_LABEL_DESCRIPTION__POSITION = LABEL_DESCRIPTION_FEATURE_COUNT + 0; /** * The feature id for the 'Style' containment reference. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.OutsideLabelDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getOutsideLabelDescription() + * @generated */ int OUTSIDE_LABEL_DESCRIPTION = 9; @@ -929,7 +929,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int OUTSIDE_LABEL_DESCRIPTION__POSITION = LABEL_DESCRIPTION_FEATURE_COUNT; + int OUTSIDE_LABEL_DESCRIPTION__POSITION = LABEL_DESCRIPTION_FEATURE_COUNT + 0; /** * The feature id for the 'Style' containment reference. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.StyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getStyle() + * @generated */ int STYLE = 10; @@ -1005,9 +1005,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.BorderStyle Border Style}' * class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.BorderStyle * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getBorderStyle() + * @generated */ int BORDER_STYLE = 11; @@ -1065,9 +1065,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.NodeLabelStyle Node Label * Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeLabelStyle * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeLabelStyle() + * @generated */ int NODE_LABEL_STYLE = 14; @@ -1117,7 +1117,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int NODE_LABEL_STYLE__LABEL_COLOR = ViewPackage.LABEL_STYLE_FEATURE_COUNT; + int NODE_LABEL_STYLE__LABEL_COLOR = ViewPackage.LABEL_STYLE_FEATURE_COUNT + 0; /** * The feature id for the 'Show Icon' attribute. @@ -1150,15 +1150,15 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int NODE_LABEL_STYLE_OPERATION_COUNT = ViewPackage.LABEL_STYLE_OPERATION_COUNT; + int NODE_LABEL_STYLE_OPERATION_COUNT = ViewPackage.LABEL_STYLE_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.InsideLabelStyleImpl * Inside Label Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.InsideLabelStyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getInsideLabelStyle() + * @generated */ int INSIDE_LABEL_STYLE = 12; @@ -1232,7 +1232,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int INSIDE_LABEL_STYLE__WITH_HEADER = NODE_LABEL_STYLE_FEATURE_COUNT; + int INSIDE_LABEL_STYLE__WITH_HEADER = NODE_LABEL_STYLE_FEATURE_COUNT + 0; /** * The feature id for the 'Display Header Separator' attribute. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.OutsideLabelStyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getOutsideLabelStyle() + * @generated */ int OUTSIDE_LABEL_STYLE = 13; @@ -1342,7 +1342,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int OUTSIDE_LABEL_STYLE_FEATURE_COUNT = NODE_LABEL_STYLE_FEATURE_COUNT; + int OUTSIDE_LABEL_STYLE_FEATURE_COUNT = NODE_LABEL_STYLE_FEATURE_COUNT + 0; /** * The number of operations of the 'Outside Label Style' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeStyleDescription * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeStyleDescription() + * @generated */ int NODE_STYLE_DESCRIPTION = 15; @@ -1370,338 +1370,381 @@ public interface DiagramPackage extends EPackage { * @ordered */ int NODE_STYLE_DESCRIPTION__BORDER_COLOR = BORDER_STYLE__BORDER_COLOR; + /** - * The feature id for the 'Border Color' reference. + * The feature id for the 'Border Radius' attribute. * * @generated * @ordered */ - int RECTANGULAR_NODE_STYLE_DESCRIPTION__BORDER_COLOR = NODE_STYLE_DESCRIPTION__BORDER_COLOR; + int NODE_STYLE_DESCRIPTION__BORDER_RADIUS = BORDER_STYLE__BORDER_RADIUS; + /** - * The feature id for the 'Border Color' reference. + * The feature id for the 'Border Size' attribute. * * @generated * @ordered */ - int IMAGE_NODE_STYLE_DESCRIPTION__BORDER_COLOR = NODE_STYLE_DESCRIPTION__BORDER_COLOR; + int NODE_STYLE_DESCRIPTION__BORDER_SIZE = BORDER_STYLE__BORDER_SIZE; + /** - * The feature id for the 'Border Color' reference. + * The feature id for the 'Border Line Style' attribute. * * @generated * @ordered */ - int ICON_LABEL_NODE_STYLE_DESCRIPTION__BORDER_COLOR = NODE_STYLE_DESCRIPTION__BORDER_COLOR; + int NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE = BORDER_STYLE__BORDER_LINE_STYLE; + /** - * The feature id for the 'Border Radius' attribute. + * The number of structural features of the 'Node Style Description' class. * * @generated * @ordered */ - int NODE_STYLE_DESCRIPTION__BORDER_RADIUS = BORDER_STYLE__BORDER_RADIUS; + int NODE_STYLE_DESCRIPTION_FEATURE_COUNT = BORDER_STYLE_FEATURE_COUNT + 0; + /** - * The feature id for the 'Border Radius' attribute. + * The number of operations of the 'Node Style Description' class. * * @generated * @ordered */ - int RECTANGULAR_NODE_STYLE_DESCRIPTION__BORDER_RADIUS = NODE_STYLE_DESCRIPTION__BORDER_RADIUS; + int NODE_STYLE_DESCRIPTION_OPERATION_COUNT = BORDER_STYLE_OPERATION_COUNT + 0; + /** - * The feature id for the 'Border Radius' attribute. + * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.ConditionalNodeStyleImpl + * Conditional Node Style}' class. * + * @see org.eclipse.sirius.components.view.diagram.impl.ConditionalNodeStyleImpl + * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getConditionalNodeStyle() * @generated - * @ordered */ - int IMAGE_NODE_STYLE_DESCRIPTION__BORDER_RADIUS = NODE_STYLE_DESCRIPTION__BORDER_RADIUS; + int CONDITIONAL_NODE_STYLE = 16; + /** - * The feature id for the 'Border Radius' attribute. + * The feature id for the 'Condition' attribute. * * @generated * @ordered */ - int ICON_LABEL_NODE_STYLE_DESCRIPTION__BORDER_RADIUS = NODE_STYLE_DESCRIPTION__BORDER_RADIUS; + int CONDITIONAL_NODE_STYLE__CONDITION = ViewPackage.CONDITIONAL__CONDITION; + /** - * The feature id for the 'Border Size' attribute. + * The feature id for the 'Style' containment reference. * * @generated * @ordered */ - int NODE_STYLE_DESCRIPTION__BORDER_SIZE = BORDER_STYLE__BORDER_SIZE; + int CONDITIONAL_NODE_STYLE__STYLE = ViewPackage.CONDITIONAL_FEATURE_COUNT + 0; + /** - * The feature id for the 'Border Size' attribute. + * The number of structural features of the 'Conditional Node Style' class. * * @generated * @ordered */ - int RECTANGULAR_NODE_STYLE_DESCRIPTION__BORDER_SIZE = NODE_STYLE_DESCRIPTION__BORDER_SIZE; + int CONDITIONAL_NODE_STYLE_FEATURE_COUNT = ViewPackage.CONDITIONAL_FEATURE_COUNT + 1; + /** - * The feature id for the 'Border Size' attribute. + * The number of operations of the 'Conditional Node Style' class. * * @generated * @ordered */ - int IMAGE_NODE_STYLE_DESCRIPTION__BORDER_SIZE = NODE_STYLE_DESCRIPTION__BORDER_SIZE; + int CONDITIONAL_NODE_STYLE_OPERATION_COUNT = ViewPackage.CONDITIONAL_OPERATION_COUNT + 0; + /** - * The feature id for the 'Border Size' attribute. + * The meta object id for the + * '{@link org.eclipse.sirius.components.view.diagram.impl.ConditionalInsideLabelStyleImpl Conditional Inside + * Label Style}' class. * + * @see org.eclipse.sirius.components.view.diagram.impl.ConditionalInsideLabelStyleImpl + * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getConditionalInsideLabelStyle() * @generated - * @ordered */ - int ICON_LABEL_NODE_STYLE_DESCRIPTION__BORDER_SIZE = NODE_STYLE_DESCRIPTION__BORDER_SIZE; + int CONDITIONAL_INSIDE_LABEL_STYLE = 17; + /** - * The feature id for the 'Border Line Style' attribute. + * The feature id for the 'Condition' attribute. * * @generated * @ordered */ - int NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE = BORDER_STYLE__BORDER_LINE_STYLE; + int CONDITIONAL_INSIDE_LABEL_STYLE__CONDITION = ViewPackage.CONDITIONAL__CONDITION; + /** - * The feature id for the 'Border Line Style' attribute. * * @generated * @ordered */ - int RECTANGULAR_NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE = NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE; + int CONDITIONAL_INSIDE_LABEL_STYLE__STYLE = ViewPackage.CONDITIONAL_FEATURE_COUNT + 0; + /** - * The feature id for the 'Border Line Style' attribute. + * The number of structural features of the 'Conditional Inside Label Style' class. + * * * @generated * @ordered */ - int IMAGE_NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE = NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE; + int CONDITIONAL_INSIDE_LABEL_STYLE_FEATURE_COUNT = ViewPackage.CONDITIONAL_FEATURE_COUNT + 1; + /** - * The feature id for the 'Border Line Style' attribute. + * The number of operations of the 'Conditional Inside Label Style' class. * * @generated * @ordered */ - int ICON_LABEL_NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE = NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE; + int CONDITIONAL_INSIDE_LABEL_STYLE_OPERATION_COUNT = ViewPackage.CONDITIONAL_OPERATION_COUNT + 0; + /** - * The number of structural features of the 'Node Style Description' class. + * The meta object id for the + * '{@link org.eclipse.sirius.components.view.diagram.impl.ConditionalOutsideLabelStyleImpl Conditional Outside + * Label Style}' class. + * + * @see org.eclipse.sirius.components.view.diagram.impl.ConditionalOutsideLabelStyleImpl + * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getConditionalOutsideLabelStyle() + * @generated + */ + int CONDITIONAL_OUTSIDE_LABEL_STYLE = 18; + + /** + * The feature id for the 'Condition' attribute. * * @generated * @ordered */ - int NODE_STYLE_DESCRIPTION_FEATURE_COUNT = BORDER_STYLE_FEATURE_COUNT; + int CONDITIONAL_OUTSIDE_LABEL_STYLE__CONDITION = ViewPackage.CONDITIONAL__CONDITION; + /** - * The feature id for the 'Background' reference. + * The feature id for the 'Style' containment reference. * * @generated * @ordered */ - int RECTANGULAR_NODE_STYLE_DESCRIPTION__BACKGROUND = NODE_STYLE_DESCRIPTION_FEATURE_COUNT; + int CONDITIONAL_OUTSIDE_LABEL_STYLE__STYLE = ViewPackage.CONDITIONAL_FEATURE_COUNT + 0; + /** - * The number of structural features of the 'Rectangular Node Style Description' class. * * @generated * @ordered */ - int RECTANGULAR_NODE_STYLE_DESCRIPTION_FEATURE_COUNT = NODE_STYLE_DESCRIPTION_FEATURE_COUNT + 1; + int CONDITIONAL_OUTSIDE_LABEL_STYLE_FEATURE_COUNT = ViewPackage.CONDITIONAL_FEATURE_COUNT + 1; + /** - * The feature id for the 'Shape' attribute. + * The number of operations of the 'Conditional Outside Label Style' class. * * @generated * @ordered */ - int IMAGE_NODE_STYLE_DESCRIPTION__SHAPE = NODE_STYLE_DESCRIPTION_FEATURE_COUNT; + int CONDITIONAL_OUTSIDE_LABEL_STYLE_OPERATION_COUNT = ViewPackage.CONDITIONAL_OPERATION_COUNT + 0; + /** - * The feature id for the 'Position Dependent Rotation' attribute. + * The feature id for the 'Border Color' reference. * * @generated * @ordered */ - int IMAGE_NODE_STYLE_DESCRIPTION__POSITION_DEPENDENT_ROTATION = NODE_STYLE_DESCRIPTION_FEATURE_COUNT + 1; + int RECTANGULAR_NODE_STYLE_DESCRIPTION__BORDER_COLOR = NODE_STYLE_DESCRIPTION__BORDER_COLOR; + /** - * The number of structural features of the 'Image Node Style Description' class. - * + * The feature id for the 'Border Radius' attribute. * * @generated * @ordered */ - int IMAGE_NODE_STYLE_DESCRIPTION_FEATURE_COUNT = NODE_STYLE_DESCRIPTION_FEATURE_COUNT + 2; + int RECTANGULAR_NODE_STYLE_DESCRIPTION__BORDER_RADIUS = NODE_STYLE_DESCRIPTION__BORDER_RADIUS; + /** - * The feature id for the 'Background' reference. + * The feature id for the 'Border Size' attribute. * * @generated * @ordered */ - int ICON_LABEL_NODE_STYLE_DESCRIPTION__BACKGROUND = NODE_STYLE_DESCRIPTION_FEATURE_COUNT; + int RECTANGULAR_NODE_STYLE_DESCRIPTION__BORDER_SIZE = NODE_STYLE_DESCRIPTION__BORDER_SIZE; + /** - * The number of structural features of the 'Icon Label Node Style Description' class. + * The feature id for the 'Border Line Style' attribute. * * @generated * @ordered */ - int ICON_LABEL_NODE_STYLE_DESCRIPTION_FEATURE_COUNT = NODE_STYLE_DESCRIPTION_FEATURE_COUNT + 1; + int RECTANGULAR_NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE = NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE; + /** - * The number of operations of the 'Node Style Description' class. + * The feature id for the 'Background' reference. * * @generated * @ordered */ - int NODE_STYLE_DESCRIPTION_OPERATION_COUNT = BORDER_STYLE_OPERATION_COUNT; + int RECTANGULAR_NODE_STYLE_DESCRIPTION__BACKGROUND = NODE_STYLE_DESCRIPTION_FEATURE_COUNT + 0; + /** - * The number of operations of the 'Rectangular Node Style Description' class. + * The number of structural features of the 'Rectangular Node Style Description' class. * * @generated * @ordered */ - int RECTANGULAR_NODE_STYLE_DESCRIPTION_OPERATION_COUNT = NODE_STYLE_DESCRIPTION_OPERATION_COUNT; + int RECTANGULAR_NODE_STYLE_DESCRIPTION_FEATURE_COUNT = NODE_STYLE_DESCRIPTION_FEATURE_COUNT + 1; + /** - * The number of operations of the 'Image Node Style Description' class. * * @generated * @ordered */ - int IMAGE_NODE_STYLE_DESCRIPTION_OPERATION_COUNT = NODE_STYLE_DESCRIPTION_OPERATION_COUNT; + int RECTANGULAR_NODE_STYLE_DESCRIPTION_OPERATION_COUNT = NODE_STYLE_DESCRIPTION_OPERATION_COUNT + 0; + /** - * The number of operations of the 'Icon Label Node Style Description' class. + * The feature id for the 'Border Color' reference. * * @generated * @ordered */ - int ICON_LABEL_NODE_STYLE_DESCRIPTION_OPERATION_COUNT = NODE_STYLE_DESCRIPTION_OPERATION_COUNT; + int IMAGE_NODE_STYLE_DESCRIPTION__BORDER_COLOR = NODE_STYLE_DESCRIPTION__BORDER_COLOR; + /** - * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.ConditionalNodeStyleImpl - * Conditional Node Style}' class. + * The feature id for the 'Border Radius' attribute. * * @generated - * @see org.eclipse.sirius.components.view.diagram.impl.ConditionalNodeStyleImpl - * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getConditionalNodeStyle() + * @ordered */ - int CONDITIONAL_NODE_STYLE = 16; + int IMAGE_NODE_STYLE_DESCRIPTION__BORDER_RADIUS = NODE_STYLE_DESCRIPTION__BORDER_RADIUS; + /** - * The feature id for the 'Condition' attribute. + * The feature id for the 'Border Size' attribute. * * @generated * @ordered */ - int CONDITIONAL_NODE_STYLE__CONDITION = ViewPackage.CONDITIONAL__CONDITION; + int IMAGE_NODE_STYLE_DESCRIPTION__BORDER_SIZE = NODE_STYLE_DESCRIPTION__BORDER_SIZE; + /** - * The feature id for the 'Style' containment reference. * * @generated * @ordered */ - int CONDITIONAL_NODE_STYLE__STYLE = ViewPackage.CONDITIONAL_FEATURE_COUNT; + int IMAGE_NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE = NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE; + /** - * The number of structural features of the 'Conditional Node Style' class. + * The feature id for the 'Shape' attribute. * * @generated * @ordered */ - int CONDITIONAL_NODE_STYLE_FEATURE_COUNT = ViewPackage.CONDITIONAL_FEATURE_COUNT + 1; + int IMAGE_NODE_STYLE_DESCRIPTION__SHAPE = NODE_STYLE_DESCRIPTION_FEATURE_COUNT + 0; + /** - * The number of operations of the 'Conditional Node Style' class. * * @generated * @ordered */ - int CONDITIONAL_NODE_STYLE_OPERATION_COUNT = ViewPackage.CONDITIONAL_OPERATION_COUNT; + int IMAGE_NODE_STYLE_DESCRIPTION__POSITION_DEPENDENT_ROTATION = NODE_STYLE_DESCRIPTION_FEATURE_COUNT + 1; + /** - * The meta object id for the - * '{@link org.eclipse.sirius.components.view.diagram.impl.ConditionalInsideLabelStyleImpl Conditional Inside - * Label Style}' class. + * The number of structural features of the 'Image Node Style Description' class. + * * * @generated - * @see org.eclipse.sirius.components.view.diagram.impl.ConditionalInsideLabelStyleImpl - * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getConditionalInsideLabelStyle() + * @ordered */ - int CONDITIONAL_INSIDE_LABEL_STYLE = 17; + int IMAGE_NODE_STYLE_DESCRIPTION_FEATURE_COUNT = NODE_STYLE_DESCRIPTION_FEATURE_COUNT + 2; + /** - * The feature id for the 'Condition' attribute. + * The number of operations of the 'Image Node Style Description' class. * * @generated * @ordered */ - int CONDITIONAL_INSIDE_LABEL_STYLE__CONDITION = ViewPackage.CONDITIONAL__CONDITION; + int IMAGE_NODE_STYLE_DESCRIPTION_OPERATION_COUNT = NODE_STYLE_DESCRIPTION_OPERATION_COUNT + 0; + /** - * The feature id for the 'Style' containment reference. + * The feature id for the 'Border Color' reference. * * @generated * @ordered */ - int CONDITIONAL_INSIDE_LABEL_STYLE__STYLE = ViewPackage.CONDITIONAL_FEATURE_COUNT; + int ICON_LABEL_NODE_STYLE_DESCRIPTION__BORDER_COLOR = NODE_STYLE_DESCRIPTION__BORDER_COLOR; + /** - * The number of structural features of the 'Conditional Inside Label Style' class. - * + * The feature id for the 'Border Radius' attribute. * * @generated * @ordered */ - int CONDITIONAL_INSIDE_LABEL_STYLE_FEATURE_COUNT = ViewPackage.CONDITIONAL_FEATURE_COUNT + 1; + int ICON_LABEL_NODE_STYLE_DESCRIPTION__BORDER_RADIUS = NODE_STYLE_DESCRIPTION__BORDER_RADIUS; + /** - * The number of operations of the 'Conditional Inside Label Style' class. + * The feature id for the 'Border Size' attribute. * * @generated * @ordered */ - int CONDITIONAL_INSIDE_LABEL_STYLE_OPERATION_COUNT = ViewPackage.CONDITIONAL_OPERATION_COUNT; + int ICON_LABEL_NODE_STYLE_DESCRIPTION__BORDER_SIZE = NODE_STYLE_DESCRIPTION__BORDER_SIZE; + /** - * The meta object id for the - * '{@link org.eclipse.sirius.components.view.diagram.impl.ConditionalOutsideLabelStyleImpl Conditional Outside - * Label Style}' class. - * - * @generated - * @see org.eclipse.sirius.components.view.diagram.impl.ConditionalOutsideLabelStyleImpl - * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getConditionalOutsideLabelStyle() - */ - int CONDITIONAL_OUTSIDE_LABEL_STYLE = 18; - /** - * The feature id for the 'Condition' attribute. + * The feature id for the 'Border Line Style' attribute. * * @generated * @ordered */ - int CONDITIONAL_OUTSIDE_LABEL_STYLE__CONDITION = ViewPackage.CONDITIONAL__CONDITION; + int ICON_LABEL_NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE = NODE_STYLE_DESCRIPTION__BORDER_LINE_STYLE; + /** - * The feature id for the 'Style' containment reference. + * The feature id for the 'Background' reference. * * @generated * @ordered */ - int CONDITIONAL_OUTSIDE_LABEL_STYLE__STYLE = ViewPackage.CONDITIONAL_FEATURE_COUNT; + int ICON_LABEL_NODE_STYLE_DESCRIPTION__BACKGROUND = NODE_STYLE_DESCRIPTION_FEATURE_COUNT + 0; + /** - * The number of structural features of the 'Conditional Outside Label Style' class. * * @generated * @ordered */ - int CONDITIONAL_OUTSIDE_LABEL_STYLE_FEATURE_COUNT = ViewPackage.CONDITIONAL_FEATURE_COUNT + 1; + int ICON_LABEL_NODE_STYLE_DESCRIPTION_FEATURE_COUNT = NODE_STYLE_DESCRIPTION_FEATURE_COUNT + 1; + /** - * The number of operations of the 'Conditional Outside Label Style' class. * * @generated * @ordered */ - int CONDITIONAL_OUTSIDE_LABEL_STYLE_OPERATION_COUNT = ViewPackage.CONDITIONAL_OPERATION_COUNT; + int ICON_LABEL_NODE_STYLE_DESCRIPTION_OPERATION_COUNT = NODE_STYLE_DESCRIPTION_OPERATION_COUNT + 0; + /** * The meta object id for the * '{@link org.eclipse.sirius.components.view.diagram.impl.RectangularNodeStyleDescriptionImpl Rectangular Node * Style Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.RectangularNodeStyleDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getRectangularNodeStyleDescription() + * @generated */ int RECTANGULAR_NODE_STYLE_DESCRIPTION = 19; @@ -1709,9 +1752,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.ImageNodeStyleDescriptionImpl * Image Node Style Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ImageNodeStyleDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getImageNodeStyleDescription() + * @generated */ int IMAGE_NODE_STYLE_DESCRIPTION = 20; @@ -1720,9 +1763,9 @@ public interface DiagramPackage extends EPackage { * '{@link org.eclipse.sirius.components.view.diagram.impl.IconLabelNodeStyleDescriptionImpl Icon Label Node * Style Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.IconLabelNodeStyleDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getIconLabelNodeStyleDescription() + * @generated */ int ICON_LABEL_NODE_STYLE_DESCRIPTION = 21; @@ -1730,9 +1773,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.EdgeStyleImpl Edge * Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.EdgeStyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getEdgeStyle() + * @generated */ int EDGE_STYLE = 22; @@ -1750,7 +1793,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int EDGE_STYLE__FONT_SIZE = STYLE_FEATURE_COUNT; + int EDGE_STYLE__FONT_SIZE = STYLE_FEATURE_COUNT + 0; /** * The feature id for the 'Italic' attribute. @@ -1849,15 +1892,15 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int EDGE_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT; + int EDGE_STYLE_OPERATION_COUNT = STYLE_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.ConditionalEdgeStyleImpl * Conditional Edge Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ConditionalEdgeStyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getConditionalEdgeStyle() + * @generated */ int CONDITIONAL_EDGE_STYLE = 23; @@ -1875,7 +1918,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int CONDITIONAL_EDGE_STYLE__COLOR = ViewPackage.CONDITIONAL_FEATURE_COUNT; + int CONDITIONAL_EDGE_STYLE__COLOR = ViewPackage.CONDITIONAL_FEATURE_COUNT + 0; /** * The feature id for the 'Font Size' attribute. @@ -1983,15 +2026,15 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int CONDITIONAL_EDGE_STYLE_OPERATION_COUNT = ViewPackage.CONDITIONAL_OPERATION_COUNT; + int CONDITIONAL_EDGE_STYLE_OPERATION_COUNT = ViewPackage.CONDITIONAL_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.DiagramPaletteImpl * Palette}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPaletteImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDiagramPalette() + * @generated */ int DIAGRAM_PALETTE = 24; @@ -2051,9 +2094,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.NodePaletteImpl Node * Palette}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.NodePaletteImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodePalette() + * @generated */ int NODE_PALETTE = 25; @@ -2132,9 +2175,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.EdgePaletteImpl Edge * Palette}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.EdgePaletteImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getEdgePalette() + * @generated */ int EDGE_PALETTE = 26; @@ -2222,9 +2265,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.ToolImpl Tool}' * class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getTool() + * @generated */ int TOOL = 27; @@ -2274,9 +2317,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.DeleteToolImpl Delete * Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DeleteToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDeleteTool() + * @generated */ int DELETE_TOOL = 28; @@ -2313,7 +2356,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int DELETE_TOOL_FEATURE_COUNT = TOOL_FEATURE_COUNT; + int DELETE_TOOL_FEATURE_COUNT = TOOL_FEATURE_COUNT + 0; /** * The number of operations of the 'Delete Tool' class. @@ -2321,15 +2364,15 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int DELETE_TOOL_OPERATION_COUNT = TOOL_OPERATION_COUNT; + int DELETE_TOOL_OPERATION_COUNT = TOOL_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.DropToolImpl Drop * Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DropToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDropTool() + * @generated */ int DROP_TOOL = 29; @@ -2366,7 +2409,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int DROP_TOOL_FEATURE_COUNT = TOOL_FEATURE_COUNT; + int DROP_TOOL_FEATURE_COUNT = TOOL_FEATURE_COUNT + 0; /** * The number of operations of the 'Drop Tool' class. @@ -2374,15 +2417,15 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int DROP_TOOL_OPERATION_COUNT = TOOL_OPERATION_COUNT; + int DROP_TOOL_OPERATION_COUNT = TOOL_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.EdgeToolImpl Edge * Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.EdgeToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getEdgeTool() + * @generated */ int EDGE_TOOL = 30; @@ -2419,7 +2462,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int EDGE_TOOL__TARGET_ELEMENT_DESCRIPTIONS = TOOL_FEATURE_COUNT; + int EDGE_TOOL__TARGET_ELEMENT_DESCRIPTIONS = TOOL_FEATURE_COUNT + 0; /** * The feature id for the 'Icon UR Ls Expression' attribute. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.EdgeReconnectionToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getEdgeReconnectionTool() + * @generated */ int EDGE_RECONNECTION_TOOL = 31; @@ -2464,60 +2507,70 @@ public interface DiagramPackage extends EPackage { * @ordered */ int EDGE_RECONNECTION_TOOL__NAME = TOOL__NAME; + /** - * The feature id for the 'Name' attribute. + * The feature id for the 'Precondition Expression' attribute. * * @generated * @ordered */ - int SOURCE_EDGE_END_RECONNECTION_TOOL__NAME = EDGE_RECONNECTION_TOOL__NAME; + int EDGE_RECONNECTION_TOOL__PRECONDITION_EXPRESSION = TOOL__PRECONDITION_EXPRESSION; + /** - * The feature id for the 'Name' attribute. + * The feature id for the 'Body' containment reference list. * * @generated * @ordered */ - int TARGET_EDGE_END_RECONNECTION_TOOL__NAME = EDGE_RECONNECTION_TOOL__NAME; + int EDGE_RECONNECTION_TOOL__BODY = TOOL__BODY; + /** - * The feature id for the 'Precondition Expression' attribute. * * @generated * @ordered */ - int EDGE_RECONNECTION_TOOL__PRECONDITION_EXPRESSION = TOOL__PRECONDITION_EXPRESSION; + int EDGE_RECONNECTION_TOOL_FEATURE_COUNT = TOOL_FEATURE_COUNT + 0; + /** - * The feature id for the 'Precondition Expression' attribute. * * @generated * @ordered */ - int SOURCE_EDGE_END_RECONNECTION_TOOL__PRECONDITION_EXPRESSION = EDGE_RECONNECTION_TOOL__PRECONDITION_EXPRESSION; + int EDGE_RECONNECTION_TOOL_OPERATION_COUNT = TOOL_OPERATION_COUNT + 0; + /** - * The feature id for the 'Precondition Expression' attribute. + * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.LabelEditToolImpl Label + * Edit Tool}' class. * + * @see org.eclipse.sirius.components.view.diagram.impl.LabelEditToolImpl + * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLabelEditTool() * @generated - * @ordered */ - int TARGET_EDGE_END_RECONNECTION_TOOL__PRECONDITION_EXPRESSION = EDGE_RECONNECTION_TOOL__PRECONDITION_EXPRESSION; + int LABEL_EDIT_TOOL = 32; + /** - * The feature id for the 'Body' containment reference list. + * The feature id for the 'Name' attribute. * * @generated * @ordered */ - int EDGE_RECONNECTION_TOOL__BODY = TOOL__BODY; + int LABEL_EDIT_TOOL__NAME = TOOL__NAME; + /** - * The feature id for the 'Body' containment reference list. * * @generated * @ordered */ - int SOURCE_EDGE_END_RECONNECTION_TOOL__BODY = EDGE_RECONNECTION_TOOL__BODY; + int LABEL_EDIT_TOOL__PRECONDITION_EXPRESSION = TOOL__PRECONDITION_EXPRESSION; + /** * The feature id for the 'Body' containment reference list. @@ -2525,181 +2578,201 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int TARGET_EDGE_END_RECONNECTION_TOOL__BODY = EDGE_RECONNECTION_TOOL__BODY; + int LABEL_EDIT_TOOL__BODY = TOOL__BODY; + /** - * The number of structural features of the 'Edge Reconnection Tool' class. + * The feature id for the 'Initial Direct Edit Label Expression' attribute. + * * * @generated * @ordered */ - int EDGE_RECONNECTION_TOOL_FEATURE_COUNT = TOOL_FEATURE_COUNT; + int LABEL_EDIT_TOOL__INITIAL_DIRECT_EDIT_LABEL_EXPRESSION = TOOL_FEATURE_COUNT + 0; + /** - * The number of structural features of the 'Source Edge End Reconnection Tool' class. + * The number of structural features of the 'Label Edit Tool' class. * * @generated * @ordered */ - int SOURCE_EDGE_END_RECONNECTION_TOOL_FEATURE_COUNT = EDGE_RECONNECTION_TOOL_FEATURE_COUNT; + int LABEL_EDIT_TOOL_FEATURE_COUNT = TOOL_FEATURE_COUNT + 1; + /** - * The number of structural features of the 'Target Edge End Reconnection Tool' class. + * The number of operations of the 'Label Edit Tool' class. * * @generated * @ordered */ - int TARGET_EDGE_END_RECONNECTION_TOOL_FEATURE_COUNT = EDGE_RECONNECTION_TOOL_FEATURE_COUNT; + int LABEL_EDIT_TOOL_OPERATION_COUNT = TOOL_OPERATION_COUNT + 0; + /** - * The number of operations of the 'Edge Reconnection Tool' class. + * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.NodeToolImpl Node + * Tool}' class. * + * @see org.eclipse.sirius.components.view.diagram.impl.NodeToolImpl + * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeTool() * @generated - * @ordered */ - int EDGE_RECONNECTION_TOOL_OPERATION_COUNT = TOOL_OPERATION_COUNT; + int NODE_TOOL = 33; + /** - * The number of operations of the 'Source Edge End Reconnection Tool' class. + * The feature id for the 'Name' attribute. * * @generated * @ordered */ - int SOURCE_EDGE_END_RECONNECTION_TOOL_OPERATION_COUNT = EDGE_RECONNECTION_TOOL_OPERATION_COUNT; + int NODE_TOOL__NAME = TOOL__NAME; + /** - * The number of operations of the 'Target Edge End Reconnection Tool' class. * * @generated * @ordered */ - int TARGET_EDGE_END_RECONNECTION_TOOL_OPERATION_COUNT = EDGE_RECONNECTION_TOOL_OPERATION_COUNT; + int NODE_TOOL__PRECONDITION_EXPRESSION = TOOL__PRECONDITION_EXPRESSION; + /** - * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.LabelEditToolImpl Label - * Edit Tool}' class. + * The feature id for the 'Body' containment reference list. * * @generated - * @see org.eclipse.sirius.components.view.diagram.impl.LabelEditToolImpl - * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLabelEditTool() + * @ordered */ - int LABEL_EDIT_TOOL = 32; + int NODE_TOOL__BODY = TOOL__BODY; + /** - * The feature id for the 'Name' attribute. + * The feature id for the 'Dialog Description' containment reference. * * @generated * @ordered */ - int LABEL_EDIT_TOOL__NAME = TOOL__NAME; + int NODE_TOOL__DIALOG_DESCRIPTION = TOOL_FEATURE_COUNT + 0; + /** - * The feature id for the 'Precondition Expression' attribute. * * @generated * @ordered */ - int LABEL_EDIT_TOOL__PRECONDITION_EXPRESSION = TOOL__PRECONDITION_EXPRESSION; + int NODE_TOOL__ICON_UR_LS_EXPRESSION = TOOL_FEATURE_COUNT + 1; + /** - * The feature id for the 'Body' containment reference list. + * The number of structural features of the 'Node Tool' class. * * @generated * @ordered */ - int LABEL_EDIT_TOOL__BODY = TOOL__BODY; + int NODE_TOOL_FEATURE_COUNT = TOOL_FEATURE_COUNT + 2; + /** - * The feature id for the 'Initial Direct Edit Label Expression' attribute. - * + * The number of operations of the 'Node Tool' class. * * @generated * @ordered */ - int LABEL_EDIT_TOOL__INITIAL_DIRECT_EDIT_LABEL_EXPRESSION = TOOL_FEATURE_COUNT; + int NODE_TOOL_OPERATION_COUNT = TOOL_OPERATION_COUNT + 0; + /** - * The number of structural features of the 'Label Edit Tool' class. + * The feature id for the 'Name' attribute. * * @generated * @ordered */ - int LABEL_EDIT_TOOL_FEATURE_COUNT = TOOL_FEATURE_COUNT + 1; + int SOURCE_EDGE_END_RECONNECTION_TOOL__NAME = EDGE_RECONNECTION_TOOL__NAME; + /** - * The number of operations of the 'Label Edit Tool' class. + * The feature id for the 'Precondition Expression' attribute. * * @generated * @ordered */ - int LABEL_EDIT_TOOL_OPERATION_COUNT = TOOL_OPERATION_COUNT; + int SOURCE_EDGE_END_RECONNECTION_TOOL__PRECONDITION_EXPRESSION = EDGE_RECONNECTION_TOOL__PRECONDITION_EXPRESSION; + /** - * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.NodeToolImpl Node - * Tool}' class. + * The feature id for the 'Body' containment reference list. * * @generated - * @see org.eclipse.sirius.components.view.diagram.impl.NodeToolImpl - * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeTool() + * @ordered */ - int NODE_TOOL = 33; + int SOURCE_EDGE_END_RECONNECTION_TOOL__BODY = EDGE_RECONNECTION_TOOL__BODY; + /** - * The feature id for the 'Name' attribute. + * The number of structural features of the 'Source Edge End Reconnection Tool' class. * * @generated * @ordered */ - int NODE_TOOL__NAME = TOOL__NAME; + int SOURCE_EDGE_END_RECONNECTION_TOOL_FEATURE_COUNT = EDGE_RECONNECTION_TOOL_FEATURE_COUNT + 0; + /** - * The feature id for the 'Precondition Expression' attribute. * * @generated * @ordered */ - int NODE_TOOL__PRECONDITION_EXPRESSION = TOOL__PRECONDITION_EXPRESSION; + int SOURCE_EDGE_END_RECONNECTION_TOOL_OPERATION_COUNT = EDGE_RECONNECTION_TOOL_OPERATION_COUNT + 0; + /** - * The feature id for the 'Body' containment reference list. + * The feature id for the 'Name' attribute. * * @generated * @ordered */ - int NODE_TOOL__BODY = TOOL__BODY; + int TARGET_EDGE_END_RECONNECTION_TOOL__NAME = EDGE_RECONNECTION_TOOL__NAME; + /** - * The feature id for the 'Selection Description' containment reference. - * + * The feature id for the 'Precondition Expression' attribute. * * @generated * @ordered */ - int NODE_TOOL__SELECTION_DESCRIPTION = TOOL_FEATURE_COUNT; + int TARGET_EDGE_END_RECONNECTION_TOOL__PRECONDITION_EXPRESSION = EDGE_RECONNECTION_TOOL__PRECONDITION_EXPRESSION; + /** - * The feature id for the 'Icon UR Ls Expression' attribute. * * @generated * @ordered */ - int NODE_TOOL__ICON_UR_LS_EXPRESSION = TOOL_FEATURE_COUNT + 1; + int TARGET_EDGE_END_RECONNECTION_TOOL__BODY = EDGE_RECONNECTION_TOOL__BODY; + /** - * The number of structural features of the 'Node Tool' class. + * The number of structural features of the 'Target Edge End Reconnection Tool' class. * * @generated * @ordered */ - int NODE_TOOL_FEATURE_COUNT = TOOL_FEATURE_COUNT + 2; + int TARGET_EDGE_END_RECONNECTION_TOOL_FEATURE_COUNT = EDGE_RECONNECTION_TOOL_FEATURE_COUNT + 0; + /** - * The number of operations of the 'Node Tool' class. + * The number of operations of the 'Target Edge End Reconnection Tool' class. * * @generated * @ordered */ - int NODE_TOOL_OPERATION_COUNT = TOOL_OPERATION_COUNT; + int TARGET_EDGE_END_RECONNECTION_TOOL_OPERATION_COUNT = EDGE_RECONNECTION_TOOL_OPERATION_COUNT + 0; + /** * The meta object id for the * '{@link org.eclipse.sirius.components.view.diagram.impl.SourceEdgeEndReconnectionToolImpl Source Edge End * Reconnection Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.SourceEdgeEndReconnectionToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getSourceEdgeEndReconnectionTool() + * @generated */ int SOURCE_EDGE_END_RECONNECTION_TOOL = 34; @@ -2708,9 +2781,9 @@ public interface DiagramPackage extends EPackage { * '{@link org.eclipse.sirius.components.view.diagram.impl.TargetEdgeEndReconnectionToolImpl Target Edge End * Reconnection Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.TargetEdgeEndReconnectionToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getTargetEdgeEndReconnectionTool() + * @generated */ int TARGET_EDGE_END_RECONNECTION_TOOL = 35; @@ -2718,9 +2791,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.CreateViewImpl Create * View}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.CreateViewImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getCreateView() + * @generated */ int CREATE_VIEW = 36; @@ -2740,7 +2813,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int CREATE_VIEW__PARENT_VIEW_EXPRESSION = ViewPackage.OPERATION_FEATURE_COUNT; + int CREATE_VIEW__PARENT_VIEW_EXPRESSION = ViewPackage.OPERATION_FEATURE_COUNT + 0; /** * The feature id for the 'Element Description' reference. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DeleteViewImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDeleteView() + * @generated */ int DELETE_VIEW = 37; @@ -2819,7 +2892,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int DELETE_VIEW__VIEW_EXPRESSION = ViewPackage.OPERATION_FEATURE_COUNT; + int DELETE_VIEW__VIEW_EXPRESSION = ViewPackage.OPERATION_FEATURE_COUNT + 0; /** * The number of structural features of the 'Delete View' class. + * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.DialogDescriptionImpl + * Dialog Description}' class. * + * @see org.eclipse.sirius.components.view.diagram.impl.DialogDescriptionImpl + * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDialogDescription() * @generated - * @see org.eclipse.sirius.components.view.diagram.impl.SelectionDescriptionImpl - * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getSelectionDescription() */ - int SELECTION_DESCRIPTION = 38; + int DIALOG_DESCRIPTION = 44; /** - * The feature id for the 'Selection Candidates Expression' attribute. * * @generated * @ordered */ - int SELECTION_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION = 0; + int DIALOG_DESCRIPTION_FEATURE_COUNT = 0; /** - * The feature id for the 'Selection Message' attribute. * * @generated * @ordered */ - int SELECTION_DESCRIPTION__SELECTION_MESSAGE = 1; + int DIALOG_DESCRIPTION_OPERATION_COUNT = 0; /** - * The number of structural features of the 'Selection Description' class. + * + * @see org.eclipse.sirius.components.view.diagram.impl.SelectionDialogDescriptionImpl + * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getSelectionDialogDescription() + * @generated + */ + int SELECTION_DIALOG_DESCRIPTION = 38; + + /** + * The feature id for the 'Selection Candidates Expression' attribute. * * @generated * @ordered */ - int SELECTION_DESCRIPTION_FEATURE_COUNT = 2; + int SELECTION_DIALOG_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION = DIALOG_DESCRIPTION_FEATURE_COUNT + 0; /** - * The number of operations of the 'Selection Description' class. * * @generated * @ordered */ - int SELECTION_DESCRIPTION_OPERATION_COUNT = 0; + int SELECTION_DIALOG_DESCRIPTION__SELECTION_MESSAGE = DIALOG_DESCRIPTION_FEATURE_COUNT + 1; + + /** + * The number of structural features of the 'Selection Dialog Description' class. + * + * + * @generated + * @ordered + */ + int SELECTION_DIALOG_DESCRIPTION_FEATURE_COUNT = DIALOG_DESCRIPTION_FEATURE_COUNT + 2; + + /** + * The number of operations of the 'Selection Dialog Description' class. + * + * @generated + * @ordered + */ + int SELECTION_DIALOG_DESCRIPTION_OPERATION_COUNT = DIALOG_DESCRIPTION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.ToolSectionImpl Tool * Section}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ToolSectionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getToolSection() + * @generated */ int TOOL_SECTION = 39; @@ -2923,9 +3024,9 @@ public interface DiagramPackage extends EPackage { * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.impl.DiagramToolSectionImpl * Tool Section}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DiagramToolSectionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDiagramToolSection() + * @generated */ int DIAGRAM_TOOL_SECTION = 40; @@ -2944,7 +3045,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int DIAGRAM_TOOL_SECTION__NODE_TOOLS = TOOL_SECTION_FEATURE_COUNT; + int DIAGRAM_TOOL_SECTION__NODE_TOOLS = TOOL_SECTION_FEATURE_COUNT + 0; /** * The number of structural features of the 'Tool Section' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.NodeToolSectionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeToolSection() + * @generated */ int NODE_TOOL_SECTION = 41; @@ -2988,7 +3089,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int NODE_TOOL_SECTION__NODE_TOOLS = TOOL_SECTION_FEATURE_COUNT; + int NODE_TOOL_SECTION__NODE_TOOLS = TOOL_SECTION_FEATURE_COUNT + 0; /** * The feature id for the 'Edge Tools' containment reference list. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.EdgeToolSectionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getEdgeToolSection() + * @generated */ int EDGE_TOOL_SECTION = 42; @@ -3041,7 +3142,7 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int EDGE_TOOL_SECTION__NODE_TOOLS = TOOL_SECTION_FEATURE_COUNT; + int EDGE_TOOL_SECTION__NODE_TOOLS = TOOL_SECTION_FEATURE_COUNT + 0; /** * The number of structural features of the 'Edge Tool Section' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DropNodeToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDropNodeTool() + * @generated */ int DROP_NODE_TOOL = 43; @@ -3103,7 +3204,8 @@ public interface DiagramPackage extends EPackage { * @generated * @ordered */ - int DROP_NODE_TOOL__ACCEPTED_NODE_TYPES = TOOL_FEATURE_COUNT; + int DROP_NODE_TOOL__ACCEPTED_NODE_TYPES = TOOL_FEATURE_COUNT + 0; + /** * The number of structural features of the 'Drop Node Tool' class. @@ -3112,103 +3214,115 @@ public interface DiagramPackage extends EPackage { * @ordered */ int DROP_NODE_TOOL_FEATURE_COUNT = TOOL_FEATURE_COUNT + 1; + /** * The number of operations of the 'Drop Node Tool' class. * * @generated * @ordered */ - int DROP_NODE_TOOL_OPERATION_COUNT = TOOL_OPERATION_COUNT; + int DROP_NODE_TOOL_OPERATION_COUNT = TOOL_OPERATION_COUNT + 0; + /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.ArrowStyle Arrow Style}' * enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.ArrowStyle * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getArrowStyle() + * @generated */ - int ARROW_STYLE = 44; + int ARROW_STYLE = 45; + /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.LayoutDirection Layout * Direction}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.LayoutDirection * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLayoutDirection() + * @generated */ - int LAYOUT_DIRECTION = 45; + int LAYOUT_DIRECTION = 46; + /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.LineStyle Line Style}' * enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.LineStyle * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLineStyle() + * @generated */ - int LINE_STYLE = 46; + int LINE_STYLE = 47; + /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.NodeContainmentKind Node * Containment Kind}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeContainmentKind * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeContainmentKind() + * @generated */ - int NODE_CONTAINMENT_KIND = 47; + int NODE_CONTAINMENT_KIND = 48; + /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.SynchronizationPolicy * Synchronization Policy}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.SynchronizationPolicy * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getSynchronizationPolicy() + * @generated */ - int SYNCHRONIZATION_POLICY = 48; + int SYNCHRONIZATION_POLICY = 49; + /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.InsideLabelPosition Inside * Label Position}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.InsideLabelPosition * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getInsideLabelPosition() + * @generated */ - int INSIDE_LABEL_POSITION = 49; + int INSIDE_LABEL_POSITION = 50; + /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.OutsideLabelPosition Outside * Label Position}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.OutsideLabelPosition * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getOutsideLabelPosition() + * @generated */ - int OUTSIDE_LABEL_POSITION = 50; + int OUTSIDE_LABEL_POSITION = 51; + /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.LabelOverflowStrategy Label * Overflow Strategy}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelOverflowStrategy * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLabelOverflowStrategy() + * @generated */ - int LABEL_OVERFLOW_STRATEGY = 51; + int LABEL_OVERFLOW_STRATEGY = 52; + /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.ArrangeLayoutDirection Arrange * Layout Direction}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.ArrangeLayoutDirection * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getArrangeLayoutDirection() + * @generated */ - int ARRANGE_LAYOUT_DIRECTION = 52; + int ARRANGE_LAYOUT_DIRECTION = 53; + /** * The meta object id for the '{@link org.eclipse.sirius.components.view.diagram.LabelTextAlign Label Text * Align}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelTextAlign * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLabelTextAlign() + * @generated */ - int LABEL_TEXT_ALIGN = 53; + int LABEL_TEXT_ALIGN = 54; + /** * The singleton instance of the package. * @@ -3221,8 +3335,8 @@ public interface DiagramPackage extends EPackage { * Description}'. * * @return the meta object for class 'Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DiagramDescription + * @generated */ EClass getDiagramDescription(); @@ -3256,9 +3370,9 @@ public interface DiagramPackage extends EPackage { * Descriptions}'. * * @return the meta object for the containment reference list 'Node Descriptions'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DiagramDescription#getNodeDescriptions() * @see #getDiagramDescription() + * @generated */ EReference getDiagramDescription_NodeDescriptions(); @@ -3268,9 +3382,9 @@ public interface DiagramPackage extends EPackage { * Descriptions}'. * * @return the meta object for the containment reference list 'Edge Descriptions'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DiagramDescription#getEdgeDescriptions() * @see #getDiagramDescription() + * @generated */ EReference getDiagramDescription_EdgeDescriptions(); @@ -3280,9 +3394,9 @@ public interface DiagramPackage extends EPackage { * Layout Direction}'. * * @return the meta object for the attribute 'Arrange Layout Direction'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DiagramDescription#getArrangeLayoutDirection() * @see #getDiagramDescription() + * @generated */ EAttribute getDiagramDescription_ArrangeLayoutDirection(); @@ -3291,8 +3405,8 @@ public interface DiagramPackage extends EPackage { * Element Description}'. * * @return the meta object for class 'Element Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DiagramElementDescription + * @generated */ EClass getDiagramElementDescription(); @@ -3314,9 +3428,9 @@ public interface DiagramPackage extends EPackage { * Type}'. * * @return the meta object for the attribute 'Domain Type'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DiagramElementDescription#getDomainType() * @see #getDiagramElementDescription() + * @generated */ EAttribute getDiagramElementDescription_DomainType(); @@ -3326,9 +3440,9 @@ public interface DiagramPackage extends EPackage { * Semantic Candidates Expression}'. * * @return the meta object for the attribute 'Semantic Candidates Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DiagramElementDescription#getSemanticCandidatesExpression() * @see #getDiagramElementDescription() + * @generated */ EAttribute getDiagramElementDescription_SemanticCandidatesExpression(); @@ -3338,9 +3452,9 @@ public interface DiagramPackage extends EPackage { * Precondition Expression}'. * * @return the meta object for the attribute 'Precondition Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DiagramElementDescription#getPreconditionExpression() * @see #getDiagramElementDescription() + * @generated */ EAttribute getDiagramElementDescription_PreconditionExpression(); @@ -3350,9 +3464,9 @@ public interface DiagramPackage extends EPackage { * Synchronization Policy}'. * * @return the meta object for the attribute 'Synchronization Policy'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DiagramElementDescription#getSynchronizationPolicy() * @see #getDiagramElementDescription() + * @generated */ EAttribute getDiagramElementDescription_SynchronizationPolicy(); @@ -3361,8 +3475,8 @@ public interface DiagramPackage extends EPackage { * Description}'. * * @return the meta object for class 'Node Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription + * @generated */ EClass getNodeDescription(); @@ -3396,9 +3510,9 @@ public interface DiagramPackage extends EPackage { * Strategy}'. * * @return the meta object for the containment reference 'Children Layout Strategy'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getChildrenLayoutStrategy() * @see #getNodeDescription() + * @generated */ EReference getNodeDescription_ChildrenLayoutStrategy(); @@ -3408,9 +3522,9 @@ public interface DiagramPackage extends EPackage { * --> * * @return the meta object for the containment reference 'Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getStyle() * @see #getNodeDescription() + * @generated */ EReference getNodeDescription_Style(); @@ -3420,9 +3534,9 @@ public interface DiagramPackage extends EPackage { * Styles}'. * * @return the meta object for the containment reference list 'Conditional Styles'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getConditionalStyles() * @see #getNodeDescription() + * @generated */ EReference getNodeDescription_ConditionalStyles(); @@ -3432,9 +3546,9 @@ public interface DiagramPackage extends EPackage { * Descriptions}'. * * @return the meta object for the containment reference list 'Children Descriptions'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getChildrenDescriptions() * @see #getNodeDescription() + * @generated */ EReference getNodeDescription_ChildrenDescriptions(); @@ -3444,9 +3558,9 @@ public interface DiagramPackage extends EPackage { * Descriptions}'. * * @return the meta object for the containment reference list 'Border Nodes Descriptions'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getBorderNodesDescriptions() * @see #getNodeDescription() + * @generated */ EReference getNodeDescription_BorderNodesDescriptions(); @@ -3456,9 +3570,9 @@ public interface DiagramPackage extends EPackage { * Child Node Descriptions}'. * * @return the meta object for the reference list 'Reused Child Node Descriptions'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getReusedChildNodeDescriptions() * @see #getNodeDescription() + * @generated */ EReference getNodeDescription_ReusedChildNodeDescriptions(); @@ -3468,9 +3582,9 @@ public interface DiagramPackage extends EPackage { * Border Node Descriptions}'. * * @return the meta object for the reference list 'Reused Border Node Descriptions'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getReusedBorderNodeDescriptions() * @see #getNodeDescription() + * @generated */ EReference getNodeDescription_ReusedBorderNodeDescriptions(); @@ -3480,9 +3594,9 @@ public interface DiagramPackage extends EPackage { * * * @return the meta object for the attribute 'User Resizable'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#isUserResizable() * @see #getNodeDescription() + * @generated */ EAttribute getNodeDescription_UserResizable(); @@ -3492,9 +3606,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Default Width Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getDefaultWidthExpression() * @see #getNodeDescription() + * @generated */ EAttribute getNodeDescription_DefaultWidthExpression(); @@ -3504,9 +3618,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Default Height Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getDefaultHeightExpression() * @see #getNodeDescription() + * @generated */ EAttribute getNodeDescription_DefaultHeightExpression(); @@ -3516,9 +3630,9 @@ public interface DiagramPackage extends EPackage { * Ratio}'. * * @return the meta object for the attribute 'Keep Aspect Ratio'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#isKeepAspectRatio() * @see #getNodeDescription() + * @generated */ EAttribute getNodeDescription_KeepAspectRatio(); @@ -3528,9 +3642,9 @@ public interface DiagramPackage extends EPackage { * Collapsed By Default Expression}'. * * @return the meta object for the attribute 'Is Collapsed By Default Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getIsCollapsedByDefaultExpression() * @see #getNodeDescription() + * @generated */ EAttribute getNodeDescription_IsCollapsedByDefaultExpression(); @@ -3552,9 +3666,9 @@ public interface DiagramPackage extends EPackage { * * * @return the meta object for the containment reference list 'Outside Labels'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getOutsideLabels() * @see #getNodeDescription() + * @generated */ EReference getNodeDescription_OutsideLabels(); @@ -3564,9 +3678,9 @@ public interface DiagramPackage extends EPackage { * By Default Expression}'. * * @return the meta object for the attribute 'Is Hidden By Default Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getIsHiddenByDefaultExpression() * @see #getNodeDescription() + * @generated */ EAttribute getNodeDescription_IsHiddenByDefaultExpression(); @@ -3576,9 +3690,9 @@ public interface DiagramPackage extends EPackage { * Default Expression}'. * * @return the meta object for the attribute 'Is Faded By Default Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeDescription#getIsFadedByDefaultExpression() * @see #getNodeDescription() + * @generated */ EAttribute getNodeDescription_IsFadedByDefaultExpression(); @@ -3587,8 +3701,8 @@ public interface DiagramPackage extends EPackage { * Description}'. * * @return the meta object for class 'Edge Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeDescription + * @generated */ EClass getEdgeDescription(); @@ -3598,9 +3712,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Begin Label Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeDescription#getBeginLabelExpression() * @see #getEdgeDescription() + * @generated */ EAttribute getEdgeDescription_BeginLabelExpression(); @@ -3610,9 +3724,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Center Label Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeDescription#getCenterLabelExpression() * @see #getEdgeDescription() + * @generated */ EAttribute getEdgeDescription_CenterLabelExpression(); @@ -3622,9 +3736,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'End Label Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeDescription#getEndLabelExpression() * @see #getEdgeDescription() + * @generated */ EAttribute getEdgeDescription_EndLabelExpression(); @@ -3634,9 +3748,9 @@ public interface DiagramPackage extends EPackage { * Edge}'. * * @return the meta object for the attribute 'Is Domain Based Edge'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeDescription#isIsDomainBasedEdge() * @see #getEdgeDescription() + * @generated */ EAttribute getEdgeDescription_IsDomainBasedEdge(); @@ -3658,9 +3772,9 @@ public interface DiagramPackage extends EPackage { * Descriptions}'. * * @return the meta object for the reference list 'Source Node Descriptions'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeDescription#getSourceNodeDescriptions() * @see #getEdgeDescription() + * @generated */ EReference getEdgeDescription_SourceNodeDescriptions(); @@ -3670,9 +3784,9 @@ public interface DiagramPackage extends EPackage { * Descriptions}'. * * @return the meta object for the reference list 'Target Node Descriptions'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeDescription#getTargetNodeDescriptions() * @see #getEdgeDescription() + * @generated */ EReference getEdgeDescription_TargetNodeDescriptions(); @@ -3682,9 +3796,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Source Nodes Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeDescription#getSourceNodesExpression() * @see #getEdgeDescription() + * @generated */ EAttribute getEdgeDescription_SourceNodesExpression(); @@ -3694,9 +3808,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Target Nodes Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeDescription#getTargetNodesExpression() * @see #getEdgeDescription() + * @generated */ EAttribute getEdgeDescription_TargetNodesExpression(); @@ -3706,9 +3820,9 @@ public interface DiagramPackage extends EPackage { * --> * * @return the meta object for the containment reference 'Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeDescription#getStyle() * @see #getEdgeDescription() + * @generated */ EReference getEdgeDescription_Style(); @@ -3718,9 +3832,9 @@ public interface DiagramPackage extends EPackage { * Styles}'. * * @return the meta object for the containment reference list 'Conditional Styles'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeDescription#getConditionalStyles() * @see #getEdgeDescription() + * @generated */ EReference getEdgeDescription_ConditionalStyles(); @@ -3729,8 +3843,8 @@ public interface DiagramPackage extends EPackage { * Layout Strategy Description}'. * * @return the meta object for class 'Layout Strategy Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.LayoutStrategyDescription + * @generated */ EClass getLayoutStrategyDescription(); @@ -3740,8 +3854,8 @@ public interface DiagramPackage extends EPackage { * Description}'. * * @return the meta object for class 'List Layout Strategy Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescription + * @generated */ EClass getListLayoutStrategyDescription(); @@ -3751,9 +3865,9 @@ public interface DiagramPackage extends EPackage { * Are Child Nodes Draggable Expression}'. * * @return the meta object for the attribute 'Are Child Nodes Draggable Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescription#getAreChildNodesDraggableExpression() * @see #getListLayoutStrategyDescription() + * @generated */ EAttribute getListLayoutStrategyDescription_AreChildNodesDraggableExpression(); @@ -3763,9 +3877,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Top Gap Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescription#getTopGapExpression() * @see #getListLayoutStrategyDescription() + * @generated */ EAttribute getListLayoutStrategyDescription_TopGapExpression(); @@ -3775,9 +3889,9 @@ public interface DiagramPackage extends EPackage { * Bottom Gap Expression}'. * * @return the meta object for the attribute 'Bottom Gap Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescription#getBottomGapExpression() * @see #getListLayoutStrategyDescription() + * @generated */ EAttribute getListLayoutStrategyDescription_BottomGapExpression(); @@ -3787,9 +3901,9 @@ public interface DiagramPackage extends EPackage { * Nodes}'. * * @return the meta object for the reference list 'Growable Nodes'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ListLayoutStrategyDescription#getGrowableNodes() * @see #getListLayoutStrategyDescription() + * @generated */ EReference getListLayoutStrategyDescription_GrowableNodes(); @@ -3799,8 +3913,8 @@ public interface DiagramPackage extends EPackage { * Strategy Description}'. * * @return the meta object for class 'Free Form Layout Strategy Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.FreeFormLayoutStrategyDescription + * @generated */ EClass getFreeFormLayoutStrategyDescription(); @@ -3809,8 +3923,8 @@ public interface DiagramPackage extends EPackage { * Description}'. * * @return the meta object for class 'Label Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelDescription + * @generated */ EClass getLabelDescription(); @@ -3820,9 +3934,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Label Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelDescription#getLabelExpression() * @see #getLabelDescription() + * @generated */ EAttribute getLabelDescription_LabelExpression(); @@ -3832,9 +3946,9 @@ public interface DiagramPackage extends EPackage { * Strategy}'. * * @return the meta object for the attribute 'Overflow Strategy'. - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelDescription#getOverflowStrategy() * @see #getLabelDescription() + * @generated */ EAttribute getLabelDescription_OverflowStrategy(); @@ -3855,8 +3969,8 @@ public interface DiagramPackage extends EPackage { * Inside Label Description}'. * * @return the meta object for class 'Inside Label Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.InsideLabelDescription + * @generated */ EClass getInsideLabelDescription(); @@ -3890,9 +4004,9 @@ public interface DiagramPackage extends EPackage { * Styles}'. * * @return the meta object for the containment reference list 'Conditional Styles'. - * @generated * @see org.eclipse.sirius.components.view.diagram.InsideLabelDescription#getConditionalStyles() * @see #getInsideLabelDescription() + * @generated */ EReference getInsideLabelDescription_ConditionalStyles(); @@ -3901,8 +4015,8 @@ public interface DiagramPackage extends EPackage { * Outside Label Description}'. * * @return the meta object for class 'Outside Label Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.OutsideLabelDescription + * @generated */ EClass getOutsideLabelDescription(); @@ -3936,9 +4050,9 @@ public interface DiagramPackage extends EPackage { * Styles}'. * * @return the meta object for the containment reference list 'Conditional Styles'. - * @generated * @see org.eclipse.sirius.components.view.diagram.OutsideLabelDescription#getConditionalStyles() * @see #getOutsideLabelDescription() + * @generated */ EReference getOutsideLabelDescription_ConditionalStyles(); @@ -3957,9 +4071,9 @@ public interface DiagramPackage extends EPackage { * Color}'. * * @return the meta object for the reference 'Color'. - * @generated * @see org.eclipse.sirius.components.view.diagram.Style#getColor() * @see #getStyle() + * @generated */ EReference getStyle_Color(); @@ -3968,8 +4082,8 @@ public interface DiagramPackage extends EPackage { * Style}'. * * @return the meta object for class 'Border Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.BorderStyle + * @generated */ EClass getBorderStyle(); @@ -4015,9 +4129,9 @@ public interface DiagramPackage extends EPackage { * * * @return the meta object for the attribute 'Border Line Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.BorderStyle#getBorderLineStyle() * @see #getBorderStyle() + * @generated */ EAttribute getBorderStyle_BorderLineStyle(); @@ -4026,8 +4140,8 @@ public interface DiagramPackage extends EPackage { * Label Style}'. * * @return the meta object for class 'Inside Label Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.InsideLabelStyle + * @generated */ EClass getInsideLabelStyle(); @@ -4049,9 +4163,9 @@ public interface DiagramPackage extends EPackage { * Separator}'. * * @return the meta object for the attribute 'Display Header Separator'. - * @generated * @see org.eclipse.sirius.components.view.diagram.InsideLabelStyle#isDisplayHeaderSeparator() * @see #getInsideLabelStyle() + * @generated */ EAttribute getInsideLabelStyle_DisplayHeaderSeparator(); @@ -4060,8 +4174,8 @@ public interface DiagramPackage extends EPackage { * Outside Label Style}'. * * @return the meta object for class 'Outside Label Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.OutsideLabelStyle + * @generated */ EClass getOutsideLabelStyle(); @@ -4070,8 +4184,8 @@ public interface DiagramPackage extends EPackage { * Label Style}'. * * @return the meta object for class 'Node Label Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeLabelStyle + * @generated */ EClass getNodeLabelStyle(); @@ -4116,8 +4230,8 @@ public interface DiagramPackage extends EPackage { * Node Style Description}'. * * @return the meta object for class 'Node Style Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeStyleDescription + * @generated */ EClass getNodeStyleDescription(); @@ -4126,8 +4240,8 @@ public interface DiagramPackage extends EPackage { * Conditional Node Style}'. * * @return the meta object for class 'Conditional Node Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ConditionalNodeStyle + * @generated */ EClass getConditionalNodeStyle(); @@ -4148,8 +4262,8 @@ public interface DiagramPackage extends EPackage { * Conditional Inside Label Style}'. * * @return the meta object for class 'Conditional Inside Label Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ConditionalInsideLabelStyle + * @generated */ EClass getConditionalInsideLabelStyle(); @@ -4170,8 +4284,8 @@ public interface DiagramPackage extends EPackage { * Conditional Outside Label Style}'. * * @return the meta object for class 'Conditional Outside Label Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ConditionalOutsideLabelStyle + * @generated */ EClass getConditionalOutsideLabelStyle(); @@ -4193,8 +4307,8 @@ public interface DiagramPackage extends EPackage { * Description}'. * * @return the meta object for class 'Rectangular Node Style Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescription + * @generated */ EClass getRectangularNodeStyleDescription(); @@ -4204,9 +4318,9 @@ public interface DiagramPackage extends EPackage { * Background}'. * * @return the meta object for the reference 'Background'. - * @generated * @see org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescription#getBackground() * @see #getRectangularNodeStyleDescription() + * @generated */ EReference getRectangularNodeStyleDescription_Background(); @@ -4215,8 +4329,8 @@ public interface DiagramPackage extends EPackage { * Image Node Style Description}'. * * @return the meta object for class 'Image Node Style Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ImageNodeStyleDescription + * @generated */ EClass getImageNodeStyleDescription(); @@ -4238,9 +4352,9 @@ public interface DiagramPackage extends EPackage { * Position Dependent Rotation}'. * * @return the meta object for the attribute 'Position Dependent Rotation'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ImageNodeStyleDescription#isPositionDependentRotation() * @see #getImageNodeStyleDescription() + * @generated */ EAttribute getImageNodeStyleDescription_PositionDependentRotation(); @@ -4250,8 +4364,8 @@ public interface DiagramPackage extends EPackage { * Description}'. * * @return the meta object for class 'Icon Label Node Style Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.IconLabelNodeStyleDescription + * @generated */ EClass getIconLabelNodeStyleDescription(); @@ -4261,9 +4375,9 @@ public interface DiagramPackage extends EPackage { * Background}'. * * @return the meta object for the reference 'Background'. - * @generated * @see org.eclipse.sirius.components.view.diagram.IconLabelNodeStyleDescription#getBackground() * @see #getIconLabelNodeStyleDescription() + * @generated */ EReference getIconLabelNodeStyleDescription_Background(); @@ -4272,8 +4386,8 @@ public interface DiagramPackage extends EPackage { * Style}'. * * @return the meta object for class 'Edge Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeStyle + * @generated */ EClass getEdgeStyle(); @@ -4295,9 +4409,9 @@ public interface DiagramPackage extends EPackage { * * * @return the meta object for the attribute 'Source Arrow Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeStyle#getSourceArrowStyle() * @see #getEdgeStyle() + * @generated */ EAttribute getEdgeStyle_SourceArrowStyle(); @@ -4307,9 +4421,9 @@ public interface DiagramPackage extends EPackage { * * * @return the meta object for the attribute 'Target Arrow Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeStyle#getTargetArrowStyle() * @see #getEdgeStyle() + * @generated */ EAttribute getEdgeStyle_TargetArrowStyle(); @@ -4330,9 +4444,9 @@ public interface DiagramPackage extends EPackage { * Show Icon}'. * * @return the meta object for the attribute 'Show Icon'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeStyle#isShowIcon() * @see #getEdgeStyle() + * @generated */ EAttribute getEdgeStyle_ShowIcon(); @@ -4353,8 +4467,8 @@ public interface DiagramPackage extends EPackage { * Conditional Edge Style}'. * * @return the meta object for class 'Conditional Edge Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ConditionalEdgeStyle + * @generated */ EClass getConditionalEdgeStyle(); @@ -4363,8 +4477,8 @@ public interface DiagramPackage extends EPackage { * Palette}'. * * @return the meta object for class 'Palette'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DiagramPalette + * @generated */ EClass getDiagramPalette(); @@ -4421,8 +4535,8 @@ public interface DiagramPackage extends EPackage { * Palette}'. * * @return the meta object for class 'Node Palette'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodePalette + * @generated */ EClass getNodePalette(); @@ -4503,8 +4617,8 @@ public interface DiagramPackage extends EPackage { * Palette}'. * * @return the meta object for class 'Edge Palette'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgePalette + * @generated */ EClass getEdgePalette(); @@ -4526,9 +4640,9 @@ public interface DiagramPackage extends EPackage { * Tool}'. * * @return the meta object for the containment reference 'Center Label Edit Tool'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgePalette#getCenterLabelEditTool() * @see #getEdgePalette() + * @generated */ EReference getEdgePalette_CenterLabelEditTool(); @@ -4538,9 +4652,9 @@ public interface DiagramPackage extends EPackage { * Tool}'. * * @return the meta object for the containment reference 'Begin Label Edit Tool'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgePalette#getBeginLabelEditTool() * @see #getEdgePalette() + * @generated */ EReference getEdgePalette_BeginLabelEditTool(); @@ -4550,9 +4664,9 @@ public interface DiagramPackage extends EPackage { * Tool}'. * * @return the meta object for the containment reference 'End Label Edit Tool'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgePalette#getEndLabelEditTool() * @see #getEdgePalette() + * @generated */ EReference getEdgePalette_EndLabelEditTool(); @@ -4574,9 +4688,9 @@ public interface DiagramPackage extends EPackage { * Tools}'. * * @return the meta object for the containment reference list 'Edge Reconnection Tools'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgePalette#getEdgeReconnectionTools() * @see #getEdgePalette() + * @generated */ EReference getEdgePalette_EdgeReconnectionTools(); @@ -4607,9 +4721,9 @@ public interface DiagramPackage extends EPackage { * Name}'. * * @return the meta object for the attribute 'Name'. - * @generated * @see org.eclipse.sirius.components.view.diagram.Tool#getName() * @see #getTool() + * @generated */ EAttribute getTool_Name(); @@ -4619,9 +4733,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Precondition Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.Tool#getPreconditionExpression() * @see #getTool() + * @generated */ EAttribute getTool_PreconditionExpression(); @@ -4631,9 +4745,9 @@ public interface DiagramPackage extends EPackage { * end-user-doc --> * * @return the meta object for the containment reference list 'Body'. - * @generated * @see org.eclipse.sirius.components.view.diagram.Tool#getBody() * @see #getTool() + * @generated */ EReference getTool_Body(); @@ -4642,8 +4756,8 @@ public interface DiagramPackage extends EPackage { * Tool}'. * * @return the meta object for class 'Delete Tool'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DeleteTool + * @generated */ EClass getDeleteTool(); @@ -4652,8 +4766,8 @@ public interface DiagramPackage extends EPackage { * Tool}'. * * @return the meta object for class 'Drop Tool'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DropTool + * @generated */ EClass getDropTool(); @@ -4662,8 +4776,8 @@ public interface DiagramPackage extends EPackage { * Tool}'. * * @return the meta object for class 'Edge Tool'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeTool + * @generated */ EClass getEdgeTool(); @@ -4673,9 +4787,9 @@ public interface DiagramPackage extends EPackage { * Descriptions}'. * * @return the meta object for the reference list 'Target Element Descriptions'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeTool#getTargetElementDescriptions() * @see #getEdgeTool() + * @generated */ EReference getEdgeTool_TargetElementDescriptions(); @@ -4685,9 +4799,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Icon UR Ls Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeTool#getIconURLsExpression() * @see #getEdgeTool() + * @generated */ EAttribute getEdgeTool_IconURLsExpression(); @@ -4696,8 +4810,8 @@ public interface DiagramPackage extends EPackage { * Edge Reconnection Tool}'. * * @return the meta object for class 'Edge Reconnection Tool'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeReconnectionTool + * @generated */ EClass getEdgeReconnectionTool(); @@ -4706,8 +4820,8 @@ public interface DiagramPackage extends EPackage { * Tool}'. * * @return the meta object for class 'Label Edit Tool'. - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelEditTool + * @generated */ EClass getLabelEditTool(); @@ -4717,9 +4831,9 @@ public interface DiagramPackage extends EPackage { * Direct Edit Label Expression}'. * * @return the meta object for the attribute 'Initial Direct Edit Label Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelEditTool#getInitialDirectEditLabelExpression() * @see #getLabelEditTool() + * @generated */ EAttribute getLabelEditTool_InitialDirectEditLabelExpression(); @@ -4728,22 +4842,22 @@ public interface DiagramPackage extends EPackage { * Tool}'. * * @return the meta object for class 'Node Tool'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeTool + * @generated */ EClass getNodeTool(); /** * Returns the meta object for the containment reference - * '{@link org.eclipse.sirius.components.view.diagram.NodeTool#getSelectionDescription Selection - * Description}'. + * '{@link org.eclipse.sirius.components.view.diagram.NodeTool#getDialogDescription Dialog Description}'. + * * - * @return the meta object for the containment reference 'Selection Description'. - * @generated - * @see org.eclipse.sirius.components.view.diagram.NodeTool#getSelectionDescription() + * @return the meta object for the containment reference 'Dialog Description'. + * @see org.eclipse.sirius.components.view.diagram.NodeTool#getDialogDescription() * @see #getNodeTool() + * @generated */ - EReference getNodeTool_SelectionDescription(); + EReference getNodeTool_DialogDescription(); /** * Returns the meta object for the attribute @@ -4751,9 +4865,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Icon UR Ls Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeTool#getIconURLsExpression() * @see #getNodeTool() + * @generated */ EAttribute getNodeTool_IconURLsExpression(); @@ -4763,8 +4877,8 @@ public interface DiagramPackage extends EPackage { * Tool}'. * * @return the meta object for class 'Source Edge End Reconnection Tool'. - * @generated * @see org.eclipse.sirius.components.view.diagram.SourceEdgeEndReconnectionTool + * @generated */ EClass getSourceEdgeEndReconnectionTool(); @@ -4774,8 +4888,8 @@ public interface DiagramPackage extends EPackage { * Tool}'. * * @return the meta object for class 'Target Edge End Reconnection Tool'. - * @generated * @see org.eclipse.sirius.components.view.diagram.TargetEdgeEndReconnectionTool + * @generated */ EClass getTargetEdgeEndReconnectionTool(); @@ -4784,8 +4898,8 @@ public interface DiagramPackage extends EPackage { * View}'. * * @return the meta object for class 'Create View'. - * @generated * @see org.eclipse.sirius.components.view.diagram.CreateView + * @generated */ EClass getCreateView(); @@ -4795,9 +4909,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Parent View Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.CreateView#getParentViewExpression() * @see #getCreateView() + * @generated */ EAttribute getCreateView_ParentViewExpression(); @@ -4807,9 +4921,9 @@ public interface DiagramPackage extends EPackage { * Description}'. * * @return the meta object for the reference 'Element Description'. - * @generated * @see org.eclipse.sirius.components.view.diagram.CreateView#getElementDescription() * @see #getCreateView() + * @generated */ EReference getCreateView_ElementDescription(); @@ -4819,9 +4933,9 @@ public interface DiagramPackage extends EPackage { * Expression}'. * * @return the meta object for the attribute 'Semantic Element Expression'. - * @generated * @see org.eclipse.sirius.components.view.diagram.CreateView#getSemanticElementExpression() * @see #getCreateView() + * @generated */ EAttribute getCreateView_SemanticElementExpression(); @@ -4843,9 +4957,9 @@ public interface DiagramPackage extends EPackage { * * * @return the meta object for the attribute 'Containment Kind'. - * @generated * @see org.eclipse.sirius.components.view.diagram.CreateView#getContainmentKind() * @see #getCreateView() + * @generated */ EAttribute getCreateView_ContainmentKind(); @@ -4854,8 +4968,8 @@ public interface DiagramPackage extends EPackage { * View}'. * * @return the meta object for class 'Delete View'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DeleteView + * @generated */ EClass getDeleteView(); @@ -4872,46 +4986,46 @@ public interface DiagramPackage extends EPackage { EAttribute getDeleteView_ViewExpression(); /** - * Returns the meta object for class '{@link org.eclipse.sirius.components.view.diagram.SelectionDescription - * Selection Description}'. + * Returns the meta object for class '{@link org.eclipse.sirius.components.view.diagram.SelectionDialogDescription + * Selection Dialog Description}'. * - * @return the meta object for class 'Selection Description'. + * @return the meta object for class 'Selection Dialog Description'. + * @see org.eclipse.sirius.components.view.diagram.SelectionDialogDescription * @generated - * @see org.eclipse.sirius.components.view.diagram.SelectionDescription */ - EClass getSelectionDescription(); + EClass getSelectionDialogDescription(); /** * Returns the meta object for the attribute - * '{@link org.eclipse.sirius.components.view.diagram.SelectionDescription#getSelectionCandidatesExpression + * '{@link org.eclipse.sirius.components.view.diagram.SelectionDialogDescription#getSelectionCandidatesExpression * Selection Candidates Expression}'. * * @return the meta object for the attribute 'Selection Candidates Expression'. + * @see org.eclipse.sirius.components.view.diagram.SelectionDialogDescription#getSelectionCandidatesExpression() + * @see #getSelectionDialogDescription() * @generated - * @see org.eclipse.sirius.components.view.diagram.SelectionDescription#getSelectionCandidatesExpression() - * @see #getSelectionDescription() */ - EAttribute getSelectionDescription_SelectionCandidatesExpression(); + EAttribute getSelectionDialogDescription_SelectionCandidatesExpression(); /** * Returns the meta object for the attribute - * '{@link org.eclipse.sirius.components.view.diagram.SelectionDescription#getSelectionMessage Selection + * '{@link org.eclipse.sirius.components.view.diagram.SelectionDialogDescription#getSelectionMessage Selection * Message}'. * * @return the meta object for the attribute 'Selection Message'. + * @see org.eclipse.sirius.components.view.diagram.SelectionDialogDescription#getSelectionMessage() + * @see #getSelectionDialogDescription() * @generated - * @see org.eclipse.sirius.components.view.diagram.SelectionDescription#getSelectionMessage() - * @see #getSelectionDescription() */ - EAttribute getSelectionDescription_SelectionMessage(); + EAttribute getSelectionDialogDescription_SelectionMessage(); /** * Returns the meta object for class '{@link org.eclipse.sirius.components.view.diagram.ToolSection Tool * Section}'. * * @return the meta object for class 'Tool Section'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ToolSection + * @generated */ EClass getToolSection(); @@ -4920,9 +5034,9 @@ public interface DiagramPackage extends EPackage { * Name}'. * * @return the meta object for the attribute 'Name'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ToolSection#getName() * @see #getToolSection() + * @generated */ EAttribute getToolSection_Name(); @@ -4931,8 +5045,8 @@ public interface DiagramPackage extends EPackage { * Section}'. * * @return the meta object for class 'Tool Section'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DiagramToolSection + * @generated */ EClass getDiagramToolSection(); @@ -4953,8 +5067,8 @@ public interface DiagramPackage extends EPackage { * Tool Section}'. * * @return the meta object for class 'Node Tool Section'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeToolSection + * @generated */ EClass getNodeToolSection(); @@ -4987,8 +5101,8 @@ public interface DiagramPackage extends EPackage { * Tool Section}'. * * @return the meta object for class 'Edge Tool Section'. - * @generated * @see org.eclipse.sirius.components.view.diagram.EdgeToolSection + * @generated */ EClass getEdgeToolSection(); @@ -5009,8 +5123,8 @@ public interface DiagramPackage extends EPackage { * Tool}'. * * @return the meta object for class 'Drop Node Tool'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DropNodeTool + * @generated */ EClass getDropNodeTool(); @@ -5020,19 +5134,29 @@ public interface DiagramPackage extends EPackage { * Types}'. * * @return the meta object for the reference list 'Accepted Node Types'. - * @generated * @see org.eclipse.sirius.components.view.diagram.DropNodeTool#getAcceptedNodeTypes() * @see #getDropNodeTool() + * @generated */ EReference getDropNodeTool_AcceptedNodeTypes(); + /** + * Returns the meta object for class '{@link org.eclipse.sirius.components.view.diagram.DialogDescription Dialog + * Description}'. + * + * @return the meta object for class 'Dialog Description'. + * @see org.eclipse.sirius.components.view.diagram.DialogDescription + * @generated + */ + EClass getDialogDescription(); + /** * Returns the meta object for enum '{@link org.eclipse.sirius.components.view.diagram.ArrowStyle Arrow * Style}'. * * @return the meta object for enum 'Arrow Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ArrowStyle + * @generated */ EEnum getArrowStyle(); @@ -5041,8 +5165,8 @@ public interface DiagramPackage extends EPackage { * Direction}'. * * @return the meta object for enum 'Layout Direction'. - * @generated * @see org.eclipse.sirius.components.view.diagram.LayoutDirection + * @generated */ EEnum getLayoutDirection(); @@ -5051,8 +5175,8 @@ public interface DiagramPackage extends EPackage { * Style}'. * * @return the meta object for enum 'Line Style'. - * @generated * @see org.eclipse.sirius.components.view.diagram.LineStyle + * @generated */ EEnum getLineStyle(); @@ -5061,8 +5185,8 @@ public interface DiagramPackage extends EPackage { * Containment Kind}'. * * @return the meta object for enum 'Node Containment Kind'. - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeContainmentKind + * @generated */ EEnum getNodeContainmentKind(); @@ -5071,8 +5195,8 @@ public interface DiagramPackage extends EPackage { * Synchronization Policy}'. * * @return the meta object for enum 'Synchronization Policy'. - * @generated * @see org.eclipse.sirius.components.view.diagram.SynchronizationPolicy + * @generated */ EEnum getSynchronizationPolicy(); @@ -5081,8 +5205,8 @@ public interface DiagramPackage extends EPackage { * Inside Label Position}'. * * @return the meta object for enum 'Inside Label Position'. - * @generated * @see org.eclipse.sirius.components.view.diagram.InsideLabelPosition + * @generated */ EEnum getInsideLabelPosition(); @@ -5091,8 +5215,8 @@ public interface DiagramPackage extends EPackage { * Outside Label Position}'. * * @return the meta object for enum 'Outside Label Position'. - * @generated * @see org.eclipse.sirius.components.view.diagram.OutsideLabelPosition + * @generated */ EEnum getOutsideLabelPosition(); @@ -5101,8 +5225,8 @@ public interface DiagramPackage extends EPackage { * Label Overflow Strategy}'. * * @return the meta object for enum 'Label Overflow Strategy'. - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelOverflowStrategy + * @generated */ EEnum getLabelOverflowStrategy(); @@ -5111,8 +5235,8 @@ public interface DiagramPackage extends EPackage { * Arrange Layout Direction}'. * * @return the meta object for enum 'Arrange Layout Direction'. - * @generated * @see org.eclipse.sirius.components.view.diagram.ArrangeLayoutDirection + * @generated */ EEnum getArrangeLayoutDirection(); @@ -5121,8 +5245,8 @@ public interface DiagramPackage extends EPackage { * Align}'. * * @return the meta object for enum 'Label Text Align'. - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelTextAlign + * @generated */ EEnum getLabelTextAlign(); @@ -5154,9 +5278,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.DiagramDescriptionImpl Description}' class. * * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DiagramDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDiagramDescription() + * @generated */ EClass DIAGRAM_DESCRIPTION = eINSTANCE.getDiagramDescription(); @@ -5205,9 +5329,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.DiagramElementDescriptionImpl Element * Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DiagramElementDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDiagramElementDescription() + * @generated */ EClass DIAGRAM_ELEMENT_DESCRIPTION = eINSTANCE.getDiagramElementDescription(); @@ -5255,9 +5379,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.NodeDescriptionImpl * Node Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.NodeDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeDescription() + * @generated */ EClass NODE_DESCRIPTION = eINSTANCE.getNodeDescription(); @@ -5409,9 +5533,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.EdgeDescriptionImpl * Edge Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.EdgeDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getEdgeDescription() + * @generated */ EClass EDGE_DESCRIPTION = eINSTANCE.getEdgeDescription(); @@ -5507,9 +5631,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.LayoutStrategyDescription * Layout Strategy Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.LayoutStrategyDescription * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLayoutStrategyDescription() + * @generated */ EClass LAYOUT_STRATEGY_DESCRIPTION = eINSTANCE.getLayoutStrategyDescription(); @@ -5518,9 +5642,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.ListLayoutStrategyDescriptionImpl List Layout * Strategy Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ListLayoutStrategyDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getListLayoutStrategyDescription() + * @generated */ EClass LIST_LAYOUT_STRATEGY_DESCRIPTION = eINSTANCE.getListLayoutStrategyDescription(); @@ -5561,9 +5685,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.FreeFormLayoutStrategyDescriptionImpl Free Form * Layout Strategy Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.FreeFormLayoutStrategyDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getFreeFormLayoutStrategyDescription() + * @generated */ EClass FREE_FORM_LAYOUT_STRATEGY_DESCRIPTION = eINSTANCE.getFreeFormLayoutStrategyDescription(); @@ -5571,9 +5695,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.LabelDescriptionImpl * Label Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.LabelDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLabelDescription() + * @generated */ EClass LABEL_DESCRIPTION = eINSTANCE.getLabelDescription(); @@ -5606,9 +5730,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.InsideLabelDescriptionImpl Inside Label * Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.InsideLabelDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getInsideLabelDescription() + * @generated */ EClass INSIDE_LABEL_DESCRIPTION = eINSTANCE.getInsideLabelDescription(); @@ -5641,9 +5765,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.OutsideLabelDescriptionImpl Outside Label * Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.OutsideLabelDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getOutsideLabelDescription() + * @generated */ EClass OUTSIDE_LABEL_DESCRIPTION = eINSTANCE.getOutsideLabelDescription(); @@ -5675,9 +5799,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.StyleImpl * Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.StyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getStyle() + * @generated */ EClass STYLE = eINSTANCE.getStyle(); @@ -5693,9 +5817,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.BorderStyle Border * Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.BorderStyle * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getBorderStyle() + * @generated */ EClass BORDER_STYLE = eINSTANCE.getBorderStyle(); @@ -5735,9 +5859,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.InsideLabelStyleImpl * Inside Label Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.InsideLabelStyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getInsideLabelStyle() + * @generated */ EClass INSIDE_LABEL_STYLE = eINSTANCE.getInsideLabelStyle(); @@ -5761,9 +5885,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.OutsideLabelStyleImpl * Outside Label Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.OutsideLabelStyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getOutsideLabelStyle() + * @generated */ EClass OUTSIDE_LABEL_STYLE = eINSTANCE.getOutsideLabelStyle(); @@ -5771,9 +5895,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.NodeLabelStyle Node * Label Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeLabelStyle * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeLabelStyle() + * @generated */ EClass NODE_LABEL_STYLE = eINSTANCE.getNodeLabelStyle(); @@ -5805,9 +5929,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.NodeStyleDescription * Node Style Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeStyleDescription * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeStyleDescription() + * @generated */ EClass NODE_STYLE_DESCRIPTION = eINSTANCE.getNodeStyleDescription(); @@ -5816,9 +5940,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.ConditionalNodeStyleImpl Conditional Node * Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ConditionalNodeStyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getConditionalNodeStyle() + * @generated */ EClass CONDITIONAL_NODE_STYLE = eINSTANCE.getConditionalNodeStyle(); @@ -5835,9 +5959,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.ConditionalInsideLabelStyleImpl Conditional * Inside Label Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ConditionalInsideLabelStyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getConditionalInsideLabelStyle() + * @generated */ EClass CONDITIONAL_INSIDE_LABEL_STYLE = eINSTANCE.getConditionalInsideLabelStyle(); @@ -5854,9 +5978,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.ConditionalOutsideLabelStyleImpl Conditional * Outside Label Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ConditionalOutsideLabelStyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getConditionalOutsideLabelStyle() + * @generated */ EClass CONDITIONAL_OUTSIDE_LABEL_STYLE = eINSTANCE.getConditionalOutsideLabelStyle(); @@ -5873,9 +5997,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.RectangularNodeStyleDescriptionImpl Rectangular * Node Style Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.RectangularNodeStyleDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getRectangularNodeStyleDescription() + * @generated */ EClass RECTANGULAR_NODE_STYLE_DESCRIPTION = eINSTANCE.getRectangularNodeStyleDescription(); @@ -5892,9 +6016,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.ImageNodeStyleDescriptionImpl Image Node Style * Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ImageNodeStyleDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getImageNodeStyleDescription() + * @generated */ EClass IMAGE_NODE_STYLE_DESCRIPTION = eINSTANCE.getImageNodeStyleDescription(); @@ -5919,9 +6043,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.IconLabelNodeStyleDescriptionImpl Icon Label Node * Style Description}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.IconLabelNodeStyleDescriptionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getIconLabelNodeStyleDescription() + * @generated */ EClass ICON_LABEL_NODE_STYLE_DESCRIPTION = eINSTANCE.getIconLabelNodeStyleDescription(); @@ -5937,9 +6061,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.EdgeStyleImpl * Edge Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.EdgeStyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getEdgeStyle() + * @generated */ EClass EDGE_STYLE = eINSTANCE.getEdgeStyle(); @@ -5996,9 +6120,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.ConditionalEdgeStyleImpl Conditional Edge * Style}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ConditionalEdgeStyleImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getConditionalEdgeStyle() + * @generated */ EClass CONDITIONAL_EDGE_STYLE = eINSTANCE.getConditionalEdgeStyle(); @@ -6006,9 +6130,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.DiagramPaletteImpl * Palette}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPaletteImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDiagramPalette() + * @generated */ EClass DIAGRAM_PALETTE = eINSTANCE.getDiagramPalette(); @@ -6048,9 +6172,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.NodePaletteImpl * Node Palette}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.NodePaletteImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodePalette() + * @generated */ EClass NODE_PALETTE = eINSTANCE.getNodePalette(); @@ -6106,9 +6230,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.EdgePaletteImpl * Edge Palette}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.EdgePaletteImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getEdgePalette() + * @generated */ EClass EDGE_PALETTE = eINSTANCE.getEdgePalette(); @@ -6172,9 +6296,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.ToolImpl * Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getTool() + * @generated */ EClass TOOL = eINSTANCE.getTool(); @@ -6206,9 +6330,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.DeleteToolImpl * Delete Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DeleteToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDeleteTool() + * @generated */ EClass DELETE_TOOL = eINSTANCE.getDeleteTool(); @@ -6216,9 +6340,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.DropToolImpl Drop * Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DropToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDropTool() + * @generated */ EClass DROP_TOOL = eINSTANCE.getDropTool(); @@ -6226,9 +6350,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.EdgeToolImpl Edge * Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.EdgeToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getEdgeTool() + * @generated */ EClass EDGE_TOOL = eINSTANCE.getEdgeTool(); @@ -6253,9 +6377,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.EdgeReconnectionToolImpl Edge Reconnection * Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.EdgeReconnectionToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getEdgeReconnectionTool() + * @generated */ EClass EDGE_RECONNECTION_TOOL = eINSTANCE.getEdgeReconnectionTool(); @@ -6263,9 +6387,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.LabelEditToolImpl * Label Edit Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.LabelEditToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLabelEditTool() + * @generated */ EClass LABEL_EDIT_TOOL = eINSTANCE.getLabelEditTool(); @@ -6281,19 +6405,19 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.NodeToolImpl Node * Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.NodeToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeTool() + * @generated */ EClass NODE_TOOL = eINSTANCE.getNodeTool(); /** - * The meta object literal for the 'Selection Description' containment reference feature. * * @generated */ - EReference NODE_TOOL__SELECTION_DESCRIPTION = eINSTANCE.getNodeTool_SelectionDescription(); + EReference NODE_TOOL__DIALOG_DESCRIPTION = eINSTANCE.getNodeTool_DialogDescription(); /** * The meta object literal for the 'Icon UR Ls Expression' attribute feature. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.SourceEdgeEndReconnectionToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getSourceEdgeEndReconnectionTool() + * @generated */ EClass SOURCE_EDGE_END_RECONNECTION_TOOL = eINSTANCE.getSourceEdgeEndReconnectionTool(); @@ -6319,9 +6443,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.TargetEdgeEndReconnectionToolImpl Target Edge End * Reconnection Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.TargetEdgeEndReconnectionToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getTargetEdgeEndReconnectionTool() + * @generated */ EClass TARGET_EDGE_END_RECONNECTION_TOOL = eINSTANCE.getTargetEdgeEndReconnectionTool(); @@ -6329,9 +6453,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.CreateViewImpl * Create View}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.CreateViewImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getCreateView() + * @generated */ EClass CREATE_VIEW = eINSTANCE.getCreateView(); @@ -6379,9 +6503,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.DeleteViewImpl * Delete View}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DeleteViewImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDeleteView() + * @generated */ EClass DELETE_VIEW = eINSTANCE.getDeleteView(); @@ -6395,14 +6519,14 @@ interface Literals { /** * The meta object literal for the - * '{@link org.eclipse.sirius.components.view.diagram.impl.SelectionDescriptionImpl Selection + * '{@link org.eclipse.sirius.components.view.diagram.impl.SelectionDialogDescriptionImpl Selection Dialog * Description}' class. * + * @see org.eclipse.sirius.components.view.diagram.impl.SelectionDialogDescriptionImpl + * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getSelectionDialogDescription() * @generated - * @see org.eclipse.sirius.components.view.diagram.impl.SelectionDescriptionImpl - * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getSelectionDescription() */ - EClass SELECTION_DESCRIPTION = eINSTANCE.getSelectionDescription(); + EClass SELECTION_DIALOG_DESCRIPTION = eINSTANCE.getSelectionDialogDescription(); /** * The meta object literal for the 'Selection Candidates Expression' attribute feature. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.ToolSectionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getToolSection() + * @generated */ EClass TOOL_SECTION = eINSTANCE.getToolSection(); @@ -6443,9 +6567,9 @@ interface Literals { * '{@link org.eclipse.sirius.components.view.diagram.impl.DiagramToolSectionImpl Tool Section}' class. * * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DiagramToolSectionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDiagramToolSection() + * @generated */ EClass DIAGRAM_TOOL_SECTION = eINSTANCE.getDiagramToolSection(); @@ -6461,9 +6585,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.NodeToolSectionImpl * Node Tool Section}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.NodeToolSectionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeToolSection() + * @generated */ EClass NODE_TOOL_SECTION = eINSTANCE.getNodeToolSection(); @@ -6487,9 +6611,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.EdgeToolSectionImpl * Edge Tool Section}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.EdgeToolSectionImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getEdgeToolSection() + * @generated */ EClass EDGE_TOOL_SECTION = eINSTANCE.getEdgeToolSection(); @@ -6505,9 +6629,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.DropNodeToolImpl * Drop Node Tool}' class. * - * @generated * @see org.eclipse.sirius.components.view.diagram.impl.DropNodeToolImpl * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDropNodeTool() + * @generated */ EClass DROP_NODE_TOOL = eINSTANCE.getDropNodeTool(); @@ -6519,13 +6643,23 @@ interface Literals { */ EReference DROP_NODE_TOOL__ACCEPTED_NODE_TYPES = eINSTANCE.getDropNodeTool_AcceptedNodeTypes(); + /** + * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.impl.DialogDescriptionImpl + * Dialog Description}' class. + * + * @see org.eclipse.sirius.components.view.diagram.impl.DialogDescriptionImpl + * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getDialogDescription() + * @generated + */ + EClass DIALOG_DESCRIPTION = eINSTANCE.getDialogDescription(); + /** * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.ArrowStyle Arrow * Style}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.ArrowStyle * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getArrowStyle() + * @generated */ EEnum ARROW_STYLE = eINSTANCE.getArrowStyle(); @@ -6533,9 +6667,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.LayoutDirection Layout * Direction}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.LayoutDirection * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLayoutDirection() + * @generated */ EEnum LAYOUT_DIRECTION = eINSTANCE.getLayoutDirection(); @@ -6543,9 +6677,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.LineStyle Line * Style}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.LineStyle * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLineStyle() + * @generated */ EEnum LINE_STYLE = eINSTANCE.getLineStyle(); @@ -6553,9 +6687,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.NodeContainmentKind * Node Containment Kind}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.NodeContainmentKind * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getNodeContainmentKind() + * @generated */ EEnum NODE_CONTAINMENT_KIND = eINSTANCE.getNodeContainmentKind(); @@ -6563,9 +6697,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.SynchronizationPolicy * Synchronization Policy}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.SynchronizationPolicy * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getSynchronizationPolicy() + * @generated */ EEnum SYNCHRONIZATION_POLICY = eINSTANCE.getSynchronizationPolicy(); @@ -6573,9 +6707,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.InsideLabelPosition * Inside Label Position}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.InsideLabelPosition * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getInsideLabelPosition() + * @generated */ EEnum INSIDE_LABEL_POSITION = eINSTANCE.getInsideLabelPosition(); @@ -6583,9 +6717,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.OutsideLabelPosition * Outside Label Position}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.OutsideLabelPosition * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getOutsideLabelPosition() + * @generated */ EEnum OUTSIDE_LABEL_POSITION = eINSTANCE.getOutsideLabelPosition(); @@ -6593,9 +6727,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.LabelOverflowStrategy * Label Overflow Strategy}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelOverflowStrategy * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLabelOverflowStrategy() + * @generated */ EEnum LABEL_OVERFLOW_STRATEGY = eINSTANCE.getLabelOverflowStrategy(); @@ -6603,9 +6737,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.ArrangeLayoutDirection * Arrange Layout Direction}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.ArrangeLayoutDirection * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getArrangeLayoutDirection() + * @generated */ EEnum ARRANGE_LAYOUT_DIRECTION = eINSTANCE.getArrangeLayoutDirection(); @@ -6613,9 +6747,9 @@ interface Literals { * The meta object literal for the '{@link org.eclipse.sirius.components.view.diagram.LabelTextAlign Label * Text Align}' enum. * - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelTextAlign * @see org.eclipse.sirius.components.view.diagram.impl.DiagramPackageImpl#getLabelTextAlign() + * @generated */ EEnum LABEL_TEXT_ALIGN = eINSTANCE.getLabelTextAlign(); diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DialogDescription.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DialogDescription.java new file mode 100644 index 00000000000..af29e24f5ad --- /dev/null +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/DialogDescription.java @@ -0,0 +1,27 @@ +/******************************************************************************* + * Copyright (c) 2024 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.components.view.diagram; + +import org.eclipse.emf.ecore.EObject; + +/** + * A representation of the model object 'Dialog Description'. + * + * + * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getDialogDescription() + * @model abstract="true" + * @generated + */ +public interface DialogDescription extends EObject { +} // DialogDescription diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/InsideLabelPosition.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/InsideLabelPosition.java index 181ecba07a6..6f5bc35ca87 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/InsideLabelPosition.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/InsideLabelPosition.java @@ -22,171 +22,171 @@ * A representation of the literals of the enumeration 'Inside Label Position', * and utility methods for working with them. * + * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getInsideLabelPosition() * @model * @generated - * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getInsideLabelPosition() */ public enum InsideLabelPosition implements Enumerator { /** * The 'TOP CENTER' literal object. * + * @see #TOP_CENTER_VALUE * @generated * @ordered - * @see #TOP_CENTER_VALUE */ TOP_CENTER(0, "TOP_CENTER", "TOP_CENTER"), /** * The 'TOP LEFT' literal object. * + * @see #TOP_LEFT_VALUE * @generated * @ordered - * @see #TOP_LEFT_VALUE */ TOP_LEFT(1, "TOP_LEFT", "TOP_LEFT"), /** * The 'TOP RIGHT' literal object. * + * @see #TOP_RIGHT_VALUE * @generated * @ordered - * @see #TOP_RIGHT_VALUE */ TOP_RIGHT(2, "TOP_RIGHT", "TOP_RIGHT"), /** * The 'MIDDLE LEFT' literal object. * + * @see #MIDDLE_LEFT_VALUE * @generated * @ordered - * @see #MIDDLE_LEFT_VALUE */ MIDDLE_LEFT(3, "MIDDLE_LEFT", "MIDDLE_LEFT"), /** * The 'MIDDLE CENTER' literal object. * + * @see #MIDDLE_CENTER_VALUE * @generated * @ordered - * @see #MIDDLE_CENTER_VALUE */ MIDDLE_CENTER(4, "MIDDLE_CENTER", "MIDDLE_CENTER"), /** * The 'MIDDLE RIGHT' literal object. * + * @see #MIDDLE_RIGHT_VALUE * @generated * @ordered - * @see #MIDDLE_RIGHT_VALUE */ MIDDLE_RIGHT(5, "MIDDLE_RIGHT", "MIDDLE_RIGHT"), /** * The 'BOTTOM LEFT' literal object. * + * @see #BOTTOM_LEFT_VALUE * @generated * @ordered - * @see #BOTTOM_LEFT_VALUE */ BOTTOM_LEFT(6, "BOTTOM_LEFT", "BOTTOM_LEFT"), /** * The 'BOTTOM CENTER' literal object. * + * @see #BOTTOM_CENTER_VALUE * @generated * @ordered - * @see #BOTTOM_CENTER_VALUE */ BOTTOM_CENTER(7, "BOTTOM_CENTER", "BOTTOM_CENTER"), /** * The 'BOTTOM RIGHT' literal object. * + * @see #BOTTOM_RIGHT_VALUE * @generated * @ordered - * @see #BOTTOM_RIGHT_VALUE */ BOTTOM_RIGHT(8, "BOTTOM_RIGHT", "BOTTOM_RIGHT"); /** * The 'TOP CENTER' literal value. * + * @see #TOP_CENTER * @model * @generated * @ordered - * @see #TOP_CENTER */ public static final int TOP_CENTER_VALUE = 0; /** * The 'TOP LEFT' literal value. * + * @see #TOP_LEFT * @model * @generated * @ordered - * @see #TOP_LEFT */ public static final int TOP_LEFT_VALUE = 1; /** * The 'TOP RIGHT' literal value. * + * @see #TOP_RIGHT * @model * @generated * @ordered - * @see #TOP_RIGHT */ public static final int TOP_RIGHT_VALUE = 2; /** * The 'MIDDLE LEFT' literal value. * + * @see #MIDDLE_LEFT * @model * @generated * @ordered - * @see #MIDDLE_LEFT */ public static final int MIDDLE_LEFT_VALUE = 3; /** * The 'MIDDLE CENTER' literal value. * + * @see #MIDDLE_CENTER * @model * @generated * @ordered - * @see #MIDDLE_CENTER */ public static final int MIDDLE_CENTER_VALUE = 4; /** * The 'MIDDLE RIGHT' literal value. * + * @see #MIDDLE_RIGHT * @model * @generated * @ordered - * @see #MIDDLE_RIGHT */ public static final int MIDDLE_RIGHT_VALUE = 5; /** * The 'BOTTOM LEFT' literal value. * + * @see #BOTTOM_LEFT * @model * @generated * @ordered - * @see #BOTTOM_LEFT */ public static final int BOTTOM_LEFT_VALUE = 6; /** * The 'BOTTOM CENTER' literal value. * + * @see #BOTTOM_CENTER * @model * @generated * @ordered - * @see #BOTTOM_CENTER */ public static final int BOTTOM_CENTER_VALUE = 7; /** * The 'BOTTOM RIGHT' literal value. * + * @see #BOTTOM_RIGHT * @model * @generated * @ordered - * @see #BOTTOM_RIGHT */ public static final int BOTTOM_RIGHT_VALUE = 8; @@ -197,7 +197,7 @@ public enum InsideLabelPosition implements Enumerator { * @generated */ private static final InsideLabelPosition[] VALUES_ARRAY = new InsideLabelPosition[] { TOP_CENTER, TOP_LEFT, TOP_RIGHT, MIDDLE_LEFT, MIDDLE_CENTER, MIDDLE_RIGHT, BOTTOM_LEFT, BOTTOM_CENTER, - BOTTOM_RIGHT, }; + BOTTOM_RIGHT, }; /** * A public read-only list of all the 'Inside Label Position' enumerators. @@ -233,7 +233,7 @@ public enum InsideLabelPosition implements Enumerator { * * @generated */ - InsideLabelPosition(int value, String name, String literal) { + private InsideLabelPosition(int value, String name, String literal) { this.value = value; this.name = name; this.literal = literal; @@ -244,7 +244,7 @@ public enum InsideLabelPosition implements Enumerator { * --> * * @param literal - * the literal. + * the literal. * @return the matching enumerator or null. * @generated */ @@ -263,7 +263,7 @@ public static InsideLabelPosition get(String literal) { * end-user-doc --> * * @param name - * the name. + * the name. * @return the matching enumerator or null. * @generated */ @@ -282,7 +282,7 @@ public static InsideLabelPosition getByName(String name) { * --> * * @param value - * the integer value. + * the integer value. * @return the matching enumerator or null. * @generated */ diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/LabelDescription.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/LabelDescription.java index 08601b74d05..a6e0d0cb01c 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/LabelDescription.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/LabelDescription.java @@ -40,10 +40,10 @@ public interface LabelDescription extends EObject { * "aql:self.name". * * @return the value of the 'Label Expression' attribute. - * @model default="aql:self.name" dataType="org.eclipse.sirius.components.view.InterpretedExpression" - * @generated * @see #setLabelExpression(String) * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getLabelDescription_LabelExpression() + * @model default="aql:self.name" dataType="org.eclipse.sirius.components.view.InterpretedExpression" + * @generated */ String getLabelExpression(); @@ -52,9 +52,9 @@ public interface LabelDescription extends EObject { * Label Expression}' attribute. * * @param value - * the new value of the 'Label Expression' attribute. - * @generated + * the new value of the 'Label Expression' attribute. * @see #getLabelExpression() + * @generated */ void setLabelExpression(String value); @@ -64,11 +64,11 @@ public interface LabelDescription extends EObject { * end-user-doc --> * * @return the value of the 'Overflow Strategy' attribute. - * @model required="true" - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelOverflowStrategy * @see #setOverflowStrategy(LabelOverflowStrategy) * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getLabelDescription_OverflowStrategy() + * @model required="true" + * @generated */ LabelOverflowStrategy getOverflowStrategy(); @@ -77,10 +77,10 @@ public interface LabelDescription extends EObject { * Overflow Strategy}' attribute. * * @param value - * the new value of the 'Overflow Strategy' attribute. - * @generated + * the new value of the 'Overflow Strategy' attribute. * @see org.eclipse.sirius.components.view.diagram.LabelOverflowStrategy * @see #getOverflowStrategy() + * @generated */ void setOverflowStrategy(LabelOverflowStrategy value); @@ -89,11 +89,11 @@ public interface LabelDescription extends EObject { * {@link org.eclipse.sirius.components.view.diagram.LabelTextAlign}. * * @return the value of the 'Text Align' attribute. - * @model required="true" - * @generated * @see org.eclipse.sirius.components.view.diagram.LabelTextAlign * @see #setTextAlign(LabelTextAlign) * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getLabelDescription_TextAlign() + * @model required="true" + * @generated */ LabelTextAlign getTextAlign(); @@ -102,10 +102,10 @@ public interface LabelDescription extends EObject { * Align}' attribute. * * @param value - * the new value of the 'Text Align' attribute. - * @generated + * the new value of the 'Text Align' attribute. * @see org.eclipse.sirius.components.view.diagram.LabelTextAlign * @see #getTextAlign() + * @generated */ void setTextAlign(LabelTextAlign value); diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/LabelOverflowStrategy.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/LabelOverflowStrategy.java index 6a96505c059..3747301c2f7 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/LabelOverflowStrategy.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/LabelOverflowStrategy.java @@ -22,65 +22,65 @@ * A representation of the literals of the enumeration 'Label Overflow * Strategy', and utility methods for working with them. * + * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getLabelOverflowStrategy() * @model * @generated - * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getLabelOverflowStrategy() */ public enum LabelOverflowStrategy implements Enumerator { /** * The 'NONE' literal object. * + * @see #NONE_VALUE * @generated * @ordered - * @see #NONE_VALUE */ NONE(0, "NONE", "NONE"), /** * The 'WRAP' literal object. * + * @see #WRAP_VALUE * @generated * @ordered - * @see #WRAP_VALUE */ WRAP(1, "WRAP", "WRAP"), /** * The 'ELLIPSIS' literal object. * + * @see #ELLIPSIS_VALUE * @generated * @ordered - * @see #ELLIPSIS_VALUE */ ELLIPSIS(2, "ELLIPSIS", "ELLIPSIS"); /** * The 'NONE' literal value. * + * @see #NONE * @model * @generated * @ordered - * @see #NONE */ public static final int NONE_VALUE = 0; /** * The 'WRAP' literal value. * + * @see #WRAP * @model * @generated * @ordered - * @see #WRAP */ public static final int WRAP_VALUE = 1; /** * The 'ELLIPSIS' literal value. * + * @see #ELLIPSIS * @model * @generated * @ordered - * @see #ELLIPSIS */ public static final int ELLIPSIS_VALUE = 2; @@ -99,18 +99,21 @@ public enum LabelOverflowStrategy implements Enumerator { * @generated */ public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); + /** * * * @generated */ private final int value; + /** * * * @generated */ private final String name; + /** * * @@ -123,7 +126,7 @@ public enum LabelOverflowStrategy implements Enumerator { * * @generated */ - LabelOverflowStrategy(int value, String name, String literal) { + private LabelOverflowStrategy(int value, String name, String literal) { this.value = value; this.name = name; this.literal = literal; @@ -134,7 +137,7 @@ public enum LabelOverflowStrategy implements Enumerator { * begin-user-doc --> * * @param literal - * the literal. + * the literal. * @return the matching enumerator or null. * @generated */ @@ -153,7 +156,7 @@ public static LabelOverflowStrategy get(String literal) { * * * @param name - * the name. + * the name. * @return the matching enumerator or null. * @generated */ @@ -172,7 +175,7 @@ public static LabelOverflowStrategy getByName(String name) { * begin-user-doc --> * * @param value - * the integer value. + * the integer value. * @return the matching enumerator or null. * @generated */ diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/LabelTextAlign.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/LabelTextAlign.java index 0f84bd72d4d..bf639672631 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/LabelTextAlign.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/LabelTextAlign.java @@ -22,84 +22,84 @@ * A representation of the literals of the enumeration 'Label Text Align', and * utility methods for working with them. * + * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getLabelTextAlign() * @model * @generated - * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getLabelTextAlign() */ public enum LabelTextAlign implements Enumerator { /** * The 'LEFT' literal object. * + * @see #LEFT_VALUE * @generated * @ordered - * @see #LEFT_VALUE */ LEFT(0, "LEFT", "LEFT"), /** * The 'RIGHT' literal object. * + * @see #RIGHT_VALUE * @generated * @ordered - * @see #RIGHT_VALUE */ RIGHT(1, "RIGHT", "RIGHT"), /** * The 'CENTER' literal object. * + * @see #CENTER_VALUE * @generated * @ordered - * @see #CENTER_VALUE */ CENTER(2, "CENTER", "CENTER"), /** * The 'JUSTIFY' literal object. * + * @see #JUSTIFY_VALUE * @generated * @ordered - * @see #JUSTIFY_VALUE */ JUSTIFY(3, "JUSTIFY", "JUSTIFY"); /** * The 'LEFT' literal value. * + * @see #LEFT * @model * @generated * @ordered - * @see #LEFT */ public static final int LEFT_VALUE = 0; /** * The 'RIGHT' literal value. * + * @see #RIGHT * @model * @generated * @ordered - * @see #RIGHT */ public static final int RIGHT_VALUE = 1; /** * The 'CENTER' literal value. * + * @see #CENTER * @model * @generated * @ordered - * @see #CENTER */ public static final int CENTER_VALUE = 2; /** * The 'JUSTIFY' literal value. * + * @see #JUSTIFY * @model * @generated * @ordered - * @see #JUSTIFY */ public static final int JUSTIFY_VALUE = 3; @@ -144,7 +144,7 @@ public enum LabelTextAlign implements Enumerator { * * @generated */ - LabelTextAlign(int value, String name, String literal) { + private LabelTextAlign(int value, String name, String literal) { this.value = value; this.name = name; this.literal = literal; @@ -155,7 +155,7 @@ public enum LabelTextAlign implements Enumerator { * * * @param literal - * the literal. + * the literal. * @return the matching enumerator or null. * @generated */ @@ -174,7 +174,7 @@ public static LabelTextAlign get(String literal) { * end-user-doc --> * * @param name - * the name. + * the name. * @return the matching enumerator or null. * @generated */ @@ -193,7 +193,7 @@ public static LabelTextAlign getByName(String name) { * * * @param value - * the integer value. + * the integer value. * @return the matching enumerator or null. * @generated */ diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/NodeTool.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/NodeTool.java index 08725e0b32d..923d9851b32 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/NodeTool.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/NodeTool.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023 Obeo. + * Copyright (c) 2023, 2024 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -19,8 +19,7 @@ * The following features are supported: *

*
    - *
  • {@link org.eclipse.sirius.components.view.diagram.NodeTool#getSelectionDescription Selection - * Description}
    • + *
  • {@link org.eclipse.sirius.components.view.diagram.NodeTool#getDialogDescription Dialog Description}
    • *
  • {@link org.eclipse.sirius.components.view.diagram.NodeTool#getIconURLsExpression Icon UR Ls * Expression}
    • *
@@ -31,27 +30,27 @@ */ public interface NodeTool extends Tool { /** - * Returns the value of the 'Selection Description' containment reference. - * + * Returns the value of the 'Dialog Description' containment reference. * - * @return the value of the 'Selection Description' containment reference. - * @see #setSelectionDescription(SelectionDescription) - * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getNodeTool_SelectionDescription() + * @return the value of the 'Dialog Description' containment reference. + * @see #setDialogDescription(DialogDescription) + * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getNodeTool_DialogDescription() * @model containment="true" * @generated */ - SelectionDescription getSelectionDescription(); + DialogDescription getDialogDescription(); /** - * Sets the value of the '{@link org.eclipse.sirius.components.view.diagram.NodeTool#getSelectionDescription - * Selection Description}' containment reference. + * Sets the value of the '{@link org.eclipse.sirius.components.view.diagram.NodeTool#getDialogDescription Dialog + * Description}' containment reference. * * @param value - * the new value of the 'Selection Description' containment reference. - * @see #getSelectionDescription() + * the new value of the 'Dialog Description' containment reference. + * @see #getDialogDescription() * @generated */ - void setSelectionDescription(SelectionDescription value); + void setDialogDescription(DialogDescription value); /** * Returns the value of the 'Icon UR Ls Expression' attribute. A representation of the model object 'Selection Description'. A representation of the model object 'Selection Dialog Description'. * *

* The following features are supported: *

*
    - *
  • {@link org.eclipse.sirius.components.view.diagram.SelectionDescription#getSelectionCandidatesExpression + *
  • {@link org.eclipse.sirius.components.view.diagram.SelectionDialogDescription#getSelectionCandidatesExpression * Selection Candidates Expression}
    • - *
  • {@link org.eclipse.sirius.components.view.diagram.SelectionDescription#getSelectionMessage Selection + *
  • {@link org.eclipse.sirius.components.view.diagram.SelectionDialogDescription#getSelectionMessage Selection * Message}
    • *
* - * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getSelectionDescription() + * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getSelectionDialogDescription() * @model * @generated */ -public interface SelectionDescription extends EObject { +public interface SelectionDialogDescription extends DialogDescription { /** * Returns the value of the 'Selection Candidates Expression' attribute. The default value is * "aql:self". * * @return the value of the 'Selection Candidates Expression' attribute. * @see #setSelectionCandidatesExpression(String) - * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getSelectionDescription_SelectionCandidatesExpression() + * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getSelectionDialogDescription_SelectionCandidatesExpression() * @model default="aql:self" dataType="org.eclipse.sirius.components.view.InterpretedExpression" * @generated */ @@ -47,7 +45,7 @@ public interface SelectionDescription extends EObject { /** * Sets the value of the - * '{@link org.eclipse.sirius.components.view.diagram.SelectionDescription#getSelectionCandidatesExpression + * '{@link org.eclipse.sirius.components.view.diagram.SelectionDialogDescription#getSelectionCandidatesExpression * Selection Candidates Expression}' attribute. * * @param value @@ -63,15 +61,16 @@ public interface SelectionDescription extends EObject { * * @return the value of the 'Selection Message' attribute. * @see #setSelectionMessage(String) - * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getSelectionDescription_SelectionMessage() + * @see org.eclipse.sirius.components.view.diagram.DiagramPackage#getSelectionDialogDescription_SelectionMessage() * @model * @generated */ String getSelectionMessage(); /** - * Sets the value of the '{@link org.eclipse.sirius.components.view.diagram.SelectionDescription#getSelectionMessage - * Selection Message}' attribute. + * Sets the value of the + * '{@link org.eclipse.sirius.components.view.diagram.SelectionDialogDescription#getSelectionMessage Selection + * Message}' attribute. * * @param value * the new value of the 'Selection Message' attribute. @@ -80,4 +79,4 @@ public interface SelectionDescription extends EObject { */ void setSelectionMessage(String value); -} // SelectionDescription +} // SelectionDialogDescription diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramDescriptionImpl.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramDescriptionImpl.java index dba22598ced..75e23d7a737 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramDescriptionImpl.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramDescriptionImpl.java @@ -55,56 +55,62 @@ public class DiagramDescriptionImpl extends RepresentationDescriptionImpl implem * The default value of the '{@link #isAutoLayout() Auto Layout}' attribute. * - * @generated - * @ordered * @see #isAutoLayout() - */ - protected static final boolean AUTO_LAYOUT_EDEFAULT = false; - /** - * The default value of the '{@link #getArrangeLayoutDirection() Arrange Layout Direction}' attribute. - * * @generated * @ordered - * @see #getArrangeLayoutDirection() */ - protected static final ArrangeLayoutDirection ARRANGE_LAYOUT_DIRECTION_EDEFAULT = ArrangeLayoutDirection.UNDEFINED; + protected static final boolean AUTO_LAYOUT_EDEFAULT = false; + /** * The cached value of the '{@link #isAutoLayout() Auto Layout}' attribute. * + * @see #isAutoLayout() * @generated * @ordered - * @see #isAutoLayout() */ protected boolean autoLayout = AUTO_LAYOUT_EDEFAULT; + /** * The cached value of the '{@link #getPalette() Palette}' containment reference. * * + * @see #getPalette() * @generated * @ordered - * @see #getPalette() */ protected DiagramPalette palette; + /** * The cached value of the '{@link #getNodeDescriptions() Node Descriptions}' containment reference list. * * + * @see #getNodeDescriptions() * @generated * @ordered - * @see #getNodeDescriptions() */ protected EList nodeDescriptions; + /** * The cached value of the '{@link #getEdgeDescriptions() Edge Descriptions}' containment reference list. * * + * @see #getEdgeDescriptions() * @generated * @ordered - * @see #getEdgeDescriptions() */ protected EList edgeDescriptions; + + /** + * The default value of the '{@link #getArrangeLayoutDirection() Arrange Layout Direction}' attribute. + * + * @generated + * @ordered + * @see #getArrangeLayoutDirection() + */ + protected static final ArrangeLayoutDirection ARRANGE_LAYOUT_DIRECTION_EDEFAULT = ArrangeLayoutDirection.UNDEFINED; + /** * The cached value of the '{@link #getArrangeLayoutDirection() Arrange Layout Direction}' attribute. @@ -336,7 +342,7 @@ public void eUnset(int featureID) { this.setAutoLayout(AUTO_LAYOUT_EDEFAULT); return; case DiagramPackage.DIAGRAM_DESCRIPTION__PALETTE: - this.setPalette(null); + this.setPalette((DiagramPalette) null); return; case DiagramPackage.DIAGRAM_DESCRIPTION__NODE_DESCRIPTIONS: this.getNodeDescriptions().clear(); @@ -383,12 +389,13 @@ public String toString() { if (this.eIsProxy()) return super.toString(); - String result = super.toString() + " (autoLayout: " + - this.autoLayout + - ", arrangeLayoutDirection: " + - this.arrangeLayoutDirection + - ')'; - return result; + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (autoLayout: "); + result.append(this.autoLayout); + result.append(", arrangeLayoutDirection: "); + result.append(this.arrangeLayoutDirection); + result.append(')'); + return result.toString(); } } // DiagramDescriptionImpl diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramFactoryImpl.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramFactoryImpl.java index bec03e5a343..496ddfbb374 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramFactoryImpl.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramFactoryImpl.java @@ -60,7 +60,7 @@ import org.eclipse.sirius.components.view.diagram.OutsideLabelPosition; import org.eclipse.sirius.components.view.diagram.OutsideLabelStyle; import org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescription; -import org.eclipse.sirius.components.view.diagram.SelectionDescription; +import org.eclipse.sirius.components.view.diagram.SelectionDialogDescription; import org.eclipse.sirius.components.view.diagram.SourceEdgeEndReconnectionTool; import org.eclipse.sirius.components.view.diagram.SynchronizationPolicy; import org.eclipse.sirius.components.view.diagram.TargetEdgeEndReconnectionTool; @@ -101,8 +101,8 @@ public static DiagramFactory init() { /** * * - * @generated * @deprecated + * @generated */ @Deprecated public static DiagramPackage getPackage() { @@ -175,8 +175,8 @@ public EObject create(EClass eClass) { return this.createCreateView(); case DiagramPackage.DELETE_VIEW: return this.createDeleteView(); - case DiagramPackage.SELECTION_DESCRIPTION: - return this.createSelectionDescription(); + case DiagramPackage.SELECTION_DIALOG_DESCRIPTION: + return this.createSelectionDialogDescription(); case DiagramPackage.DIAGRAM_TOOL_SECTION: return this.createDiagramToolSection(); case DiagramPackage.NODE_TOOL_SECTION: @@ -581,9 +581,9 @@ public DeleteView createDeleteView() { * @generated */ @Override - public SelectionDescription createSelectionDescription() { - SelectionDescriptionImpl selectionDescription = new SelectionDescriptionImpl(); - return selectionDescription; + public SelectionDialogDescription createSelectionDialogDescription() { + SelectionDialogDescriptionImpl selectionDialogDescription = new SelectionDialogDescriptionImpl(); + return selectionDialogDescription; } /** diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramPackageImpl.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramPackageImpl.java index 0391cad7a77..a14c183bda9 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramPackageImpl.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DiagramPackageImpl.java @@ -35,6 +35,7 @@ import org.eclipse.sirius.components.view.diagram.DiagramPackage; import org.eclipse.sirius.components.view.diagram.DiagramPalette; import org.eclipse.sirius.components.view.diagram.DiagramToolSection; +import org.eclipse.sirius.components.view.diagram.DialogDescription; import org.eclipse.sirius.components.view.diagram.DropNodeTool; import org.eclipse.sirius.components.view.diagram.DropTool; import org.eclipse.sirius.components.view.diagram.EdgeDescription; @@ -68,7 +69,7 @@ import org.eclipse.sirius.components.view.diagram.OutsideLabelPosition; import org.eclipse.sirius.components.view.diagram.OutsideLabelStyle; import org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescription; -import org.eclipse.sirius.components.view.diagram.SelectionDescription; +import org.eclipse.sirius.components.view.diagram.SelectionDialogDescription; import org.eclipse.sirius.components.view.diagram.SourceEdgeEndReconnectionTool; import org.eclipse.sirius.components.view.diagram.Style; import org.eclipse.sirius.components.view.diagram.SynchronizationPolicy; @@ -361,7 +362,7 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage { * * @generated */ - private EClass selectionDescriptionEClass = null; + private EClass selectionDialogDescriptionEClass = null; /** * @@ -398,6 +399,13 @@ public class DiagramPackageImpl extends EPackageImpl implements DiagramPackage { */ private EClass dropNodeToolEClass = null; + /** + * + * + * @generated + */ + private EClass dialogDescriptionEClass = null; + /** * * @@ -507,10 +515,10 @@ private DiagramPackageImpl() { * not invoke it directly. Instead, they should simply access that field to obtain the package. * - * @generated * @see #eNS_URI * @see #createPackageContents() * @see #initializePackageContents() + * @generated */ public static DiagramPackage init() { if (isInited) @@ -1865,7 +1873,7 @@ public EClass getNodeTool() { * @generated */ @Override - public EReference getNodeTool_SelectionDescription() { + public EReference getNodeTool_DialogDescription() { return (EReference) this.nodeToolEClass.getEStructuralFeatures().get(0); } @@ -1985,8 +1993,8 @@ public EAttribute getDeleteView_ViewExpression() { * @generated */ @Override - public EClass getSelectionDescription() { - return this.selectionDescriptionEClass; + public EClass getSelectionDialogDescription() { + return this.selectionDialogDescriptionEClass; } /** @@ -1995,8 +2003,8 @@ public EClass getSelectionDescription() { * @generated */ @Override - public EAttribute getSelectionDescription_SelectionCandidatesExpression() { - return (EAttribute) this.selectionDescriptionEClass.getEStructuralFeatures().get(0); + public EAttribute getSelectionDialogDescription_SelectionCandidatesExpression() { + return (EAttribute) this.selectionDialogDescriptionEClass.getEStructuralFeatures().get(0); } /** @@ -2005,8 +2013,8 @@ public EAttribute getSelectionDescription_SelectionCandidatesExpression() { * @generated */ @Override - public EAttribute getSelectionDescription_SelectionMessage() { - return (EAttribute) this.selectionDescriptionEClass.getEStructuralFeatures().get(1); + public EAttribute getSelectionDialogDescription_SelectionMessage() { + return (EAttribute) this.selectionDialogDescriptionEClass.getEStructuralFeatures().get(1); } /** @@ -2119,6 +2127,16 @@ public EReference getDropNodeTool_AcceptedNodeTypes() { return (EReference) this.dropNodeToolEClass.getEStructuralFeatures().get(0); } + /** + * + * + * @generated + */ + @Override + public EClass getDialogDescription() { + return this.dialogDescriptionEClass; + } + /** * * @@ -2406,7 +2424,7 @@ public void createPackageContents() { this.createEAttribute(this.labelEditToolEClass, LABEL_EDIT_TOOL__INITIAL_DIRECT_EDIT_LABEL_EXPRESSION); this.nodeToolEClass = this.createEClass(NODE_TOOL); - this.createEReference(this.nodeToolEClass, NODE_TOOL__SELECTION_DESCRIPTION); + this.createEReference(this.nodeToolEClass, NODE_TOOL__DIALOG_DESCRIPTION); this.createEAttribute(this.nodeToolEClass, NODE_TOOL__ICON_UR_LS_EXPRESSION); this.sourceEdgeEndReconnectionToolEClass = this.createEClass(SOURCE_EDGE_END_RECONNECTION_TOOL); @@ -2423,9 +2441,9 @@ public void createPackageContents() { this.deleteViewEClass = this.createEClass(DELETE_VIEW); this.createEAttribute(this.deleteViewEClass, DELETE_VIEW__VIEW_EXPRESSION); - this.selectionDescriptionEClass = this.createEClass(SELECTION_DESCRIPTION); - this.createEAttribute(this.selectionDescriptionEClass, SELECTION_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION); - this.createEAttribute(this.selectionDescriptionEClass, SELECTION_DESCRIPTION__SELECTION_MESSAGE); + this.selectionDialogDescriptionEClass = this.createEClass(SELECTION_DIALOG_DESCRIPTION); + this.createEAttribute(this.selectionDialogDescriptionEClass, SELECTION_DIALOG_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION); + this.createEAttribute(this.selectionDialogDescriptionEClass, SELECTION_DIALOG_DESCRIPTION__SELECTION_MESSAGE); this.toolSectionEClass = this.createEClass(TOOL_SECTION); this.createEAttribute(this.toolSectionEClass, TOOL_SECTION__NAME); @@ -2443,6 +2461,8 @@ public void createPackageContents() { this.dropNodeToolEClass = this.createEClass(DROP_NODE_TOOL); this.createEReference(this.dropNodeToolEClass, DROP_NODE_TOOL__ACCEPTED_NODE_TYPES); + this.dialogDescriptionEClass = this.createEClass(DIALOG_DESCRIPTION); + // Create enums this.arrowStyleEEnum = this.createEEnum(ARROW_STYLE); this.layoutDirectionEEnum = this.createEEnum(LAYOUT_DIRECTION); @@ -2511,6 +2531,7 @@ public void initializePackageContents() { this.targetEdgeEndReconnectionToolEClass.getESuperTypes().add(this.getEdgeReconnectionTool()); this.createViewEClass.getESuperTypes().add(theViewPackage.getOperation()); this.deleteViewEClass.getESuperTypes().add(theViewPackage.getOperation()); + this.selectionDialogDescriptionEClass.getESuperTypes().add(this.getDialogDescription()); this.diagramToolSectionEClass.getESuperTypes().add(this.getToolSection()); this.nodeToolSectionEClass.getESuperTypes().add(this.getToolSection()); this.edgeToolSectionEClass.getESuperTypes().add(this.getToolSection()); @@ -2781,8 +2802,8 @@ public void initializePackageContents() { !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); this.initEClass(this.nodeToolEClass, NodeTool.class, "NodeTool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEReference(this.getNodeTool_SelectionDescription(), this.getSelectionDescription(), null, "selectionDescription", null, 0, 1, NodeTool.class, !IS_TRANSIENT, !IS_VOLATILE, - IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + this.initEReference(this.getNodeTool_DialogDescription(), this.getDialogDescription(), null, "dialogDescription", null, 0, 1, NodeTool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, + IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); this.initEAttribute(this.getNodeTool_IconURLsExpression(), theViewPackage.getInterpretedExpression(), "iconURLsExpression", null, 0, 1, NodeTool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); @@ -2806,11 +2827,11 @@ public void initializePackageContents() { this.initEAttribute(this.getDeleteView_ViewExpression(), theViewPackage.getInterpretedExpression(), "viewExpression", "aql:selectedNode", 1, 1, DeleteView.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEClass(this.selectionDescriptionEClass, SelectionDescription.class, "SelectionDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - this.initEAttribute(this.getSelectionDescription_SelectionCandidatesExpression(), theViewPackage.getInterpretedExpression(), "selectionCandidatesExpression", "aql:self", 0, 1, - SelectionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - this.initEAttribute(this.getSelectionDescription_SelectionMessage(), this.ecorePackage.getEString(), "selectionMessage", null, 0, 1, SelectionDescription.class, !IS_TRANSIENT, !IS_VOLATILE, - IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + this.initEClass(this.selectionDialogDescriptionEClass, SelectionDialogDescription.class, "SelectionDialogDescription", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + this.initEAttribute(this.getSelectionDialogDescription_SelectionCandidatesExpression(), theViewPackage.getInterpretedExpression(), "selectionCandidatesExpression", "aql:self", 0, 1, + SelectionDialogDescription.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + this.initEAttribute(this.getSelectionDialogDescription_SelectionMessage(), this.ecorePackage.getEString(), "selectionMessage", null, 0, 1, SelectionDialogDescription.class, !IS_TRANSIENT, + !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); this.initEClass(this.toolSectionEClass, ToolSection.class, "ToolSection", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); this.initEAttribute(this.getToolSection_Name(), theViewPackage.getIdentifier(), "name", "Tool Section", 1, 1, ToolSection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, @@ -2834,6 +2855,8 @@ public void initializePackageContents() { this.initEReference(this.getDropNodeTool_AcceptedNodeTypes(), this.getNodeDescription(), null, "acceptedNodeTypes", null, 0, -1, DropNodeTool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); + this.initEClass(this.dialogDescriptionEClass, DialogDescription.class, "DialogDescription", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); + // Initialize enums and add enum literals this.initEEnum(this.arrowStyleEEnum, ArrowStyle.class, "ArrowStyle"); this.addEEnumLiteral(this.arrowStyleEEnum, ArrowStyle.NONE); diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DialogDescriptionImpl.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DialogDescriptionImpl.java new file mode 100644 index 00000000000..6a3fa9d9981 --- /dev/null +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/DialogDescriptionImpl.java @@ -0,0 +1,46 @@ +/******************************************************************************* + * Copyright (c) 2024 Obeo. + * This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v2.0 + * which accompanies this distribution, and is available at + * https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Obeo - initial API and implementation + *******************************************************************************/ +package org.eclipse.sirius.components.view.diagram.impl; + +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; +import org.eclipse.sirius.components.view.diagram.DiagramPackage; +import org.eclipse.sirius.components.view.diagram.DialogDescription; + +/** + * An implementation of the model object 'Dialog Description'. + * + * @generated + */ +public abstract class DialogDescriptionImpl extends MinimalEObjectImpl.Container implements DialogDescription { + /** + * + * + * @generated + */ + protected DialogDescriptionImpl() { + super(); + } + + /** + * + * + * @generated + */ + @Override + protected EClass eStaticClass() { + return DiagramPackage.Literals.DIALOG_DESCRIPTION; + } + +} // DialogDescriptionImpl diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/LabelDescriptionImpl.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/LabelDescriptionImpl.java index 23707ee9581..f7018c20878 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/LabelDescriptionImpl.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/LabelDescriptionImpl.java @@ -43,54 +43,59 @@ public abstract class LabelDescriptionImpl extends MinimalEObjectImpl.Container * The default value of the '{@link #getLabelExpression() Label Expression}' attribute. * + * @see #getLabelExpression() * @generated * @ordered - * @see #getLabelExpression() */ protected static final String LABEL_EXPRESSION_EDEFAULT = "aql:self.name"; + /** - * The default value of the '{@link #getOverflowStrategy() Overflow Strategy}' attribute. + * The cached value of the '{@link #getLabelExpression() Label Expression}' attribute. * + * @see #getLabelExpression() * @generated * @ordered - * @see #getOverflowStrategy() */ - protected static final LabelOverflowStrategy OVERFLOW_STRATEGY_EDEFAULT = LabelOverflowStrategy.NONE; + protected String labelExpression = LABEL_EXPRESSION_EDEFAULT; + /** - * The default value of the '{@link #getTextAlign() Text Align}' attribute. + * The default value of the '{@link #getOverflowStrategy() Overflow Strategy}' attribute. * * @generated * @ordered - * @see #getTextAlign() + * @see #getOverflowStrategy() */ - protected static final LabelTextAlign TEXT_ALIGN_EDEFAULT = LabelTextAlign.LEFT; + protected static final LabelOverflowStrategy OVERFLOW_STRATEGY_EDEFAULT = LabelOverflowStrategy.NONE; + /** - * The cached value of the '{@link #getLabelExpression() Label Expression}' attribute. + * The cached value of the '{@link #getOverflowStrategy() Overflow Strategy}' attribute. * * @generated * @ordered - * @see #getLabelExpression() + * @see #getOverflowStrategy() */ - protected String labelExpression = LABEL_EXPRESSION_EDEFAULT; + protected LabelOverflowStrategy overflowStrategy = OVERFLOW_STRATEGY_EDEFAULT; + /** - * The cached value of the '{@link #getOverflowStrategy() Overflow Strategy}' attribute. + * The default value of the '{@link #getTextAlign() Text Align}' attribute. * + * @see #getTextAlign() * @generated * @ordered - * @see #getOverflowStrategy() */ - protected LabelOverflowStrategy overflowStrategy = OVERFLOW_STRATEGY_EDEFAULT; + protected static final LabelTextAlign TEXT_ALIGN_EDEFAULT = LabelTextAlign.LEFT; + /** * The cached value of the '{@link #getTextAlign() Text Align}' attribute. * + * @see #getTextAlign() * @generated * @ordered - * @see #getTextAlign() */ protected LabelTextAlign textAlign = TEXT_ALIGN_EDEFAULT; @@ -271,14 +276,15 @@ public String toString() { if (this.eIsProxy()) return super.toString(); - String result = super.toString() + " (labelExpression: " + - this.labelExpression + - ", overflowStrategy: " + - this.overflowStrategy + - ", textAlign: " + - this.textAlign + - ')'; - return result; + StringBuilder result = new StringBuilder(super.toString()); + result.append(" (labelExpression: "); + result.append(this.labelExpression); + result.append(", overflowStrategy: "); + result.append(this.overflowStrategy); + result.append(", textAlign: "); + result.append(this.textAlign); + result.append(')'); + return result.toString(); } } // LabelDescriptionImpl diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/NodeToolImpl.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/NodeToolImpl.java index 477a02846d2..e07bac654cb 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/NodeToolImpl.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/impl/NodeToolImpl.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2023 Obeo. + * Copyright (c) 2023, 2024 Obeo. * This program and the accompanying materials * are made available under the terms of the Eclipse Public License v2.0 * which accompanies this distribution, and is available at @@ -18,8 +18,8 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.sirius.components.view.diagram.DiagramPackage; +import org.eclipse.sirius.components.view.diagram.DialogDescription; import org.eclipse.sirius.components.view.diagram.NodeTool; -import org.eclipse.sirius.components.view.diagram.SelectionDescription; /** * An implementation of the model object 'Node Tool'. @@ -27,7 +27,7 @@ * The following features are implemented: *

*
    - *
  • {@link org.eclipse.sirius.components.view.diagram.impl.NodeToolImpl#getSelectionDescription Selection + *
  • {@link org.eclipse.sirius.components.view.diagram.impl.NodeToolImpl#getDialogDescription Dialog * Description}
    • *
  • {@link org.eclipse.sirius.components.view.diagram.impl.NodeToolImpl#getIconURLsExpression Icon UR Ls * Expression}
    • @@ -37,14 +37,14 @@ */ public class NodeToolImpl extends ToolImpl implements NodeTool { /** - * The cached value of the '{@link #getSelectionDescription() Selection Description}' containment - * reference. + * The cached value of the '{@link #getDialogDescription() Dialog Description}' containment reference. * - * @see #getSelectionDescription() + * @see #getDialogDescription() * @generated * @ordered */ - protected SelectionDescription selectionDescription; + protected DialogDescription dialogDescription; /** * The default value of the '{@link #getIconURLsExpression() Icon UR Ls Expression}' attribute. An implementation of the model object 'Selection Description'. An implementation of the model object 'Selection Dialog Description'. *

    * The following features are implemented: *

    *
      - *
    • {@link org.eclipse.sirius.components.view.diagram.impl.SelectionDescriptionImpl#getSelectionCandidatesExpression + *
    • {@link org.eclipse.sirius.components.view.diagram.impl.SelectionDialogDescriptionImpl#getSelectionCandidatesExpression * Selection Candidates Expression}
      • - *
    • {@link org.eclipse.sirius.components.view.diagram.impl.SelectionDescriptionImpl#getSelectionMessage Selection - * Message}
      • + *
    • {@link org.eclipse.sirius.components.view.diagram.impl.SelectionDialogDescriptionImpl#getSelectionMessage + * Selection Message}
      • *
    * * @generated */ -public class SelectionDescriptionImpl extends MinimalEObjectImpl.Container implements SelectionDescription { +public class SelectionDialogDescriptionImpl extends DialogDescriptionImpl implements SelectionDialogDescription { /** * The default value of the '{@link #getSelectionCandidatesExpression() Selection Candidates Expression}' * attribute. @@ -80,7 +79,7 @@ public class SelectionDescriptionImpl extends MinimalEObjectImpl.Container imple * * @generated */ - protected SelectionDescriptionImpl() { + protected SelectionDialogDescriptionImpl() { super(); } @@ -91,7 +90,7 @@ protected SelectionDescriptionImpl() { */ @Override protected EClass eStaticClass() { - return DiagramPackage.Literals.SELECTION_DESCRIPTION; + return DiagramPackage.Literals.SELECTION_DIALOG_DESCRIPTION; } /** @@ -114,7 +113,7 @@ public void setSelectionCandidatesExpression(String newSelectionCandidatesExpres String oldSelectionCandidatesExpression = this.selectionCandidatesExpression; this.selectionCandidatesExpression = newSelectionCandidatesExpression; if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, DiagramPackage.SELECTION_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION, oldSelectionCandidatesExpression, + this.eNotify(new ENotificationImpl(this, Notification.SET, DiagramPackage.SELECTION_DIALOG_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION, oldSelectionCandidatesExpression, this.selectionCandidatesExpression)); } @@ -138,7 +137,7 @@ public void setSelectionMessage(String newSelectionMessage) { String oldSelectionMessage = this.selectionMessage; this.selectionMessage = newSelectionMessage; if (this.eNotificationRequired()) - this.eNotify(new ENotificationImpl(this, Notification.SET, DiagramPackage.SELECTION_DESCRIPTION__SELECTION_MESSAGE, oldSelectionMessage, this.selectionMessage)); + this.eNotify(new ENotificationImpl(this, Notification.SET, DiagramPackage.SELECTION_DIALOG_DESCRIPTION__SELECTION_MESSAGE, oldSelectionMessage, this.selectionMessage)); } /** @@ -149,9 +148,9 @@ public void setSelectionMessage(String newSelectionMessage) { @Override public Object eGet(int featureID, boolean resolve, boolean coreType) { switch (featureID) { - case DiagramPackage.SELECTION_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION: + case DiagramPackage.SELECTION_DIALOG_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION: return this.getSelectionCandidatesExpression(); - case DiagramPackage.SELECTION_DESCRIPTION__SELECTION_MESSAGE: + case DiagramPackage.SELECTION_DIALOG_DESCRIPTION__SELECTION_MESSAGE: return this.getSelectionMessage(); } return super.eGet(featureID, resolve, coreType); @@ -165,10 +164,10 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) { @Override public void eSet(int featureID, Object newValue) { switch (featureID) { - case DiagramPackage.SELECTION_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION: + case DiagramPackage.SELECTION_DIALOG_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION: this.setSelectionCandidatesExpression((String) newValue); return; - case DiagramPackage.SELECTION_DESCRIPTION__SELECTION_MESSAGE: + case DiagramPackage.SELECTION_DIALOG_DESCRIPTION__SELECTION_MESSAGE: this.setSelectionMessage((String) newValue); return; } @@ -183,10 +182,10 @@ public void eSet(int featureID, Object newValue) { @Override public void eUnset(int featureID) { switch (featureID) { - case DiagramPackage.SELECTION_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION: + case DiagramPackage.SELECTION_DIALOG_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION: this.setSelectionCandidatesExpression(SELECTION_CANDIDATES_EXPRESSION_EDEFAULT); return; - case DiagramPackage.SELECTION_DESCRIPTION__SELECTION_MESSAGE: + case DiagramPackage.SELECTION_DIALOG_DESCRIPTION__SELECTION_MESSAGE: this.setSelectionMessage(SELECTION_MESSAGE_EDEFAULT); return; } @@ -201,10 +200,10 @@ public void eUnset(int featureID) { @Override public boolean eIsSet(int featureID) { switch (featureID) { - case DiagramPackage.SELECTION_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION: + case DiagramPackage.SELECTION_DIALOG_DESCRIPTION__SELECTION_CANDIDATES_EXPRESSION: return SELECTION_CANDIDATES_EXPRESSION_EDEFAULT == null ? this.selectionCandidatesExpression != null - : !SELECTION_CANDIDATES_EXPRESSION_EDEFAULT.equals(this.selectionCandidatesExpression); - case DiagramPackage.SELECTION_DESCRIPTION__SELECTION_MESSAGE: + : !SELECTION_CANDIDATES_EXPRESSION_EDEFAULT.equals(this.selectionCandidatesExpression); + case DiagramPackage.SELECTION_DIALOG_DESCRIPTION__SELECTION_MESSAGE: return SELECTION_MESSAGE_EDEFAULT == null ? this.selectionMessage != null : !SELECTION_MESSAGE_EDEFAULT.equals(this.selectionMessage); } return super.eIsSet(featureID); @@ -229,4 +228,4 @@ public String toString() { return result.toString(); } -} // SelectionDescriptionImpl +} // SelectionDialogDescriptionImpl diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/util/DiagramAdapterFactory.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/util/DiagramAdapterFactory.java index 848ac9360e8..8d6ead83e9c 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/util/DiagramAdapterFactory.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/util/DiagramAdapterFactory.java @@ -33,6 +33,7 @@ import org.eclipse.sirius.components.view.diagram.DiagramPackage; import org.eclipse.sirius.components.view.diagram.DiagramPalette; import org.eclipse.sirius.components.view.diagram.DiagramToolSection; +import org.eclipse.sirius.components.view.diagram.DialogDescription; import org.eclipse.sirius.components.view.diagram.DropNodeTool; import org.eclipse.sirius.components.view.diagram.DropTool; import org.eclipse.sirius.components.view.diagram.EdgeDescription; @@ -59,7 +60,7 @@ import org.eclipse.sirius.components.view.diagram.OutsideLabelDescription; import org.eclipse.sirius.components.view.diagram.OutsideLabelStyle; import org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescription; -import org.eclipse.sirius.components.view.diagram.SelectionDescription; +import org.eclipse.sirius.components.view.diagram.SelectionDialogDescription; import org.eclipse.sirius.components.view.diagram.SourceEdgeEndReconnectionTool; import org.eclipse.sirius.components.view.diagram.Style; import org.eclipse.sirius.components.view.diagram.TargetEdgeEndReconnectionTool; @@ -279,8 +280,8 @@ public Adapter caseDeleteView(DeleteView object) { } @Override - public Adapter caseSelectionDescription(SelectionDescription object) { - return DiagramAdapterFactory.this.createSelectionDescriptionAdapter(); + public Adapter caseSelectionDialogDescription(SelectionDialogDescription object) { + return DiagramAdapterFactory.this.createSelectionDialogDescriptionAdapter(); } @Override @@ -308,6 +309,11 @@ public Adapter caseDropNodeTool(DropNodeTool object) { return DiagramAdapterFactory.this.createDropNodeToolAdapter(); } + @Override + public Adapter caseDialogDescription(DialogDescription object) { + return DiagramAdapterFactory.this.createDialogDescriptionAdapter(); + } + @Override public Adapter caseRepresentationDescription(RepresentationDescription object) { return DiagramAdapterFactory.this.createRepresentationDescriptionAdapter(); @@ -906,15 +912,15 @@ public Adapter createDeleteViewAdapter() { /** * Creates a new adapter for an object of class - * '{@link org.eclipse.sirius.components.view.diagram.SelectionDescription Selection Description}'. This default implementation returns null so that we can easily ignore cases; it's useful to - * ignore a case when inheritance will catch all the cases anyway. + * '{@link org.eclipse.sirius.components.view.diagram.SelectionDialogDescription Selection Dialog + * Description}'. This default implementation returns null so that we can easily ignore + * cases; it's useful to ignore a case when inheritance will catch all the cases anyway. * * @return the new adapter. + * @see org.eclipse.sirius.components.view.diagram.SelectionDialogDescription * @generated - * @see org.eclipse.sirius.components.view.diagram.SelectionDescription */ - public Adapter createSelectionDescriptionAdapter() { + public Adapter createSelectionDialogDescriptionAdapter() { return null; } @@ -988,6 +994,20 @@ public Adapter createDropNodeToolAdapter() { return null; } + /** + * Creates a new adapter for an object of class '{@link org.eclipse.sirius.components.view.diagram.DialogDescription + * Dialog Description}'. This default implementation returns null so that we can + * easily ignore cases; it's useful to ignore a case when inheritance will catch all the cases anyway. + * + * @return the new adapter. + * @see org.eclipse.sirius.components.view.diagram.DialogDescription + * @generated + */ + public Adapter createDialogDescriptionAdapter() { + return null; + } + /** * Creates a new adapter for an object of class '{@link org.eclipse.sirius.components.view.RepresentationDescription * Representation Description}'. This default implementation returns null so that diff --git a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/util/DiagramSwitch.java b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/util/DiagramSwitch.java index 577a54993f4..51a8452f8ec 100644 --- a/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/util/DiagramSwitch.java +++ b/packages/view/backend/sirius-components-view-diagram/src/main/java/org/eclipse/sirius/components/view/diagram/util/DiagramSwitch.java @@ -32,6 +32,7 @@ import org.eclipse.sirius.components.view.diagram.DiagramPackage; import org.eclipse.sirius.components.view.diagram.DiagramPalette; import org.eclipse.sirius.components.view.diagram.DiagramToolSection; +import org.eclipse.sirius.components.view.diagram.DialogDescription; import org.eclipse.sirius.components.view.diagram.DropNodeTool; import org.eclipse.sirius.components.view.diagram.DropTool; import org.eclipse.sirius.components.view.diagram.EdgeDescription; @@ -58,7 +59,7 @@ import org.eclipse.sirius.components.view.diagram.OutsideLabelDescription; import org.eclipse.sirius.components.view.diagram.OutsideLabelStyle; import org.eclipse.sirius.components.view.diagram.RectangularNodeStyleDescription; -import org.eclipse.sirius.components.view.diagram.SelectionDescription; +import org.eclipse.sirius.components.view.diagram.SelectionDialogDescription; import org.eclipse.sirius.components.view.diagram.SourceEdgeEndReconnectionTool; import org.eclipse.sirius.components.view.diagram.Style; import org.eclipse.sirius.components.view.diagram.TargetEdgeEndReconnectionTool; @@ -463,9 +464,11 @@ protected T doSwitch(int classifierID, EObject theEObject) { result = this.defaultCase(theEObject); return result; } - case DiagramPackage.SELECTION_DESCRIPTION: { - SelectionDescription selectionDescription = (SelectionDescription) theEObject; - T result = this.caseSelectionDescription(selectionDescription); + case DiagramPackage.SELECTION_DIALOG_DESCRIPTION: { + SelectionDialogDescription selectionDialogDescription = (SelectionDialogDescription) theEObject; + T result = this.caseSelectionDialogDescription(selectionDialogDescription); + if (result == null) + result = this.caseDialogDescription(selectionDialogDescription); if (result == null) result = this.defaultCase(theEObject); return result; @@ -513,6 +516,13 @@ protected T doSwitch(int classifierID, EObject theEObject) { result = this.defaultCase(theEObject); return result; } + case DiagramPackage.DIALOG_DESCRIPTION: { + DialogDescription dialogDescription = (DialogDescription) theEObject; + T result = this.caseDialogDescription(dialogDescription); + if (result == null) + result = this.defaultCase(theEObject); + return result; + } default: return this.defaultCase(theEObject); } @@ -1075,17 +1085,17 @@ public T caseDeleteView(DeleteView object) { } /** - * Returns the result of interpreting the object as an instance of 'Selection Description'. This implementation returns null; returning a non-null result will terminate the switch. * * @param object * the target of the switch. - * @return the result of interpreting the object as an instance of 'Selection Description'. - * @generated + * @return the result of interpreting the object as an instance of 'Selection Dialog Description'. * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated */ - public T caseSelectionDescription(SelectionDescription object) { + public T caseSelectionDialogDescription(SelectionDialogDescription object) { return null; } @@ -1162,6 +1172,21 @@ public T caseDropNodeTool(DropNodeTool object) { return null; } + /** + * Returns the result of interpreting the object as an instance of 'Dialog Description'. This implementation returns null; returning a non-null result will terminate the switch. + * + * @param object + * the target of the switch. + * @return the result of interpreting the object as an instance of 'Dialog Description'. + * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) + * @generated + */ + public T caseDialogDescription(DialogDescription object) { + return null; + } + /** * Returns the result of interpreting the object as an instance of 'Representation Description'. This implementation returns null; returning a non-null result will terminate the switch.