[1463] Do not assume there is always at least a center label on an edge

Bug: #1463 Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
eclipse-sirius · Feb 3, 2023 · d9114d5 · d9114d5
1 parent 6496ee1
commit d9114d5
Showing 1 changed file with 24 additions and 19 deletions.
diff --git a/.../org/eclipse/sirius/components/collaborative/diagrams/handlers/EditLabelEventHandler.java b/.../org/eclipse/sirius/components/collaborative/diagrams/handlers/EditLabelEventHandler.java
@@ -153,28 +153,33 @@ private void invokeDirectEditTool(Edge edge, String labelId, IEditingContext edi
             if (optionalSelf.isPresent()) {
                 Object self = optionalSelf.get();
 
-                var edgeLabelKind = EdgeLabelKind.CENTER_LABEL;
+                Optional<EdgeLabelKind> optionalEdgeLabelKind = Optional.empty();
                 if (edge.getBeginLabel() != null && edge.getBeginLabel().getId().equals(labelId)) {
-                    edgeLabelKind = EdgeLabelKind.BEGIN_LABEL;
+                    optionalEdgeLabelKind = Optional.of(EdgeLabelKind.BEGIN_LABEL);
+                } else if (edge.getCenterLabel() != null && edge.getCenterLabel().getId().equals(labelId)) {
+                    optionalEdgeLabelKind = Optional.of(EdgeLabelKind.CENTER_LABEL);
                 } else if (edge.getEndLabel() != null && edge.getEndLabel().getId().equals(labelId)) {
-                    edgeLabelKind = EdgeLabelKind.END_LABEL;
+                    optionalEdgeLabelKind = Optional.of(EdgeLabelKind.END_LABEL);
+                }
+                if (optionalEdgeLabelKind.isPresent()) {
+                    VariableManager variableManager = new VariableManager();
+                    variableManager.put(Environment.ENVIRONMENT, new Environment(Environment.SIRIUS_COMPONENTS));
+                    variableManager.put(VariableManager.SELF, self);
+                    // @formatter:off
+                    var semanticEdgeSource = this.diagramQueryService.findNodeById(diagram, edge.getSourceId())
+                            .flatMap(node -> this.objectService.getObject(editingContext, node.getTargetObjectId()))
+                            .orElse(null);
+                    var semanticEdgeTarget = this.diagramQueryService.findNodeById(diagram, edge.getTargetId())
+                            .flatMap(node -> this.objectService.getObject(editingContext, node.getTargetObjectId()))
+                            .orElse(null);
+                    variableManager.put(EdgeDescription.SEMANTIC_EDGE_SOURCE, semanticEdgeSource);
+                    variableManager.put(EdgeDescription.SEMANTIC_EDGE_TARGET, semanticEdgeTarget);
+                    // @formatter:on
+                    edgeDescription.getLabelEditHandler().editLabel(variableManager, optionalEdgeLabelKind.get(), newText);
+                    this.logger.debug("Edited label of diagram element {} to {}", edge.getId(), newText);
+                } else {
+                    this.logger.debug("No label with id {} to edit on edge {}", labelId, edge.getId());
                 }
-
-                VariableManager variableManager = new VariableManager();
-                variableManager.put(Environment.ENVIRONMENT, new Environment(Environment.SIRIUS_COMPONENTS));
-                variableManager.put(VariableManager.SELF, self);
-                // @formatter:off
-                var semanticEdgeSource = this.diagramQueryService.findNodeById(diagram, edge.getSourceId())
-                        .flatMap(node -> this.objectService.getObject(editingContext, node.getTargetObjectId()))
-                        .orElse(null);
-                var semanticEdgeTarget = this.diagramQueryService.findNodeById(diagram, edge.getTargetId())
-                        .flatMap(node -> this.objectService.getObject(editingContext, node.getTargetObjectId()))
-                        .orElse(null);
-                variableManager.put(EdgeDescription.SEMANTIC_EDGE_SOURCE, semanticEdgeSource);
-                variableManager.put(EdgeDescription.SEMANTIC_EDGE_TARGET, semanticEdgeTarget);
-                // @formatter:on
-                edgeDescription.getLabelEditHandler().editLabel(variableManager, edgeLabelKind, newText);
-                this.logger.debug("Edited label of diagram element {} to {}", edge.getId(), newText);
             }
         }
     }