forked from eclipse-syson/syson
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[272] Add state transition compartment and fix action creation in states
Bug: eclipse-syson#272 Signed-off-by: Gwendal Daniel <gwendal.daniel@obeosoft.com>
- Loading branch information
Showing
10 changed files
with
294 additions
and
117 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 0 additions & 103 deletions
103
...n/diagram/statetransition/view/nodes/CompositeStateDefinitionNodeDescriptionProvider.java
This file was deleted.
Oops, something went wrong.
73 changes: 73 additions & 0 deletions
73
...g/eclipse/syson/diagram/statetransition/view/nodes/DefinitionNodeDescriptionProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /******************************************************************************* | ||
| * 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.syson.diagram.statetransition.view.nodes; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import org.eclipse.emf.ecore.EClass; | ||
| import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; | ||
| import org.eclipse.sirius.components.view.builder.providers.IColorProvider; | ||
| import org.eclipse.sirius.components.view.diagram.NodeDescription; | ||
| import org.eclipse.sirius.components.view.diagram.NodeToolSection; | ||
| import org.eclipse.syson.diagram.common.view.nodes.AbstractDefinitionNodeDescriptionProvider; | ||
| import org.eclipse.syson.diagram.statetransition.view.STVDescriptionNameGenerator; | ||
| import org.eclipse.syson.diagram.statetransition.view.StateTransitionViewDiagramDescriptionProvider; | ||
| import org.eclipse.syson.diagram.statetransition.view.services.StateTransitionViewNodeToolSectionSwitch; | ||
| import org.eclipse.syson.sysml.SysmlPackage; | ||
|
|
||
| /** | ||
| * Node description provider for all SysMLv2 Definitions elements in the State Transition View diagram. | ||
| * | ||
| * @author gdaniel | ||
| */ | ||
| public class DefinitionNodeDescriptionProvider extends AbstractDefinitionNodeDescriptionProvider { | ||
|
|
||
| public DefinitionNodeDescriptionProvider(EClass eClass, IColorProvider colorProvider) { | ||
| super(eClass, colorProvider, new STVDescriptionNameGenerator()); | ||
| } | ||
|
|
||
| @Override | ||
| protected List<NodeDescription> getReusedChildren(IViewDiagramElementFinder cache) { | ||
| var reusedChildren = new ArrayList<NodeDescription>(); | ||
|
|
||
| StateTransitionViewDiagramDescriptionProvider.COMPARTMENTS_WITH_LIST_ITEMS.forEach((type, listItems) -> { | ||
| if (type.equals(this.eClass)) { | ||
| listItems.forEach(eReference -> { | ||
| cache.getNodeDescription(this.nameGenerator.getCompartmentName(type, eReference)).ifPresent(reusedChildren::add); | ||
| }); | ||
| } | ||
| }); | ||
| if (this.eClass.equals(SysmlPackage.eINSTANCE.getStateDefinition())) { | ||
| cache.getNodeDescription(this.nameGenerator.getFreeFormCompartmentName(this.eClass, SysmlPackage.eINSTANCE.getDefinition_OwnedState())).ifPresent(reusedChildren::add); | ||
| } | ||
| return reusedChildren; | ||
| } | ||
|
|
||
| @Override | ||
| protected List<NodeDescription> getAllNodeDescriptions(IViewDiagramElementFinder cache) { | ||
| var allNodes = new ArrayList<NodeDescription>(); | ||
|
|
||
| StateTransitionViewDiagramDescriptionProvider.DEFINITIONS.forEach(definition -> cache.getNodeDescription(this.nameGenerator.getNodeName(definition)).ifPresent(allNodes::add)); | ||
| StateTransitionViewDiagramDescriptionProvider.USAGES.forEach(usage -> cache.getNodeDescription(this.nameGenerator.getNodeName(usage)).ifPresent(allNodes::add)); | ||
| cache.getNodeDescription(this.nameGenerator.getNodeName(SysmlPackage.eINSTANCE.getPackage())).ifPresent(allNodes::add); | ||
| return allNodes; | ||
| } | ||
|
|
||
| @Override | ||
| protected List<NodeToolSection> getToolSections(NodeDescription nodeDescription, IViewDiagramElementFinder cache) { | ||
| StateTransitionViewNodeToolSectionSwitch toolSectionSwitch = new StateTransitionViewNodeToolSectionSwitch(); | ||
| toolSectionSwitch.doSwitch(this.eClass); | ||
| return toolSectionSwitch.getNodeToolSections(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
117 changes: 117 additions & 0 deletions
117
...diagram/statetransition/view/nodes/StateTransitionCompartmentNodeDescriptionProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,117 @@ | ||
| /******************************************************************************* | ||
| * 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.syson.diagram.statetransition.view.nodes; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import org.eclipse.emf.ecore.EClass; | ||
| import org.eclipse.emf.ecore.EReference; | ||
| import org.eclipse.sirius.components.view.builder.IViewDiagramElementFinder; | ||
| import org.eclipse.sirius.components.view.builder.providers.IColorProvider; | ||
| import org.eclipse.sirius.components.view.diagram.DiagramDescription; | ||
| import org.eclipse.sirius.components.view.diagram.InsideLabelDescription; | ||
| import org.eclipse.sirius.components.view.diagram.InsideLabelPosition; | ||
| import org.eclipse.sirius.components.view.diagram.InsideLabelStyle; | ||
| import org.eclipse.sirius.components.view.diagram.NodeDescription; | ||
| import org.eclipse.sirius.components.view.diagram.NodePalette; | ||
| import org.eclipse.sirius.components.view.diagram.SynchronizationPolicy; | ||
| import org.eclipse.syson.diagram.common.view.nodes.AbstractCompartmentNodeDescriptionProvider; | ||
| import org.eclipse.syson.diagram.statetransition.view.tools.StateTransitionCompartmentNodeToolProvider; | ||
| import org.eclipse.syson.sysml.SysmlPackage; | ||
| import org.eclipse.syson.util.AQLConstants; | ||
| import org.eclipse.syson.util.IDescriptionNameGenerator; | ||
| import org.eclipse.syson.util.SysMLMetamodelHelper; | ||
| import org.eclipse.syson.util.ViewConstants; | ||
|
|
||
| /** | ||
| * Used to create the 'state transition' free form compartment that contains nested/owned states. | ||
| * | ||
| * @author gdaniel | ||
| */ | ||
| public class StateTransitionCompartmentNodeDescriptionProvider extends AbstractCompartmentNodeDescriptionProvider { | ||
|
|
||
| public static final String STATE_COMPARTMENT_NAME = "state transition"; | ||
|
|
||
| private final String name; | ||
|
|
||
| public StateTransitionCompartmentNodeDescriptionProvider(EClass eClass, EReference eReference, IColorProvider colorProvider, IDescriptionNameGenerator nameGenerator) { | ||
| super(eClass, eReference, colorProvider, nameGenerator); | ||
| this.name = nameGenerator.getFreeFormCompartmentName(this.eClass, this.eReference); | ||
| } | ||
|
|
||
| @Override | ||
| public NodeDescription create() { | ||
| return this.diagramBuilderHelper.newNodeDescription() | ||
| .childrenLayoutStrategy(this.diagramBuilderHelper.newFreeFormLayoutStrategyDescription().build()) | ||
| .defaultHeightExpression("150") | ||
| .defaultWidthExpression(ViewConstants.DEFAULT_NODE_WIDTH) | ||
| .domainType(SysMLMetamodelHelper.buildQualifiedName(SysmlPackage.eINSTANCE.getElement())) | ||
| .insideLabel(this.createInsideLabelDescription()) | ||
| .isHiddenByDefaultExpression("aql:true") | ||
| .name(this.name) | ||
| .semanticCandidatesExpression(AQLConstants.AQL_SELF) | ||
| .style(this.createCompartmentNodeStyle()) | ||
| .userResizable(false) | ||
| .synchronizationPolicy(SynchronizationPolicy.SYNCHRONIZED) | ||
| .build(); | ||
| } | ||
|
|
||
| @Override | ||
| public void link(DiagramDescription diagramDescription, IViewDiagramElementFinder cache) { | ||
| cache.getNodeDescription(this.name).ifPresent(nodeDescription -> { | ||
| cache.getNodeDescription(this.nameGenerator.getNodeName(SysmlPackage.eINSTANCE.getStateUsage())).ifPresent(nodeDescription.getReusedChildNodeDescriptions()::add); | ||
| nodeDescription.setPalette(this.createCompartmentPalette(cache)); | ||
| }); | ||
| } | ||
|
|
||
| @Override | ||
| protected List<NodeDescription> getDroppableNodes(IViewDiagramElementFinder cache) { | ||
| List<NodeDescription> droppableNodes = new ArrayList<>(); | ||
| cache.getNodeDescription(this.nameGenerator.getNodeName(SysmlPackage.eINSTANCE.getStateUsage())).ifPresent(droppableNodes::add); | ||
| return droppableNodes; | ||
| } | ||
|
|
||
| @Override | ||
| protected InsideLabelDescription createInsideLabelDescription() { | ||
| return this.diagramBuilderHelper.newInsideLabelDescription() | ||
| .labelExpression(STATE_COMPARTMENT_NAME) | ||
| .position(InsideLabelPosition.TOP_CENTER) | ||
| .style(this.createInsideLabelStyle()) | ||
| .build(); | ||
| } | ||
|
|
||
| @Override | ||
| protected InsideLabelStyle createInsideLabelStyle() { | ||
| return this.diagramBuilderHelper.newInsideLabelStyle() | ||
| .displayHeaderSeparator(false) | ||
| .fontSize(12) | ||
| .italic(true) | ||
| .labelColor(this.colorProvider.getColor(ViewConstants.DEFAULT_LABEL_COLOR)) | ||
| .showIcon(false) | ||
| .withHeader(false) | ||
| .build(); | ||
| } | ||
|
|
||
| @Override | ||
| protected NodePalette createCompartmentPalette(IViewDiagramElementFinder cache) { | ||
| var palette = this.diagramBuilderHelper.newNodePalette().dropNodeTool(this.createCompartmentDropFromDiagramTool(cache)); | ||
|
|
||
| // Do not use getItemCreationToolProvider because the compartment contains multiple creation tools. | ||
| palette.nodeTools(new StateTransitionCompartmentNodeToolProvider(false).create(cache), | ||
| new StateTransitionCompartmentNodeToolProvider(true).create(cache) | ||
| ); | ||
|
|
||
| return palette.toolSections(this.defaultToolsFactory.createDefaultHideRevealNodeToolSection()).build(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.