Skip to content

Commit

Permalink
Fix code smells on Networks class
Browse files Browse the repository at this point in the history 
Signed-off-by: Thomas ADAM <tadam@silicom.fr>
  • Loading branch information
@tadam50
tadam50 committed May 2, 2023
1 parent 4fdef9d commit da35e19
Showing 1 changed file with 16 additions and 14 deletions.
30 changes: 16 additions & 14 deletions diagram-test/src/main/java/com/powsybl/diagram/test/Networks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ public final class Networks {
private static final String LOAD_C_ID = "loadC";
private static final String LOAD_D_ID = "loadD";

private static final String THREE_WINDING_TRANSFORMER_12_ID = "T3_12";

private Networks() {
}

Expand Down Expand Up @@ -1145,7 +1147,7 @@ private static void createStatusExtensions(Network network) {
network.getTwoWindingsTransformer("T11").newExtension(BranchStatusAdder.class).withStatus(BranchStatus.Status.PLANNED_OUTAGE).add();
network.getTwoWindingsTransformer("T12").newExtension(BranchStatusAdder.class).withStatus(BranchStatus.Status.FORCED_OUTAGE).add();

network.getThreeWindingsTransformer("T3_12").newExtension(BranchStatusAdder.class).withStatus(BranchStatus.Status.FORCED_OUTAGE).add();
network.getThreeWindingsTransformer(THREE_WINDING_TRANSFORMER_12_ID).newExtension(BranchStatusAdder.class).withStatus(BranchStatus.Status.FORCED_OUTAGE).add();
}

public static Network createNodeBreakerNetworkWithInternalBranches(String id, String sourceFormat) {
Expand Down Expand Up @@ -1245,13 +1247,13 @@ public static Network createNodeBreakerNetworkWithInternalBranches(String id, St
createSwitch(vl2, "D37", "D37", SwitchKind.DISCONNECTOR, false, false, false, 30, 37);
createSwitch(vl2, "BR38", "BR38", SwitchKind.BREAKER, false, false, false, 37, 38);

createThreeWindingsTransformer(substation, "T3_12", "T3_12", vl1.getId(), vl1.getId(), vl2.getId(),
createThreeWindingsTransformer(substation, THREE_WINDING_TRANSFORMER_12_ID, THREE_WINDING_TRANSFORMER_12_ID, vl1.getId(), vl1.getId(), vl2.getId(),
45, 47, 49, 35, 32, 39., 25, 15,
5, 7, 9,
190, 290, 38,
"T3_12", null, ConnectablePosition.Direction.TOP,
"T3_12", null, ConnectablePosition.Direction.TOP,
"T3_12", null, ConnectablePosition.Direction.TOP);
THREE_WINDING_TRANSFORMER_12_ID, null, ConnectablePosition.Direction.TOP,
THREE_WINDING_TRANSFORMER_12_ID, null, ConnectablePosition.Direction.TOP,
THREE_WINDING_TRANSFORMER_12_ID, null, ConnectablePosition.Direction.TOP);

return network;
}
Expand Down Expand Up @@ -1405,7 +1407,7 @@ public static Network createBusBreakerNetworkWithInternalBranches(String id, Str
.add();

substation.newThreeWindingsTransformer()
.setId("T3_12")
.setId(THREE_WINDING_TRANSFORMER_12_ID)
.setRatedU0(234)
.newLeg1()
.setVoltageLevel("VL1")
Expand Down Expand Up @@ -1893,7 +1895,7 @@ public static void createLine(Network network,
}

private static void addFeederPosition(Extendable<?> extendable, String feederName, Integer feederOrder, ConnectablePosition.Direction direction) {
ConnectablePositionAdder.FeederAdder feederAdder = extendable.newExtension(ConnectablePositionAdder.class).newFeeder();
ConnectablePositionAdder.FeederAdder<?> feederAdder = extendable.newExtension(ConnectablePositionAdder.class).newFeeder();
if (feederOrder != null) {
feederAdder.withOrder(feederOrder);
}
Expand All @@ -1904,13 +1906,13 @@ private static void addFeederPosition(Extendable<?> extendable, String feederNam
private static void addTwoFeedersPosition(Extendable<?> extendable,
String feederName1, Integer feederOrder1, ConnectablePosition.Direction direction1,
String feederName2, Integer feederOrder2, ConnectablePosition.Direction direction2) {
ConnectablePositionAdder extensionAdder = extendable.newExtension(ConnectablePositionAdder.class);
ConnectablePositionAdder.FeederAdder feederAdder1 = extensionAdder.newFeeder1();
ConnectablePositionAdder<?> extensionAdder = extendable.newExtension(ConnectablePositionAdder.class);
ConnectablePositionAdder.FeederAdder<?> feederAdder1 = extensionAdder.newFeeder1();
if (feederOrder1 != null) {
feederAdder1.withOrder(feederOrder1);
}
feederAdder1.withName(feederName1).withDirection(direction1).add();
ConnectablePositionAdder.FeederAdder feederAdder2 = extensionAdder.newFeeder2();
ConnectablePositionAdder.FeederAdder<?> feederAdder2 = extensionAdder.newFeeder2();
if (feederOrder2 != null) {
feederAdder2.withOrder(feederOrder2);
}
Expand All @@ -1922,18 +1924,18 @@ private static void addThreeFeedersPosition(Extendable<?> extendable,
String feederName1, Integer feederOrder1, ConnectablePosition.Direction direction1,
String feederName2, Integer feederOrder2, ConnectablePosition.Direction direction2,
String feederName3, Integer feederOrder3, ConnectablePosition.Direction direction3) {
ConnectablePositionAdder extensionAdder = extendable.newExtension(ConnectablePositionAdder.class);
ConnectablePositionAdder.FeederAdder feederAdder1 = extensionAdder.newFeeder1();
ConnectablePositionAdder<?> extensionAdder = extendable.newExtension(ConnectablePositionAdder.class);
ConnectablePositionAdder.FeederAdder<?> feederAdder1 = extensionAdder.newFeeder1();
if (feederOrder1 != null) {
feederAdder1.withOrder(feederOrder1);
}
feederAdder1.withName(feederName1).withDirection(direction1).add();
ConnectablePositionAdder.FeederAdder feederAdder2 = extensionAdder.newFeeder2();
ConnectablePositionAdder.FeederAdder<?> feederAdder2 = extensionAdder.newFeeder2();
if (feederOrder2 != null) {
feederAdder2.withOrder(feederOrder2);
}
feederAdder2.withName(feederName2).withDirection(direction2).add();
ConnectablePositionAdder.FeederAdder feederAdder3 = extensionAdder.newFeeder3();
ConnectablePositionAdder.FeederAdder<?> feederAdder3 = extensionAdder.newFeeder3();
if (feederOrder3 != null) {
feederAdder3.withOrder(feederOrder3);
}
Expand Down

0 comments on commit da35e19

Please sign in to comment.