diff --git a/pom.xml b/pom.xml index e9e3e51b4..f5dbed46f 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ com.powsybl powsybl-parent - 4 + 9 powsybl-single-line-diagram diff --git a/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-conversion/src/test/java/com/powsybl/sld/cgmes/dl/conversion/CgmesDLImportPostProcessorTest.java b/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-conversion/src/test/java/com/powsybl/sld/cgmes/dl/conversion/CgmesDLImportPostProcessorTest.java index 739c9bac3..c7a1a6e75 100644 --- a/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-conversion/src/test/java/com/powsybl/sld/cgmes/dl/conversion/CgmesDLImportPostProcessorTest.java +++ b/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-conversion/src/test/java/com/powsybl/sld/cgmes/dl/conversion/CgmesDLImportPostProcessorTest.java @@ -22,7 +22,7 @@ * * @author Massimo Ferraro */ -public class CgmesDLImportPostProcessorTest extends CgmesDLModelTest { +public class CgmesDLImportPostProcessorTest extends CgmesDLModelTest { @Test public void process() throws Exception { diff --git a/single-line-diagram-cgmes/single-line-diagram-cgmes-layout/src/main/java/com/powsybl/sld/cgmes/layout/AbstractCgmesLayout.java b/single-line-diagram-cgmes/single-line-diagram-cgmes-layout/src/main/java/com/powsybl/sld/cgmes/layout/AbstractCgmesLayout.java index a5ff902df..993342e33 100644 --- a/single-line-diagram-cgmes/single-line-diagram-cgmes-layout/src/main/java/com/powsybl/sld/cgmes/layout/AbstractCgmesLayout.java +++ b/single-line-diagram-cgmes/single-line-diagram-cgmes-layout/src/main/java/com/powsybl/sld/cgmes/layout/AbstractCgmesLayout.java @@ -94,7 +94,7 @@ protected void setNodeCoordinates(VoltageLevel vl, Node node, String diagramName setBusNodeCoordinates(busNode, busbarDiagramData, diagramName); } else { Bus bus = vl.getBusBreakerView().getBus(busNode.getId()); - NodeDiagramData busDiagramData = bus != null ? bus.getExtension(NodeDiagramData.class) : null; + NodeDiagramData busDiagramData = bus != null ? bus.getExtension(NodeDiagramData.class) : null; setBusNodeCoordinates(busNode, busDiagramData, diagramName); } break; @@ -103,7 +103,7 @@ protected void setNodeCoordinates(VoltageLevel vl, Node node, String diagramName Switch sw = TopologyKind.NODE_BREAKER.equals(vl.getTopologyKind()) ? vl.getNodeBreakerView().getSwitch(switchNode.getId()) : vl.getBusBreakerView().getSwitch(switchNode.getId()); - CouplingDeviceDiagramData switchDiagramData = sw != null ? sw.getExtension(CouplingDeviceDiagramData.class) : null; + CouplingDeviceDiagramData switchDiagramData = sw != null ? sw.getExtension(CouplingDeviceDiagramData.class) : null; setCouplingDeviceNodeCoordinates(switchNode, switchDiagramData, true, diagramName); break; case FEEDER: diff --git a/single-line-diagram-cgmes/single-line-diagram-cgmes-layout/src/test/java/com/powsybl/sld/cgmes/layout/CgmesZoneLayoutTest.java b/single-line-diagram-cgmes/single-line-diagram-cgmes-layout/src/test/java/com/powsybl/sld/cgmes/layout/CgmesZoneLayoutTest.java index b83e5e2b3..510dde4e2 100644 --- a/single-line-diagram-cgmes/single-line-diagram-cgmes-layout/src/test/java/com/powsybl/sld/cgmes/layout/CgmesZoneLayoutTest.java +++ b/single-line-diagram-cgmes/single-line-diagram-cgmes-layout/src/test/java/com/powsybl/sld/cgmes/layout/CgmesZoneLayoutTest.java @@ -267,7 +267,7 @@ private void checkAdjacentNodes(Node node, List expectedAdjacentNodes) { private void checkNodeCoordinates(Node node, double x, double y, boolean rotated) { assertEquals(x, node.getX(), 0); assertEquals(y, node.getY(), 0); - if (node instanceof BusNode) { + if (node instanceof BusNode) { assertEquals(rotated ? Orientation.UP : Orientation.RIGHT, node.getOrientation()); } else { assertEquals(rotated ? Orientation.RIGHT : Orientation.UP, node.getOrientation()); diff --git a/single-line-diagram-core/src/main/java/com/powsybl/sld/SingleLineDiagramTool.java b/single-line-diagram-core/src/main/java/com/powsybl/sld/SingleLineDiagramTool.java index 8bd15010c..468a8f92c 100644 --- a/single-line-diagram-core/src/main/java/com/powsybl/sld/SingleLineDiagramTool.java +++ b/single-line-diagram-core/src/main/java/com/powsybl/sld/SingleLineDiagramTool.java @@ -151,8 +151,8 @@ private void generateAll(ToolRunningContext context, boolean allVoltageLevels, b @Override public void run(CommandLine line, ToolRunningContext context) { ToolOptions toolOptions = new ToolOptions(line, context); - Path inputFile = toolOptions.getPath(INPUT_FILE).orElseThrow(() -> new PowsyblException(INPUT_FILE + " option is missing")); - Path outputDir = toolOptions.getPath(OUTPUT_DIR).orElseThrow(() -> new PowsyblException(OUTPUT_DIR + " option is missing")); + Path inputFile = toolOptions.getPath(INPUT_FILE).orElseThrow(() -> new PowsyblException(INPUT_FILE + " option is missing")); + Path outputDir = toolOptions.getPath(OUTPUT_DIR).orElseThrow(() -> new PowsyblException(OUTPUT_DIR + " option is missing")); List ids = toolOptions.getValues(IDS).orElse(Collections.emptyList()); context.getOutputStream().println("Loading network '" + inputFile + "'..."); Network network = Importers.loadNetwork(inputFile); diff --git a/single-line-diagram-core/src/main/java/com/powsybl/sld/builders/SubstationRawBuilder.java b/single-line-diagram-core/src/main/java/com/powsybl/sld/builders/SubstationRawBuilder.java index 04fd1a0b2..6d70a0477 100644 --- a/single-line-diagram-core/src/main/java/com/powsybl/sld/builders/SubstationRawBuilder.java +++ b/single-line-diagram-core/src/main/java/com/powsybl/sld/builders/SubstationRawBuilder.java @@ -72,7 +72,7 @@ public Map createFeeder3WT(String id, Voltag f3WTNodes.put(vl3, feeder3WTNode3); // creation of the middle node and the edges linking the transformer leg nodes to this middle node - NodeFactory.createMiddle3WTNode(substationGraph, id, id, feeder3WTNode1, feeder3WTNode2, feeder3WTNode3); + NodeFactory.createMiddle3WTNode(substationGraph, id, id, feeder3WTNode1, feeder3WTNode2, feeder3WTNode3); return f3WTNodes; } diff --git a/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/HorizontalSubstationLayout.java b/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/HorizontalSubstationLayout.java index c69f0a8ae..1dd5eef6b 100644 --- a/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/HorizontalSubstationLayout.java +++ b/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/HorizontalSubstationLayout.java @@ -90,7 +90,7 @@ private void adaptPaddingToSnakeLines(LayoutParameters layoutParameters) { } double substationWidth = x - diagramPadding.getLeft(); - double heightSnakeLinesBottom = getHeightSnakeLines(layoutParameters, BOTTOM, infosNbSnakeLines); + double heightSnakeLinesBottom = getHeightSnakeLines(layoutParameters, BOTTOM, infosNbSnakeLines); double substationHeight = getGraph().getHeight() + heightSnakeLinesTop + heightSnakeLinesBottom; getGraph().setSize(substationWidth, substationHeight); diff --git a/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/PositionVoltageLevelLayout.java b/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/PositionVoltageLevelLayout.java index 3c92abce2..c955b4603 100644 --- a/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/PositionVoltageLevelLayout.java +++ b/single-line-diagram-core/src/main/java/com/powsybl/sld/layout/PositionVoltageLevelLayout.java @@ -95,7 +95,7 @@ private void adaptPaddingToSnakeLines(LayoutParameters layoutParam) { VoltageLevelGraph graph = getGraph(); double widthSnakeLinesLeft = getWidthVerticalSnakeLines(graph.getId(), layoutParam, infosNbSnakeLines); double heightSnakeLinesTop = getHeightSnakeLines(layoutParam, Direction.TOP, infosNbSnakeLines); - double heightSnakeLinesBottom = getHeightSnakeLines(layoutParam, Direction.BOTTOM, infosNbSnakeLines); + double heightSnakeLinesBottom = getHeightSnakeLines(layoutParam, Direction.BOTTOM, infosNbSnakeLines); double width = graph.getWidth() + widthSnakeLinesLeft; double height = graph.getHeight() + heightSnakeLinesTop + heightSnakeLinesBottom; graph.setSize(width, height); diff --git a/single-line-diagram-core/src/main/java/com/powsybl/sld/model/graphs/NodeFactory.java b/single-line-diagram-core/src/main/java/com/powsybl/sld/model/graphs/NodeFactory.java index c12c77e47..e251a4dad 100644 --- a/single-line-diagram-core/src/main/java/com/powsybl/sld/model/graphs/NodeFactory.java +++ b/single-line-diagram-core/src/main/java/com/powsybl/sld/model/graphs/NodeFactory.java @@ -207,7 +207,7 @@ public static Middle3WTNode createMiddle3WTNode(BaseGraph baseGraph, String id, || legNode3.getFeeder().getFeederType() != FeederType.THREE_WINDINGS_TRANSFORMER_LEG) { throw new PowsyblException("Middle3WTNode must be created with FeederNode with ComponentTypeName THREE_WINDINGS_TRANSFORMER_LEG"); } - Middle3WTNode m3wn = new Middle3WTNode(id, name, + Middle3WTNode m3wn = new Middle3WTNode(id, name, ((FeederTwLeg) legNode1.getFeeder()).getVoltageLevelInfos(), ((FeederTwLeg) legNode2.getFeeder()).getVoltageLevelInfos(), ((FeederTwLeg) legNode3.getFeeder()).getVoltageLevelInfos(), diff --git a/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultSVGWriter.java b/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultSVGWriter.java index 8fcbfc692..d3c4ac190 100644 --- a/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultSVGWriter.java +++ b/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DefaultSVGWriter.java @@ -273,7 +273,7 @@ private void drawCell(String prefixId, Element root, VoltageLevelGraph graph, Ce g.setAttribute("id", cellId); g.setAttribute(CLASS, String.join(" ", styleProvider.getCellStyles(cell))); - List nodesToDraw = cell.getNodes().stream().filter(n -> !(n instanceof BusNode)).collect(Collectors.toList()); + List nodesToDraw = cell.getNodes().stream().filter(n -> !(n instanceof BusNode)).collect(Collectors.toList()); Collection edgesToDraw = new LinkedHashSet<>(); nodesToDraw.forEach(n -> edgesToDraw.addAll(n.getAdjacentEdges())); @@ -782,7 +782,7 @@ private String getTransformString(double centerPosX, double centerPosY, double a if (angle == 0) { double translateX = centerPosX - componentSize.getWidth() / 2; double translateY = centerPosY - componentSize.getHeight() / 2; - return TRANSLATE + "(" + translateX + "," + translateY + ")"; + return TRANSLATE + "(" + translateX + "," + translateY + ")"; } else { double[] matrix = getTransformMatrix(componentSize.getWidth(), componentSize.getHeight(), angle, centerPosX, centerPosY); diff --git a/single-line-diagram-core/src/main/java/com/powsybl/sld/util/AbstractBaseVoltageDiagramStyleProvider.java b/single-line-diagram-core/src/main/java/com/powsybl/sld/util/AbstractBaseVoltageDiagramStyleProvider.java index 0c7991727..2a797ace9 100644 --- a/single-line-diagram-core/src/main/java/com/powsybl/sld/util/AbstractBaseVoltageDiagramStyleProvider.java +++ b/single-line-diagram-core/src/main/java/com/powsybl/sld/util/AbstractBaseVoltageDiagramStyleProvider.java @@ -200,7 +200,7 @@ private Node getFeederNode(Middle3WTNode node, String subComponentName) { } private Node getFeederNode(Middle2WTNode node, String subComponentName) { - return node.getAdjacentNodes().get(subComponentName.equals(WINDING1) ? 0 : 1); + return node.getAdjacentNodes().get(subComponentName.equals(WINDING1) ? 0 : 1); } private VoltageLevelInfos getWindingVoltageLevelInfos(FeederWithSides feederWs, String subComponentName) { diff --git a/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCase11SubstationGraph.java b/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCase11SubstationGraph.java index 9830cebca..0c2b9ab71 100644 --- a/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCase11SubstationGraph.java +++ b/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCase11SubstationGraph.java @@ -296,7 +296,7 @@ public void testRight3wtOrientation() { public void testLeft3wtOrientation() { // build substation graph network.getThreeWindingsTransformer("trf7").remove(); - createThreeWindingsTransformer(substation, "trf7", "trf7", "vl2", "vl1", "vl3", + createThreeWindingsTransformer(substation, "trf7", "trf7", "vl2", "vl1", "vl3", 0.5, 0.5, 0.5, 1., 1., 1., 0.1, 0.1, 225., 400., 50., 19, 31, 8, diff --git a/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCase15GraphWithVoltageIndicator.java b/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCase15GraphWithVoltageIndicator.java index 04717cd07..06f29e3d0 100644 --- a/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCase15GraphWithVoltageIndicator.java +++ b/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCase15GraphWithVoltageIndicator.java @@ -106,7 +106,7 @@ protected ResourcesComponentLibrary getResourcesComponentLibrary() { @Test public void testWithoutBusInfo() { - runTest(new BasicStyleProvider(), "/TestCase15GraphWithoutVoltageIndicator.svg", new DefaultDiagramLabelProvider(network, componentLibrary, layoutParameters)); + runTest(new BasicStyleProvider(), "/TestCase15GraphWithoutVoltageIndicator.svg", new DefaultDiagramLabelProvider(network, componentLibrary, layoutParameters)); } @Test @@ -117,7 +117,7 @@ public Optional getBusInfoStyle(BusInfo info) { return Optional.of(((BusVoltageInfo) info).isPowered() ? "sld-powered" : "sld-unpowered"); } }; - runTest(styleProvider, "/TestCase15GraphWithVoltageIndicator.svg", withIncompleteBusInfoProvider); + runTest(styleProvider, "/TestCase15GraphWithVoltageIndicator.svg", withIncompleteBusInfoProvider); } @Test diff --git a/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCaseConsecutiveShunts.java b/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCaseConsecutiveShunts.java index 3fa971043..ae4623f9f 100644 --- a/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCaseConsecutiveShunts.java +++ b/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestCaseConsecutiveShunts.java @@ -40,7 +40,7 @@ public void setUp() { @Override protected DiagramLabelProvider getDefaultDiagramLabelProvider() { - return new DefaultDiagramLabelProvider(network, componentLibrary, layoutParameters) { + return new DefaultDiagramLabelProvider(network, componentLibrary, layoutParameters) { @Override public List getNodeLabels(Node node, Direction direction) { return node.isFictitious() diff --git a/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSVGWriter.java b/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSVGWriter.java index 0eaf35e4d..2f80977eb 100644 --- a/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSVGWriter.java +++ b/single-line-diagram-core/src/test/java/com/powsybl/sld/iidm/TestSVGWriter.java @@ -137,7 +137,7 @@ protected static VoltageLevelGraph createVoltageLevelGraph1() { vl1Trf2One.setDirection(TOP); vl1Trf2One.setX(360); vl1Trf2One.setY(80); - FeederNode vl1Trf2Two = NodeFactory.createFeeder3WTLegNodeForVoltageLevelDiagram(g1, "vl1_trf2_two", "vl1_trf2", "vl1_trf2", TWO, new VoltageLevelInfos("vl3", "vl3", 63)); + FeederNode vl1Trf2Two = NodeFactory.createFeeder3WTLegNodeForVoltageLevelDiagram(g1, "vl1_trf2_two", "vl1_trf2", "vl1_trf2", TWO, new VoltageLevelInfos("vl3", "vl3", 63)); vl1Trf2Two.setOrder(3); vl1Trf2Two.setDirection(TOP); vl1Trf2Two.setX(440); diff --git a/single-line-diagram-core/src/test/java/com/powsybl/sld/svg/GraphMetadataTest.java b/single-line-diagram-core/src/test/java/com/powsybl/sld/svg/GraphMetadataTest.java index 92ef34a6e..85af6afbc 100644 --- a/single-line-diagram-core/src/test/java/com/powsybl/sld/svg/GraphMetadataTest.java +++ b/single-line-diagram-core/src/test/java/com/powsybl/sld/svg/GraphMetadataTest.java @@ -63,7 +63,7 @@ public void test() throws IOException { List labels = Collections.singletonList(new GraphMetadata.NodeLabelMetadata("id", "position_name", "user_id")); - metadata.addNodeMetadata(new GraphMetadata.NodeMetadata("id1", "vid1", null, BREAKER, false, Direction.UNDEFINED, false, null, labels)); + metadata.addNodeMetadata(new GraphMetadata.NodeMetadata("id1", "vid1", null, BREAKER, false, Direction.UNDEFINED, false, null, labels)); metadata.addNodeMetadata(new GraphMetadata.NodeMetadata("id2", "vid2", null, BUSBAR_SECTION, false, Direction.UNDEFINED, false, null, labels)); metadata.addWireMetadata(new GraphMetadata.WireMetadata("id3", "id1", "id2", false, false)); metadata.addFeederInfoMetadata(new GraphMetadata.FeederInfoMetadata("id1", "id3", "ONE", "user_id")); @@ -170,7 +170,7 @@ public void testGraphMetadataWithLine() throws IOException { checkMetadata(metadata3); } - private void checkMetadata(GraphMetadata metadata) { + private void checkMetadata(GraphMetadata metadata) { assertEquals(4, metadata.getNodeMetadata().size()); assertNotNull(metadata.getNodeMetadata("bid1")); assertEquals("bid1", metadata.getNodeMetadata("bid1").getId()); diff --git a/single-line-diagram-core/src/test/java/com/powsybl/sld/util/NominalVoltageStyleTest.java b/single-line-diagram-core/src/test/java/com/powsybl/sld/util/NominalVoltageStyleTest.java index 0462d2bc6..5fd72d1af 100644 --- a/single-line-diagram-core/src/test/java/com/powsybl/sld/util/NominalVoltageStyleTest.java +++ b/single-line-diagram-core/src/test/java/com/powsybl/sld/util/NominalVoltageStyleTest.java @@ -114,13 +114,13 @@ public void testAttributes() { assertTrue(nodeStyle1.contains("sld-vl300to500")); Node node2 = graph2.getNode("bbs2"); - List nodeStyle2 = styleProvider.getSvgNodeStyles(graph2, node2, componentLibrary, false); + List nodeStyle2 = styleProvider.getSvgNodeStyles(graph2, node2, componentLibrary, false); assertEquals(2, nodeStyle2.size()); assertTrue(nodeStyle2.contains("sld-busbar-section")); assertTrue(nodeStyle2.contains("sld-vl180to300")); Node node3 = graph3.getNode("bbs3"); - List nodeStyle3 = styleProvider.getSvgNodeStyles(graph3, node3, componentLibrary, false); + List nodeStyle3 = styleProvider.getSvgNodeStyles(graph3, node3, componentLibrary, false); assertEquals(2, nodeStyle3.size()); assertTrue(nodeStyle3.contains("sld-busbar-section")); assertTrue(nodeStyle3.contains("sld-vl50to70")); @@ -132,13 +132,13 @@ public void testAttributes() { assertTrue(wireStyles.contains("sld-vl300to500")); Node fict3WTNode = graph1.getNode("3WT"); - List node3WTStyle = styleProvider.getSvgNodeStyles(graph1, fict3WTNode, componentLibrary, false); + List node3WTStyle = styleProvider.getSvgNodeStyles(graph1, fict3WTNode, componentLibrary, false); assertEquals(2, node3WTStyle.size()); assertTrue(node3WTStyle.contains("sld-three-wt")); assertTrue(node3WTStyle.contains("sld-fictitious")); Node f2WTNode = graph1.getNode("2WT_ONE"); - List node2WTStyle = styleProvider.getSvgNodeStyles(graph1, f2WTNode, componentLibrary, false); + List node2WTStyle = styleProvider.getSvgNodeStyles(graph1, f2WTNode, componentLibrary, false); assertEquals(1, node2WTStyle.size()); assertTrue(node2WTStyle.contains("sld-two-wt"));