Skip to content
Snippets Groups Projects
Commit 31df1645 authored by Dominique Marcadet's avatar Dominique Marcadet
Browse files

check for presence of depending NS in findXXX()

parent 69d3bab5
No related branches found
No related tags found
1 merge request!6Resolve "add needed services in NsdResourceSet"
Hide whitespace changes
Inline Side-by-side
fr.centralesupelec.edf.riseclipse.iec61850.nsd/src/fr/centralesupelec/edf/riseclipse/iec61850/nsd/impl/NSImpl.java
+ 15
− 5
View file @ 31df1645
...@@ -1675,7 +1675,9 @@ public class NSImpl extends CopyrightedImpl implements NS { ...@@ -1675,7 +1675,9 @@ public class NSImpl extends CopyrightedImpl implements NS {
if( found != null ) return found; if( found != null ) return found;
} }
if( isSetDependsOn() ) { // Look for in NS referred by DependsOn
// Warning: NS referred by DependsOn may not be loaded
if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() )) {
getDependsOn().buildExplicitLinks( console ); getDependsOn().buildExplicitLinks( console );
return getDependsOn().getRefersToNS().findCDC( cDCName, console ); return getDependsOn().getRefersToNS().findCDC( cDCName, console );
} }
...@@ -1696,7 +1698,9 @@ public class NSImpl extends CopyrightedImpl implements NS { ...@@ -1696,7 +1698,9 @@ public class NSImpl extends CopyrightedImpl implements NS {
if( found != null ) return found; if( found != null ) return found;
} }
if( isSetDependsOn() ) { // Look for in NS referred by DependsOn
// Warning: NS referred by DependsOn may not be loaded
if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() )) {
getDependsOn().buildExplicitLinks( console ); getDependsOn().buildExplicitLinks( console );
return getDependsOn().getRefersToNS().findPresenceCondition( presenceConditionName, console ); return getDependsOn().getRefersToNS().findPresenceCondition( presenceConditionName, console );
} }
...@@ -1719,7 +1723,9 @@ public class NSImpl extends CopyrightedImpl implements NS { ...@@ -1719,7 +1723,9 @@ public class NSImpl extends CopyrightedImpl implements NS {
if( found != null ) return found; if( found != null ) return found;
} }
if( isSetDependsOn() ) { // Look for in NS referred by DependsOn
// Warning: NS referred by DependsOn may not be loaded
if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() )) {
getDependsOn().buildExplicitLinks( console ); getDependsOn().buildExplicitLinks( console );
return getDependsOn().getRefersToNS().findFunctionalConstraint( functionalConstraintAbbreviation, console ); return getDependsOn().getRefersToNS().findFunctionalConstraint( functionalConstraintAbbreviation, console );
} }
...@@ -1740,7 +1746,9 @@ public class NSImpl extends CopyrightedImpl implements NS { ...@@ -1740,7 +1746,9 @@ public class NSImpl extends CopyrightedImpl implements NS {
if( found != null ) return found; if( found != null ) return found;
} }
if( isSetDependsOn() ) { // Look for in NS referred by DependsOn
// Warning: NS referred by DependsOn may not be loaded
if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() )) {
getDependsOn().buildExplicitLinks( console ); getDependsOn().buildExplicitLinks( console );
return getDependsOn().getRefersToNS().findEnumeration( enumerationName, console ); return getDependsOn().getRefersToNS().findEnumeration( enumerationName, console );
} }
...@@ -1761,7 +1769,9 @@ public class NSImpl extends CopyrightedImpl implements NS { ...@@ -1761,7 +1769,9 @@ public class NSImpl extends CopyrightedImpl implements NS {
if( found != null ) return found; if( found != null ) return found;
} }
if( isSetDependsOn() ) { // Look for in NS referred by DependsOn
// Warning: NS referred by DependsOn may not be loaded
if( isSetDependsOn() && ( getDependsOn().isSetRefersToNS() )) {
getDependsOn().buildExplicitLinks( console ); getDependsOn().buildExplicitLinks( console );
return getDependsOn().getRefersToNS().findBasicType( basicTypeName, console ); return getDependsOn().getRefersToNS().findBasicType( basicTypeName, console );
} }
......
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