Ce serveur Gitlab sera éteint le 30 juin 2020, pensez à migrer vos projets vers les serveurs gitlab-research.centralesupelec.fr et gitlab-student.centralesupelec.fr !

Commit 97f8ffc0 authored by Dominique Marcadet's avatar Dominique Marcadet

build explicit links in NSD early enough

parent 7a7647df
......@@ -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() {
......
......@@ -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 ) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment