take into account new DependsOn

Author: marcadetd

fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/DependsOnImpl.java

@@ -1040,7 +1040,7 @@ public boolean buildExplicitLinks( IRiseClipseConsole console ) {
 
         String messagePrefix = "while resolving link from DependsOn: ";
 
-        NsIdentification identification = NsIdentification.of( getId(), getVersion(), getRevision(), getRelease() );
+        NsIdentification identification = NsIdentification.of( getId(), getVersion(), getRevision() );
         NsdResourceSetImpl rs = getResourceSet();
         NS ns = rs.getNS( identification );
         if( ns == null ) {

fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/util/NsIdentification.java

@@ -21,6 +21,8 @@
 package fr.centralesupelec.edf.riseclipse.iec61850.nsd.util;
 
 import java.util.HashMap;
+
+import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgDependsOn;
 import fr.centralesupelec.edf.riseclipse.iec61850.nsd.AgNSIdentification;
 
 /*
@@ -44,6 +46,9 @@ public class NsIdentification {
     // This map can be shared among all ResourceSets
     private static HashMap< String, HashMap< Integer, HashMap< String, NsIdentification >>> nsIdentifications = new HashMap<>();
 
+    public static NsIdentification of( String id, Integer version, String revision ) {
+        return of( id, version, revision, DEFAULT_RELEASE );
+    }
     public static NsIdentification of( String id, Integer version, String revision, Integer release ) {
         if( ! nsIdentifications.containsKey( id )) {
             nsIdentifications.put( id, new HashMap<>() );
@@ -89,6 +94,10 @@ public static NsIdentification of( AgNSIdentification identification ) {
         return of( identification.getId(), identification.getVersion(), identification.getRevision(), identification.getRelease() );
     }
 
+    public static NsIdentification of( AgDependsOn dependsOn ) {
+        return of( dependsOn.getId(), dependsOn.getVersion(), dependsOn.getRevision() );
+    }
+
     public String getId() {
         return id;
     }