Avoid svg components duplication #44 (#160) (#194)

Correction in the defs section generation when using the parameter avoidSVGComponentDuplication Signed-off-by: Franck LECUYER <franck.lecuyer@rte-france.com>
powsybl · Oct 8, 2019 · 1dadde8 · 1dadde8
1 parent 2cb2b9e
commit 1dadde8
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 813 deletions.
diff --git a/...tation-diagram-core/src/main/java/com/powsybl/substationdiagram/svg/DefaultSVGWriter.java b/...tation-diagram-core/src/main/java/com/powsybl/substationdiagram/svg/DefaultSVGWriter.java
@@ -152,7 +152,7 @@ public GraphMetadata write(Graph graph,
         globalStyle.ifPresent(graphStyle::append);
         graphStyle.append(componentLibrary.getStyleSheet());
 
-        List<String> listUsedComponentSVG = new ArrayList<>();
+        Set<String> listUsedComponentSVG = new HashSet<>();
 
         graph.getNodes().forEach(n -> {
             Optional<String> nodeStyle = styleProvider.getNodeStyle(n, layoutParameters.isAvoidSVGComponentsDuplication());
@@ -274,7 +274,7 @@ public GraphMetadata write(SubstationGraph graph,
         Document document = domImpl.createDocument("http://www.w3.org/2000/svg", "svg", null);
         Element style = document.createElement("style");
 
-        List<String> listUsedComponentSVG = new ArrayList<>();
+        Set<String> listUsedComponentSVG = new HashSet<>();
 
         StringBuilder graphStyle = new StringBuilder();
         for (Graph vlGraph : graph.getNodes()) {
@@ -1139,7 +1139,7 @@ private void shiftFeedersPosition(Graph graph, double scaleShiftFeederNames) {
     /**
      * Creation of the defs area for the SVG components
      */
-    protected void createDefsSVGComponents(Document document, List<String> listUsedComponentSVG) {
+    protected void createDefsSVGComponents(Document document, Set<String> listUsedComponentSVG) {
         if (layoutParameters.isAvoidSVGComponentsDuplication()) {
             Element defs = document.createElement("defs");