- config file generator: added missing code for GSEControl (LIB61850-418)

tools/model_generator/src/com/libiec61850/tools/DynamicModelGenerator.java

@@ -181,9 +181,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());
@@ -193,6 +190,9 @@ public class DynamicModelGenerator {
                     }
                 }
 
+                if (smv == null)
+                    System.out.println("ConnectedAP not found for SMV");
+
                 if (smv != null)
                     smvAddress = smv.getAddress();
             }
@@ -238,6 +238,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();