[2195] Set border color to None now set the color to none

Instead of set the color to a default color Bug: #2195 Signed-off-by: Axel RICHARD <axel.richard@obeo.fr>
eclipse-sirius · Sep 7, 2023 · 610dfb1 · 610dfb1
1 parent 415ade2
commit 610dfb1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -63,6 +63,7 @@ A suitable implementation is to get the id of the `self` object using `IObjectSe
 - https://github.com/eclipse-sirius/sirius-web/issues/2192[#2192] [view] Fix an issue where the _Shape_ property of an ImageNodeStyle was not mandatory.
 An error message is now displayed if the _Shape_ is not set. 
 - https://github.com/eclipse-sirius/sirius-web/issues/2309[#2309] [diagram] Fix an issue where the edge labels where not always centered on react-flow diagrams
+- https://github.com/eclipse-sirius/sirius-web/issues/2195[#2195] [view] Fix an issue where a border color set to _None_ would set the color to a default color, not none.
 
 === New Features
 
@@ -72,7 +73,7 @@ An error message is now displayed if the _Shape_ is not set.
 - https://github.com/eclipse-sirius/sirius-web/issues/2253[#2253] [diagram] Add the possibility of organizing palette tools into sections
 - https://github.com/eclipse-sirius/sirius-web/issues/2236[#2236] [forms] It is now possible to use `For` and `If` constructs inside the definition of Form (currently only inside _Groups_ and _Flexbox containers_).
 Both constructs are commonly combined together, with e.g. _For_ iterating on the different features of the current semantic element and several _If_ inside the loop to decide which concrete widget(s) to instantiate depending on the feature's type.
-They can however also be used independently (e.g. a single _If_ ouside of a _For_ to make the presence of a widget conditional) and combined in arbitrary ways (e.g. nested loops or conditionals).
+They can however also be used independently (e.g. a single _If_ outside of a _For_ to make the presence of a widget conditional) and combined in arbitrary ways (e.g. nested loops or conditionals).
 Note that this first version has a known limitation: _FormDescriptions_ which use _For_ or _If_ elements can not be reliably edited using the _Form Description Editor_.
 This will be fixed in the next version.
 

diff --git a/...-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/StylesFactory.java b/...-view-emf/src/main/java/org/eclipse/sirius/components/view/emf/diagram/StylesFactory.java
@@ -52,7 +52,6 @@ public StylesFactory(List<INodeStyleProvider> iNodeStyleProviders, IObjectServic
     }
 
     public LabelStyleDescription createLabelStyleDescription(NodeStyleDescription nodeStyle) {
-        // @formatter:off
         return LabelStyleDescription.newLabelStyleDescription()
                                     .colorProvider(variableManager -> Optional.ofNullable(nodeStyle.getLabelColor())
                                                                               .filter(FixedColor.class::isInstance)
@@ -72,11 +71,9 @@ public LabelStyleDescription createLabelStyleDescription(NodeStyleDescription no
                                         return iconURL;
                                     })
                                     .build();
-        // @formatter:on
     }
 
     public LabelStyleDescription createEdgeLabelStyleDescription(org.eclipse.sirius.components.view.diagram.EdgeStyle edgeStyle) {
-        // @formatter:off
         return LabelStyleDescription.newLabelStyleDescription()
                                     .colorProvider(variableManager -> Optional.ofNullable(edgeStyle.getColor())
                                                                               .filter(FixedColor.class::isInstance)
@@ -96,11 +93,9 @@ public LabelStyleDescription createEdgeLabelStyleDescription(org.eclipse.sirius.
                                         return iconURL;
                                     })
                                     .build();
-        // @formatter:on
     }
 
     public EdgeStyle createEdgeStyle(org.eclipse.sirius.components.view.diagram.EdgeStyle edgeStyle) {
-        // @formatter:off
         return EdgeStyle.newEdgeStyle()
                         .color(Optional.ofNullable(edgeStyle.getColor())
                                        .filter(FixedColor.class::isInstance)
@@ -112,7 +107,6 @@ public EdgeStyle createEdgeStyle(org.eclipse.sirius.components.view.diagram.Edge
                         .sourceArrow(ArrowStyle.valueOf(edgeStyle.getSourceArrowStyle().getLiteral()))
                         .targetArrow(ArrowStyle.valueOf(edgeStyle.getTargetArrowStyle().getLiteral()))
                         .build();
-        // @formatter:on
     }
 
     public String getNodeType(NodeStyleDescription nodeStyleDescription) {
@@ -140,7 +134,6 @@ public INodeStyle createNodeStyle(NodeStyleDescription nodeStyle, Optional<Strin
                 result = IconLabelNodeStyle.newIconLabelNodeStyle().backgroundColor("transparent").build();
                 break;
             case NodeType.NODE_RECTANGLE:
-                // @formatter:off
                 result = RectangularNodeStyle.newRectangularNodeStyle()
                     .withHeader(((RectangularNodeStyleDescription) nodeStyle).isWithHeader())
                     .color(Optional.ofNullable(nodeStyle.getColor())
@@ -152,13 +145,12 @@ public INodeStyle createNodeStyle(NodeStyleDescription nodeStyle, Optional<Strin
                                          .filter(FixedColor.class::isInstance)
                                          .map(FixedColor.class::cast)
                                          .map(FixedColor::getValue)
-                                         .orElse(DEFAULT_COLOR))
+                                         .orElse(""))
                     .borderSize(nodeStyle.getBorderSize())
                     .borderStyle(LineStyle.valueOf(nodeStyle.getBorderLineStyle().getLiteral()))
                     .borderRadius(nodeStyle.getBorderRadius())
                     .build();
                 break;
-                // @formatter:on
             default:
                 for (INodeStyleProvider iNodeStyleProvider : this.iNodeStyleProviders) {
                     Optional<INodeStyle> nodeStyleOpt = iNodeStyleProvider.createNodeStyle(nodeStyle, optionalEditingContextId);
@@ -169,7 +161,6 @@ public INodeStyle createNodeStyle(NodeStyleDescription nodeStyle, Optional<Strin
                 }
         }
         if (result == null) {
-            // @formatter:off
             result = RectangularNodeStyle.newRectangularNodeStyle()
                    .withHeader(true)
                    .color(Optional.ofNullable(nodeStyle.getColor())
@@ -181,15 +172,13 @@ public INodeStyle createNodeStyle(NodeStyleDescription nodeStyle, Optional<Strin
                                         .filter(FixedColor.class::isInstance)
                                         .map(FixedColor.class::cast)
                                         .map(FixedColor::getValue)
-                                        .orElse(DEFAULT_COLOR))
+                                        .orElse(""))
                    .borderSize(nodeStyle.getBorderSize())
                    .borderStyle(LineStyle.valueOf(nodeStyle.getBorderLineStyle().getLiteral()))
                    .borderRadius(nodeStyle.getBorderRadius())
                    .build();
-            // @formatter:on
         }
 
         return result;
     }
-    // CHECKSTYLE:ON
 }