From 1f1b005d26957da5372458c78d19669df8b55ad3 Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Thu, 17 Aug 2023 17:16:13 +0100
Subject: [PATCH] - config file generator: added missing code for GSEControl
 (LIB61850-418)

---
 .../tools/DynamicModelGenerator.java           | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tools/model_generator/src/com/libiec61850/tools/DynamicModelGenerator.java b/tools/model_generator/src/com/libiec61850/tools/DynamicModelGenerator.java
index 4252f032..4a10f56b 100644
--- a/tools/model_generator/src/com/libiec61850/tools/DynamicModelGenerator.java
+++ b/tools/model_generator/src/com/libiec61850/tools/DynamicModelGenerator.java
@@ -178,9 +178,6 @@ public class DynamicModelGenerator {
             if (connectedAP != null) {
                 smv = connectedAP.lookupSMV(ld.getInst(), svcb.getName());
 
-                if (smv == null)
-                    System.out.println("ConnectedAP not found for SMV");
-
                 if (smv == null) {
                     for (ConnectedAP ap : connectedAPs) {
                         smv = ap.lookupSMV(ld.getInst(), svcb.getName());
@@ -190,6 +187,9 @@ public class DynamicModelGenerator {
                     }
                 }
 
+                if (smv == null)
+                    System.out.println("ConnectedAP not found for SMV");
+
                 if (smv != null)
                     smvAddress = smv.getAddress();
             }
@@ -235,6 +235,18 @@ public class DynamicModelGenerator {
             
             if (connectedAP != null) {
                 gse = connectedAP.lookupGSE(ld.getInst(), gcb.getName());
+
+                if (gse == null) {
+                    for (ConnectedAP ap : connectedAPs) {
+                        gse = ap.lookupGSE(ld.getInst(), gcb.getName());
+
+                        if (gse != null)
+                            break;
+                    }
+                }
+
+                if (gse == null)
+                    System.out.println("ConnectedAP not found for GSE");
             	
                 if (gse != null)
                 	gseAddress = gse.getAddress();