From c54ae6c64fcaaeecb04e5bcb23ae8c0f966619c4 Mon Sep 17 00:00:00 2001 From: Christian Biasuzzi Date: Mon, 10 Feb 2025 12:45:49 +0100 Subject: [PATCH] fix sonar issues Signed-off-by: Christian Biasuzzi --- .../python/network/NetworkCFunctions.java | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/java/pypowsybl/src/main/java/com/powsybl/python/network/NetworkCFunctions.java b/java/pypowsybl/src/main/java/com/powsybl/python/network/NetworkCFunctions.java index 84bc5d33a..87c2730c9 100644 --- a/java/pypowsybl/src/main/java/com/powsybl/python/network/NetworkCFunctions.java +++ b/java/pypowsybl/src/main/java/com/powsybl/python/network/NetworkCFunctions.java @@ -40,7 +40,6 @@ import com.powsybl.nad.model.Graph; import com.powsybl.nad.model.Point; import com.powsybl.nad.svg.EdgeInfo; -import com.powsybl.nad.svg.LabelProvider; import com.powsybl.nad.svg.SvgParameters; import com.powsybl.nad.svg.iidm.DefaultLabelProvider; import com.powsybl.nad.svg.iidm.LabelProviderFactory; @@ -1223,24 +1222,22 @@ private static void applyCustomLabels(DataframePointer customLabels, NadParamete Map branchLabels = getNadCustomBranchLabels(rowCount, idSeries, customLabelsDataframe.getStrings("side1"), customLabelsDataframe.getStrings("side2"), customLabelsDataframe.getStrings("middle")); - LabelProviderFactory labelProviderFactory = new LabelProviderFactory() { + LabelProviderFactory labelProviderFactory = (network, svgParameters) -> new DefaultLabelProvider(network, svgParameters) { @Override - public LabelProvider create(Network network, SvgParameters svgParameters) { - return new DefaultLabelProvider(network, svgParameters) { - @Override - public Optional getEdgeInfo(Graph graph, BranchEdge edge, BranchEdge.Side side) { - CustomBranchLabels bl = branchLabels.get(edge.getEquipmentId()); - String label = (bl != null) ? (side == BranchEdge.Side.ONE ? bl.side1 : bl.side2) : null; - EdgeInfo.Direction arrowDirection = null; - return Optional.of(new EdgeInfo("ActivePower", arrowDirection, null, label)); - } + public Optional getEdgeInfo(Graph graph, BranchEdge edge, BranchEdge.Side side) { + CustomBranchLabels bl = branchLabels.get(edge.getEquipmentId()); + String label = null; + if (bl != null) { + label = side == BranchEdge.Side.ONE ? bl.side1 : bl.side2; + } + EdgeInfo.Direction arrowDirection = null; + return Optional.of(new EdgeInfo("ActivePower", arrowDirection, null, label)); + } - @Override - public String getLabel(Edge edge) { - CustomBranchLabels bl = branchLabels.get(edge.getEquipmentId()); - return (bl != null) ? bl.middle : null; - } - }; + @Override + public String getLabel(Edge edge) { + CustomBranchLabels bl = branchLabels.get(edge.getEquipmentId()); + return (bl != null) ? bl.middle : null; } };