[960] Display possible 'actor' PartUsages in a tree

In the General View diagram, the creation tool for ActorParameter
now shows possible candidate PartUsages in a tree instead of a flat
list.

Bug: #960
Signed-off-by: Florent Latombe <florent.latombe@obeo.fr>

Author: flatombe

CHANGELOG.adoc

@@ -47,7 +47,7 @@ The changes are:
 - https://github.com/eclipse-syson/syson/issues/946[#946] [libraries] All standard libraries have been updated to comply with the SysML Beta 2.3 specification.
 - https://github.com/eclipse-syson/syson/issues/982[#982] [metamodel] `Membership#isDistinguishableFrom` derived attribute has been implemented.
 - https://github.com/eclipse-syson/syson/issues/992[#992] [export] Implement SysML export of `ConcernDefinition`, `ConcernUsage` and `StakeholderMembership`
-- https://github.com/eclipse-syson/syson/issues/960[#960] [general-view] In the selection dialog of the creation tool for 'StakeholderParameter', display possible PartUsage candidates in a tree instead of a list.
+- https://github.com/eclipse-syson/syson/issues/960[#960] [general-view] In the selection dialog of the creation tools for `Stakeholders` and `Actors`, display possible `Part Usage` candidates in a tree instead of a list.
 
 === New features
 

backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/ViewNodeService.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Obeo.
+ * Copyright (c) 2024, 2025 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
@@ -246,15 +246,6 @@ public List<Element> getAllReachableRequirements(EObject eObject) {
                 .toList();
     }
 
-    public List<Element> getAllReachableItems(EObject eObject) {
-        List<EObject> allItemUsage = this.utilService.getAllReachable(eObject, SysmlPackage.eINSTANCE.getItemUsage(), false);
-        List<EObject> allItemDefinition = this.utilService.getAllReachable(eObject, SysmlPackage.eINSTANCE.getItemDefinition(), false);
-        return Stream.concat(allItemUsage.stream(), allItemDefinition.stream())
-                .filter(Element.class::isInstance)
-                .map(Element.class::cast)
-                .toList();
-    }
-
     /**
      * Returns {@code true} if the provided {@code element} is an actor, {@code false} otherwise.
      * <p>
@@ -302,7 +293,7 @@ private boolean isReferencingPerformActionUsage(PerformActionUsage pau) {
         // the given PerformActionUsage is a referencing PerformActionUsage if it contains a reference subsetting
         // pointing to an action.
         ReferenceSubsetting referenceSubSetting = pau.getOwnedReferenceSubsetting();
-        return referenceSubSetting != null && referenceSubSetting.getReferencedFeature() instanceof ActionUsage perfomedAction;
+        return referenceSubSetting != null && referenceSubSetting.getReferencedFeature() instanceof ActionUsage;
     }
 
     private Node getOneMatchingAnnotatedNodes(Node node, EList<Element> annotatedElements, IDiagramContext diagramContext, IEditingContext editingContext) {

backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/services/ViewToolService.java

@@ -1132,10 +1132,10 @@ public List<Resource> getNamespaceImportSelectionDialogElements(IEditingContext
                 .map(IEMFEditingContext::getDomain)
                 .map(EditingDomain::getResourceSet);
         var resources = optionalResourceSet.map(resourceSet -> resourceSet.getResources().stream()
-                .filter(resource -> containsDirectlyOrIndirectlyInstancesOf(resource, SysmlPackage.eINSTANCE.getPackage()))
+                .filter(resource -> this.containsDirectlyOrIndirectlyInstancesOf(resource, SysmlPackage.eINSTANCE.getPackage()))
                         .toList())
                 .orElseGet(ArrayList::new);
-        return resources.stream().sorted((r1, r2) -> getResourceName(r1).compareTo(getResourceName(r2))).toList();
+        return resources.stream().sorted((r1, r2) -> this.getResourceName(r1).compareTo(this.getResourceName(r2))).toList();
     }
 
     /**
@@ -1161,7 +1161,7 @@ public List<Package> getNamespaceImportSelectionDialogChildren(Object self) {
         return result;
     }
 
-    private static boolean containsDirectlyOrIndirectlyInstancesOf(Resource resource, EClassifier eClassifier) {
+    private boolean containsDirectlyOrIndirectlyInstancesOf(Resource resource, EClassifier eClassifier) {
         boolean found = false;
         final Iterator<EObject> allContents = resource.getAllContents();
         while (!found && allContents.hasNext()) {
@@ -1170,7 +1170,7 @@ private static boolean containsDirectlyOrIndirectlyInstancesOf(Resource resource
         return found;
     }
 
-    private static boolean containsDirectlyOrIndirectlyInstancesOf(EObject eObject, EClassifier eClassifier) {
+    private boolean containsDirectlyOrIndirectlyInstancesOf(EObject eObject, EClassifier eClassifier) {
         boolean found = false;
         final Iterator<EObject> allContents = eObject.eAllContents();
         while (!found && allContents.hasNext()) {
@@ -1179,7 +1179,7 @@ private static boolean containsDirectlyOrIndirectlyInstancesOf(EObject eObject,
         return found;
     }
 
-    private static String getResourceName(Resource resource) {
+    private String getResourceName(Resource resource) {
         return resource.eAdapters().stream()
                 .filter(ResourceMetadataAdapter.class::isInstance)
                 .map(ResourceMetadataAdapter.class::cast)
@@ -1212,7 +1212,7 @@ private List<Package> findClosestPackageInChildren(Element element) {
      * @return the (non-{@code null}) {@link List} of all {@link Resource} that contain at least one {@link PartUsage}.
      */
     public List<Resource> getStakeholderSelectionDialogElements(IEditingContext editingContext) {
-        return getAllResourcesWithInstancesOf(editingContext, SysmlPackage.eINSTANCE.getPartUsage());
+        return this.getAllResourcesWithInstancesOf(editingContext, SysmlPackage.eINSTANCE.getPartUsage());
     }
 
     /**
@@ -1224,10 +1224,33 @@ public List<Resource> getStakeholderSelectionDialogElements(IEditingContext edit
      *         {@link PartUsage}.
      */
     public List<? extends Object> getStakeholderSelectionDialogChildren(Object selectionDialogTreeElement) {
-        return getChildrenWithInstancesOf(selectionDialogTreeElement, SysmlPackage.eINSTANCE.getPartUsage());
+        return this.getChildrenWithInstancesOf(selectionDialogTreeElement, SysmlPackage.eINSTANCE.getPartUsage());
     }
 
