remove Sld and Nad Parameters builders

Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
powsybl · Sep 4, 2023 · a0b100b · a0b100b
1 parent f1433b0
commit a0b100b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/java/src/main/java/com/powsybl/python/network/NetworkAreaDiagramUtil.java b/java/src/main/java/com/powsybl/python/network/NetworkAreaDiagramUtil.java
@@ -39,7 +39,7 @@ static void writeSvg(Network network, List<String> voltageLevelIds, int depth, W
                 .setFixedWidth(800)
                 .setFixedHeight(600)
                 .setEdgeNameDisplayed(edgeNameDisplayed);
-        NadParameters nadParameters = NadParameters.builder().withSvgParameters(svgParameters);
+        NadParameters nadParameters = new NadParameters().setSvgParameters(svgParameters);
 
         Predicate<VoltageLevel> filter = voltageLevelIds.size() > 0
                 ? getNominalVoltageFilter(network, voltageLevelIds, highNominalVoltageBound, lowNominalVoltageBound, depth)

diff --git a/java/src/main/java/com/powsybl/python/network/NetworkCFunctions.java b/java/src/main/java/com/powsybl/python/network/NetworkCFunctions.java
@@ -850,13 +850,17 @@ public SldParametersExt(SvgParameters svgParameters, boolean topologicalColoring
             this.svgParameters = svgParameters;
             this.topologicalColoring = topologicalColoring;
             this.componentLibrary = componentLibrary;
-            SldParametersBuilder sldParametersBuilder = new SldParametersBuilder()
-                    .withSvgParameters(svgParameters)
-                    .withComponentLibrary(ComponentLibrary.find(componentLibrary).orElseGet(ConvergenceComponentLibrary::new));
+
+            SldParameters sldParameters = new SldParameters()
+                    .setSvgParameters(svgParameters)
+                    .setComponentLibrary(ComponentLibrary.find(componentLibrary).orElseGet(ConvergenceComponentLibrary::new));
+
             if (!topologicalColoring) {
-                sldParametersBuilder.withStyleProviderFactory(NominalVoltageStyleProviderFactory);
+                sldParameters.setStyleProviderFactory(NominalVoltageStyleProviderFactory);
             }
-            this.sldParameters = sldParametersBuilder.build();
+
+            this.sldParameters = sldParameters;
+
         }
     }