build explicit links in NSD early enough

fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/NsdValidator.java

@@ -52,10 +52,19 @@ public class NsdValidator {
         console.info( "Loading nsd: " + nsdFile );
         nsdLoader.load( nsdFile );
     }
-
-    public void validate( Resource resource, final AdapterFactory adapter, IRiseClipseConsole console ) {
+    
+    public void prepare( @NonNull ComposedEValidator validator, IRiseClipseConsole console ) {
         nsdLoader.getResourceSet().finalizeLoad( console );
 
+        for( EValidator v : validator.getChildren() ) {
+            if( v.getClass() == NsdEObjectValidator.class ) {
+                NsdEObjectValidator nsdValidator = ( NsdEObjectValidator ) v;
+                nsdValidator.initializeValidationData();
+            }
+        }
+    }
+
+    public void validate( Resource resource, final AdapterFactory adapter, IRiseClipseConsole console ) {
         Map< Object, Object > context = new HashMap< Object, Object >();
         SubstitutionLabelProvider substitutionLabelProvider = new EValidator.SubstitutionLabelProvider() {
 

fr.centralesupelec.edf.riseclipse.iec61850.scl.tools/src/fr/centralesupelec/edf/riseclipse/iec61850/scl/validator/RiseClipseValidatorSCL.java

@@ -147,17 +147,12 @@ public class RiseClipseValidatorSCL {
             for( int i = 0; i < nsdFiles.size(); ++i ) {
                 nsdValidator.addNsdDocument( nsdFiles.get( i ), console );
             }
+            nsdValidator.prepare( validator, console );
         }
 
         sclLoader = new SCLModelLoader( console );
         sclAdapter = new SclItemProviderAdapterFactory();
 
-        for( EValidator v : validator.getChildren() ) {
-            if( v.getClass() == NsdEObjectValidator.class ) {
-                NsdEObjectValidator nsdValidator = ( NsdEObjectValidator ) v;
-                nsdValidator.initializeValidationData();
-            }
-        }
     }
 
     public static void run( IRiseClipseConsole console, boolean make_explicit_links, String sclFile ) {