From e440cd675955b6dc6646fef3a2663c6b18159eae Mon Sep 17 00:00:00 2001 From: Pascal Wilbrink Date: Thu, 5 Oct 2023 12:11:38 +0200 Subject: [PATCH] Fixed merge conflicts Signed-off-by: Pascal Wilbrink --- .../SclAutoAlignmentDiagramLabelProvider.java | 20 ------------------- 1 file changed, 20 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 0fc4d77..3d7cc42 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 @@ -69,26 +69,6 @@ public Map getBusInfoSides(VoltageLevelGraph voltageLevelGraph) { return Collections.emptyMap(); } - @Override - public String getTooltip(Node node) { - return null; - } - - @Override - public List getElectricalNodesInfos(VoltageLevelGraph voltageLevelGraph) { - return Collections.emptyList(); - } - - @Override - public Optional getBusInfo(BusNode busNode) { - return Optional.empty(); - } - - @Override - public Map getBusInfoSides(VoltageLevelGraph voltageLevelGraph) { - return Collections.emptyMap(); - } - String stripLabel(String id) { String label = id; if (StringUtils.isNotBlank(label) && label.lastIndexOf("/") >= 0) {