Skip to content

Commit

Permalink
rename
Browse files Browse the repository at this point in the history
  • Loading branch information
ghazwarhili committed Oct 2, 2024
1 parent 61e4a51 commit 30b569a
Showing 1 changed file with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -664,10 +664,10 @@ private void modifyExistingConnectivityPosition(ConnectablePosition<?> connectab
List<ReportNode> reports,
boolean isBranch) {
if (isBranch) {
modifyFeeder(connectablePosition.getFeeder1(), modificationInfos, reports, 1);
modifyFeeder(connectablePosition.getFeeder2(), modificationInfos, reports, 2);
modifyConnectablePosition(connectablePosition.getFeeder1(), modificationInfos, reports, 1);
modifyConnectablePosition(connectablePosition.getFeeder2(), modificationInfos, reports, 2);
} else {
modifyFeeder(connectablePosition.getFeeder(), modificationInfos, reports, 0);
modifyConnectablePosition(connectablePosition.getFeeder(), modificationInfos, reports, 0);
}
}

Expand All @@ -677,20 +677,20 @@ private void createNewConnectivityPosition(ConnectablePositionAdder<?> adder,
List<ReportNode> reports,
boolean isBranch) {
if (isBranch) {
ConnectablePositionAdder.FeederAdder<?> feeder1 = adder.newFeeder1();
ConnectablePositionAdder.FeederAdder<?> feeder2 = adder.newFeeder2();
modifyFeederAdder(feeder1, modificationInfos, network, reports, 1);
modifyFeederAdder(feeder2, modificationInfos, network, reports, 2);
ConnectablePositionAdder.FeederAdder<?> feederAdder1 = adder.newFeeder1();
ConnectablePositionAdder.FeederAdder<?> feederAdder2 = adder.newFeeder2();
addConnectablePosition(feederAdder1, modificationInfos, network, reports, 1);
addConnectablePosition(feederAdder2, modificationInfos, network, reports, 2);
} else {
ConnectablePositionAdder.FeederAdder<?> feeder = adder.newFeeder();
modifyFeederAdder(feeder, modificationInfos, network, reports, 0);
ConnectablePositionAdder.FeederAdder<?> feederAdder = adder.newFeeder();
addConnectablePosition(feederAdder, modificationInfos, network, reports, 0);
}
}

private void modifyFeeder(ConnectablePosition.Feeder feeder,
BasicEquipmentModificationInfos modificationInfos,
List<ReportNode> reports,
int feederNumber) {
private void modifyConnectablePosition(ConnectablePosition.Feeder feeder,
BasicEquipmentModificationInfos modificationInfos,
List<ReportNode> reports,
int feederNumber) {
applyModifications(feeder, modificationInfos, reports, feederNumber);
}

Expand Down Expand Up @@ -721,11 +721,11 @@ private void applyModifications(ConnectablePosition.Feeder feeder,
}
}

private void modifyFeederAdder(ConnectablePositionAdder.FeederAdder<?> feeder,
BasicEquipmentModificationInfos modificationInfos,
Network network,
List<ReportNode> reports,
int feederNumber) {
private void addConnectablePosition(ConnectablePositionAdder.FeederAdder<?> feeder,
BasicEquipmentModificationInfos modificationInfos,
Network network,
List<ReportNode> reports,
int feederNumber) {
AttributeModification<String> connectionName = getConnectionName(modificationInfos, feederNumber);
AttributeModification<ConnectablePosition.Direction> connectionDirection = getConnectionDirection(modificationInfos, feederNumber);
AttributeModification<Integer> connectionPosition = getConnectionPosition(modificationInfos, feederNumber);
Expand Down

0 comments on commit 30b569a

Please sign in to comment.