From 8c83fdcc0671b8bf2be17ef4f557c6ae82145e08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 09:24:00 +0000 Subject: [PATCH 1/3] build(deps): Bump com.powsybl:powsybl-single-line-diagram-core Bumps com.powsybl:powsybl-single-line-diagram-core from 3.3.2 to 4.0.0. --- updated-dependencies: - dependency-name: com.powsybl:powsybl-single-line-diagram-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47d55f8..e31faa6 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ SPDX-License-Identifier: Apache-2.0 3.4.3 2.21.1 - 3.3.2 + 4.0.0 2.10.1 0.9.1 From ba91264ec07e9fe4a955bd4b2c052d82dbd01c4b Mon Sep 17 00:00:00 2001 From: Stef3st Date: Mon, 11 Dec 2023 17:01:40 +0100 Subject: [PATCH 2/3] chore: solved depricated functions Signed-off-by: Stef3st --- .../service/SclAutoAlignmentDiagramLabelProvider.java | 2 +- .../alignment/service/SclAutoAlignmentService.java | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentDiagramLabelProvider.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentDiagramLabelProvider.java index 3d7cc42..8e13ca6 100644 --- a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentDiagramLabelProvider.java +++ b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentDiagramLabelProvider.java @@ -16,7 +16,7 @@ import java.util.*; -public class SclAutoAlignmentDiagramLabelProvider implements DiagramLabelProvider { +public class SclAutoAlignmentDiagramLabelProvider implements LabelProvider { private final Map> busLabels = new HashMap<>(); public SclAutoAlignmentDiagramLabelProvider(SubstationGraph graph) { diff --git a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java index 8042304..8f52e03 100644 --- a/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java +++ b/service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java @@ -8,6 +8,7 @@ import com.powsybl.sld.layout.PositionVoltageLevelLayoutFactory; import com.powsybl.sld.library.ConvergenceComponentLibrary; import com.powsybl.sld.model.graphs.SubstationGraph; +import com.powsybl.sld.svg.SvgParameters; import com.powsybl.sld.svg.styles.BasicStyleProvider; import com.powsybl.sld.svg.DefaultSVGWriter; import org.lfenergy.compas.core.commons.ElementConverter; @@ -102,17 +103,14 @@ String createSVG(SubstationGraphBuilder substationGraphBuilder) { configureLayout(graph, layoutParameters); var writer = new StringWriter(); - var svgWriter = new DefaultSVGWriter(new ConvergenceComponentLibrary(), layoutParameters); - svgWriter.write("", graph, new SclAutoAlignmentDiagramLabelProvider(graph), new BasicStyleProvider(), writer); + var svgWriter = new DefaultSVGWriter(new ConvergenceComponentLibrary(), layoutParameters, new SvgParameters()); + svgWriter.write(graph, new SclAutoAlignmentDiagramLabelProvider(graph), new BasicStyleProvider(), writer); return writer.toString(); } private LayoutParameters getLayoutParameters() { return new LayoutParameters() - .setAdaptCellHeightToContent(true) - .setShowInternalNodes(true) - .setCssLocation(LayoutParameters.CssLocation.INSERTED_IN_SVG) - .setShowInternalNodes(true); + .setAdaptCellHeightToContent(true); } private void configureLayout(SubstationGraph graph, LayoutParameters layoutParameters) { From 20941c898f773dd1dd79ef77f081bb191a57bff6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 17:13:04 +0000 Subject: [PATCH 3/3] build(deps): Bump log4j2.version from 2.22.1 to 2.23.0 Bumps `log4j2.version` from 2.22.1 to 2.23.0. Updates `org.apache.logging.log4j:log4j-api` from 2.22.1 to 2.23.0 Updates `org.apache.logging.log4j:log4j-core` from 2.22.1 to 2.23.0 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.22.1 to 2.23.0 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 25cfbe4..73d4c0e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ SPDX-License-Identifier: Apache-2.0 0.16.0 3.7.1 - 2.22.1 + 2.23.0 3.3.2 2.10.1 0.9.1