Merge pull request #234 from com-pas/fix_merge_conflicts

Fixed merge conflicts
com-pas · Oct 5, 2023 · cc73938 · cc73938
2 parents 8b11298 + e440cd6
commit cc73938
Showing 1 changed file with 0 additions and 20 deletions.
diff --git a/.../org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentDiagramLabelProvider.java b/.../org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentDiagramLabelProvider.java
@@ -69,26 +69,6 @@ public Map<String, Side> getBusInfoSides(VoltageLevelGraph voltageLevelGraph) {
         return Collections.emptyMap();
     }
 
-    @Override
-    public String getTooltip(Node node) {
-        return null;
-    }
-
-    @Override
-    public List<ElectricalNodeInfo> getElectricalNodesInfos(VoltageLevelGraph voltageLevelGraph) {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public Optional<BusInfo> getBusInfo(BusNode busNode) {
-        return Optional.empty();
-    }
-
-    @Override
-    public Map<String, Side> getBusInfoSides(VoltageLevelGraph voltageLevelGraph) {
-        return Collections.emptyMap();
-    }
-
     String stripLabel(String id) {
         String label = id;
         if (StringUtils.isNotBlank(label) && label.lastIndexOf("/") >= 0) {