-    private static List<Resource> getAllResourcesWithInstancesOf(IEditingContext editingContext, EClassifier eClassifier) {
+    /**
+     * Provides the root elements in the tree of the selection dialog for the ActorParameter creation tool.
+     *
+     * @param editingContext
+     *            the (non-{@code null}) {@link IEditingContext}.
+     * @return the (non-{@code null}) {@link List} of all {@link Resource} that contain at least one {@link PartUsage}.
+     */
+    public List<Resource> getActorSelectionDialogElements(IEditingContext editingContext) {
+        return this.getAllResourcesWithInstancesOf(editingContext, SysmlPackage.eINSTANCE.getPartUsage());
+    }
+
+    /**
+     * Provides the children of element in the tree of the selection dialog for the ActorParameter creation tool.
+     *
+     * @param selectionDialogTreeElement
+     *            a (non-{@code null}) selection dialog tree element.
+     * @return the (non-{@code null}) {@link List} of all children that contain (possibly indirectly) or are
+     *         {@link PartUsage}.
+     */
+    public List<? extends Object> getActorSelectionDialogChildren(Object selectionDialogTreeElement) {
+        return this.getChildrenWithInstancesOf(selectionDialogTreeElement, SysmlPackage.eINSTANCE.getPartUsage());
+    }
+
+    private List<Resource> getAllResourcesWithInstancesOf(IEditingContext editingContext, EClassifier eClassifier) {
         Objects.requireNonNull(editingContext);
 
         var maybeResourceSet = Optional.of(editingContext)
@@ -1236,26 +1259,26 @@ private static List<Resource> getAllResourcesWithInstancesOf(IEditingContext edi
                 .map(IEMFEditingContext::getDomain)
                 .map(EditingDomain::getResourceSet);
         var resourcesContainingPartUsage = maybeResourceSet.map(resourceSet -> resourceSet.getResources().stream()
-                .filter(resource -> containsDirectlyOrIndirectlyInstancesOf(resource, eClassifier))
+                .filter(resource -> this.containsDirectlyOrIndirectlyInstancesOf(resource, eClassifier))
                 .toList())
                 .orElseGet(ArrayList::new);
-        return resourcesContainingPartUsage.stream().sorted(Comparator.comparing(ViewToolService::getResourceName)).toList();
+        return resourcesContainingPartUsage.stream().sorted(Comparator.comparing(r -> this.getResourceName(r))).toList();
     }
 
-    private static List<? extends Object> getChildrenWithInstancesOf(Object selectionDialogTreeElement, EClassifier eClassifier) {
+    private List<? extends Object> getChildrenWithInstancesOf(Object selectionDialogTreeElement, EClassifier eClassifier) {
         Objects.requireNonNull(selectionDialogTreeElement);
 
         final List<? extends Object> result;
 
         if (selectionDialogTreeElement instanceof Resource resource) {
             result = resource.getContents().stream()
-                    .filter(content -> eClassifier.isInstance(content) || containsDirectlyOrIndirectlyInstancesOf(content, eClassifier)).toList();
+                    .filter(content -> eClassifier.isInstance(content) || this.containsDirectlyOrIndirectlyInstancesOf(content, eClassifier)).toList();
         } else if (selectionDialogTreeElement instanceof Element sysmlElement) {
             return sysmlElement.getOwnedRelationship().stream()
                     .filter(Membership.class::isInstance)
                     .map(Membership.class::cast)
                     .map(Membership::getOwnedRelatedElement).flatMap(List::stream)
-                    .filter(content -> eClassifier.isInstance(content) || containsDirectlyOrIndirectlyInstancesOf(content, eClassifier)).toList();
+                    .filter(content -> eClassifier.isInstance(content) || this.containsDirectlyOrIndirectlyInstancesOf(content, eClassifier)).toList();
         } else {
             result = new ArrayList<>();
         }

backend/views/syson-diagram-common-view/src/main/java/org/eclipse/syson/diagram/common/view/tools/ActorCompartmentNodeToolProvider.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2024 Obeo.
+ * Copyright (c) 2025 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
@@ -30,11 +30,13 @@ protected String getServiceCallExpression() {
     @Override
     protected SelectionDialogDescription getSelectionDialogDescription() {
         var selectionDialogTree = this.diagramBuilderHelper.newSelectionDialogTreeDescription()
-                .elementsExpression(AQLUtils.getSelfServiceCallExpression("getAllReachableItems"))
+                .elementsExpression(AQLUtils.getServiceCallExpression("editingContext", "getActorSelectionDialogElements"))
+                .childrenExpression(AQLUtils.getSelfServiceCallExpression("getActorSelectionDialogChildren"))
+                .isSelectableExpression("aql:self.oclIsKindOf(sysml::PartUsage)")
                 .build();
         return this.diagramBuilderHelper.newSelectionDialogDescription()
                 .selectionDialogTreeDescription(selectionDialogTree)
-                .selectionMessage("Select an existing Item as actor:")
+                .selectionMessage("Select an existing Part as actor:")
                 .build();
     }
 

doc/content/modules/user-manual/assets/images/release-notes-gv-actor-creation-selection-dialog-tree.png

@@ -89,10 +89,14 @@ image::release-notes-gv-concern-usage.png[Concern Usage node creation tool, widt
 
 image::release-notes-gv-stakeholders.png['stakeholders' compartment, width=50%, height=50%]
 
-- In the `General View` diagram, the stakeholder creation tool displays available `Part Usage` in a tree instead of a list.
+- In the `General View` diagram, the stakeholder creation tool displays available `Part Usages` in a tree instead of a list.
 
 image::release-notes-gv-stakeholder-creation-selection-dialog-tree.png['stakeholder creation tool selection dialog tree' compartment, width=50%, height=50%]
 
+- In the `General View` diagram, the actor creation tool displays available `Part Usages` in a tree instead of a list.
+
+image::release-notes-gv-actor-creation-selection-dialog-tree.png['actor creation tool selection dialog tree' compartment, width=50%, height=50%]
+
 - Prevent the edition of imported user libraries from the details view.
 - Align metamodel to SysMLv2 and KerML Beta 2.3 specifications.
 The changes are: