Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
Signed-off-by: Etienne LESOT <[email protected]>
  • Loading branch information
EtienneLt committed Oct 24, 2024
1 parent 1df5299 commit e0db848
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
public abstract class AbstractIdentifiableToInjectionAttributesAdapter<T extends IdentifiableAttributes> implements InjectionAttributes {
protected final T attributes;
protected Map<String, ResourceType> regulatingEquipments = new HashMap<>();

protected AbstractIdentifiableToInjectionAttributesAdapter(T attributes) {
this.attributes = attributes;
Expand Down Expand Up @@ -92,14 +91,4 @@ public Map<String, ExtensionAttributes> getExtensionAttributes() {
public void setExtensionAttributes(Map<String, ExtensionAttributes> extensionAttributes) {
attributes.setExtensionAttributes(extensionAttributes);
}

@Override
public Map<String, ResourceType> getRegulatingEquipments() {
return regulatingEquipments;
}

@Override
public void setRegulatingEquipments(Map<String, ResourceType> regulatingEquipments) {
this.regulatingEquipments = regulatingEquipments;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
import com.powsybl.iidm.network.Branch;
import com.powsybl.network.store.model.BranchAttributes;
import com.powsybl.network.store.model.ConnectablePositionAttributes;
import com.powsybl.network.store.model.ResourceType;

import java.util.Map;
import java.util.Objects;

/**
Expand Down Expand Up @@ -132,4 +134,14 @@ public void setPosition(ConnectablePositionAttributes position) {
attributes.setPosition2(position);
}
}

@Override
public Map<String, ResourceType> getRegulatingEquipments() {
return attributes.getRegulatingEquipments();
}

@Override
public void setRegulatingEquipments(Map<String, ResourceType> regulatingEquipments) {
attributes.setRegulatingEquipments(regulatingEquipments);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

import com.powsybl.network.store.model.BusbarSectionAttributes;
import com.powsybl.network.store.model.ConnectablePositionAttributes;
import com.powsybl.network.store.model.ResourceType;

import java.util.Map;

/**
* @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
Expand Down Expand Up @@ -87,4 +90,14 @@ public ConnectablePositionAttributes getPosition() {
public void setPosition(ConnectablePositionAttributes position) {
throw new AssertionError();
}

@Override
public Map<String, ResourceType> getRegulatingEquipments() {
return attributes.getRegulatingEquipments();
}

@Override
public void setRegulatingEquipments(Map<String, ResourceType> regulatingEquipments) {
attributes.setRegulatingEquipments(regulatingEquipments);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@
import com.powsybl.iidm.network.ThreeSides;
import com.powsybl.network.store.model.ConnectablePositionAttributes;
import com.powsybl.network.store.model.LegAttributes;
import com.powsybl.network.store.model.ResourceType;
import com.powsybl.network.store.model.ThreeWindingsTransformerAttributes;

import java.util.Map;

/**
* @author Geoffroy Jamgotchian <geoffroy.jamgotchian at rte-france.com>
*/
Expand Down Expand Up @@ -131,4 +134,14 @@ public void setPosition(ConnectablePositionAttributes position) {
default -> throw createUnknownSideException();
}
}

@Override
public Map<String, ResourceType> getRegulatingEquipments() {
return attributes.getRegulatingEquipments();
}

@Override
public void setRegulatingEquipments(Map<String, ResourceType> regulatingEquipments) {
attributes.setRegulatingEquipments(regulatingEquipments);
}
}

0 comments on commit e0db848

Please sign in to comment.