From cbc7c6567e415d721f297c2437d7124940b48cb9 Mon Sep 17 00:00:00 2001
From: lisrte <laurent.issertial@rte-france.com>
Date: Mon, 2 Oct 2023 13:57:28 +0200
Subject: [PATCH] Fix post merge main

Signed-off-by: lisrte <laurent.issertial@rte-france.com>
---
 .../com/powsybl/dynawaltz/models/buses/DefaultBus.java    | 2 +-
 .../dynawaltz/models/frequencysynchronizers/OmegaRef.java | 1 -
 .../src/test/resources/tap_changer_blocking_empty_dyd.xml | 8 ++++----
 dynawaltz/src/test/resources/tap_changer_empty_dyd.xml    | 6 +++---
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultBus.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultBus.java
index a644a2040..d58e68284 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultBus.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/buses/DefaultBus.java
@@ -7,8 +7,8 @@
  */
 package com.powsybl.dynawaltz.models.buses;
 
-import com.powsybl.dynawaltz.models.MacroConnectAttribute;
 import com.powsybl.dynawaltz.models.Side;
+import com.powsybl.dynawaltz.models.macroconnections.MacroConnectAttribute;
 import com.powsybl.dynawaltz.xml.DynaWaltzXmlConstants;
 
 import java.util.List;
diff --git a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java
index ed4184c55..25004fc3e 100644
--- a/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java
+++ b/dynawaltz/src/main/java/com/powsybl/dynawaltz/models/frequencysynchronizers/OmegaRef.java
@@ -15,7 +15,6 @@
 import com.powsybl.dynawaltz.models.buses.DefaultBusOfEquipment;
 import com.powsybl.dynawaltz.parameters.ParametersSet;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 
diff --git a/dynawaltz/src/test/resources/tap_changer_blocking_empty_dyd.xml b/dynawaltz/src/test/resources/tap_changer_blocking_empty_dyd.xml
index 265b326d9..e7d9f0d29 100644
--- a/dynawaltz/src/test/resources/tap_changer_blocking_empty_dyd.xml
+++ b/dynawaltz/src/test/resources/tap_changer_blocking_empty_dyd.xml
@@ -4,14 +4,14 @@
         <dyn:macroStaticRef id="MSR_LoadOneTransformer"/>
     </dyn:blackBoxModel>
     <dyn:macroConnector id="MC_LoadOneTransformer-DefaultBus">
-        <dyn:connect var1="transformer_terminal1" var2="@NAME@_ACPIN"/>
-        <dyn:connect var1="transformer_switchOffSignal1" var2="@NAME@_switchOff"/>
-        <dyn:connect var1="load_switchOffSignal1" var2="@NAME@_switchOff"/>
+        <dyn:connect var1="transformer_terminal1" var2="@STATIC_ID@@NODE@_ACPIN"/>
+        <dyn:connect var1="transformer_switchOffSignal1" var2="@STATIC_ID@@NODE@_switchOff"/>
+        <dyn:connect var1="load_switchOffSignal1" var2="@STATIC_ID@@NODE@_switchOff"/>
     </dyn:macroConnector>
     <dyn:macroStaticReference id="MSR_LoadOneTransformer">
         <dyn:staticRef var="transformer_P1Pu_value" staticVar="p"/>
         <dyn:staticRef var="transformer_Q1Pu_value" staticVar="q"/>
         <dyn:staticRef var="transformer_state" staticVar="state"/>
     </dyn:macroStaticReference>
-    <dyn:macroConnect connector="MC_LoadOneTransformer-DefaultBus" id1="BBM_LOAD" id2="NETWORK" name2="NLOAD"/>
+    <dyn:macroConnect connector="MC_LoadOneTransformer-DefaultBus" id1="BBM_LOAD" id2="NETWORK"/>
 </dyn:dynamicModelsArchitecture>
diff --git a/dynawaltz/src/test/resources/tap_changer_empty_dyd.xml b/dynawaltz/src/test/resources/tap_changer_empty_dyd.xml
index f8a5c52df..b792fb00d 100644
--- a/dynawaltz/src/test/resources/tap_changer_empty_dyd.xml
+++ b/dynawaltz/src/test/resources/tap_changer_empty_dyd.xml
@@ -4,13 +4,13 @@
         <dyn:macroStaticRef id="MSR_LoadAlphaBeta"/>
     </dyn:blackBoxModel>
     <dyn:macroConnector id="MC_LoadAlphaBeta-DefaultBus">
-        <dyn:connect var1="load_terminal" var2="@NAME@_ACPIN"/>
-        <dyn:connect var1="load_switchOffSignal1" var2="@NAME@_switchOff"/>
+        <dyn:connect var1="load_terminal" var2="@STATIC_ID@@NODE@_ACPIN"/>
+        <dyn:connect var1="load_switchOffSignal1" var2="@STATIC_ID@@NODE@_switchOff"/>
     </dyn:macroConnector>
     <dyn:macroStaticReference id="MSR_LoadAlphaBeta">
         <dyn:staticRef var="load_PPu" staticVar="p"/>
         <dyn:staticRef var="load_QPu" staticVar="q"/>
         <dyn:staticRef var="load_state" staticVar="state"/>
     </dyn:macroStaticReference>
-    <dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="BBM_LOAD" id2="NETWORK" name2="NLOAD"/>
+    <dyn:macroConnect connector="MC_LoadAlphaBeta-DefaultBus" id1="BBM_LOAD" id2="NETWORK"/>
 </dyn:dynamicModelsArchitecture>