suppress spurious error message
This commit is contained in:
parent
55c12301ba
commit
8c0539136c
|
@ -2292,13 +2292,17 @@ public class ProfileUtilities extends TranslatingUtilities {
|
||||||
}
|
}
|
||||||
// Before applying changes, apply them to what's in the profile
|
// Before applying changes, apply them to what's in the profile
|
||||||
StructureDefinition profile = null;
|
StructureDefinition profile = null;
|
||||||
|
boolean msg = true;
|
||||||
if (base.hasSliceName()) {
|
if (base.hasSliceName()) {
|
||||||
profile = base.getType().size() == 1 && base.getTypeFirstRep().hasProfile() ? context.fetchResource(StructureDefinition.class, base.getTypeFirstRep().getProfile().get(0).getValue(), srcSD) : null;
|
profile = base.getType().size() == 1 && base.getTypeFirstRep().hasProfile() ? context.fetchResource(StructureDefinition.class, base.getTypeFirstRep().getProfile().get(0).getValue(), srcSD) : null;
|
||||||
}
|
}
|
||||||
if (profile==null) {
|
if (profile==null) {
|
||||||
profile = source.getType().size() == 1 && source.getTypeFirstRep().hasProfile() ? context.fetchResource(StructureDefinition.class, source.getTypeFirstRep().getProfile().get(0).getValue(), derivedSrc) : null;
|
profile = source.getType().size() == 1 && source.getTypeFirstRep().hasProfile() ? context.fetchResource(StructureDefinition.class, source.getTypeFirstRep().getProfile().get(0).getValue(), derivedSrc) : null;
|
||||||
if (profile != null && !"Extension".equals(profile.getType()) && profile.getKind() != StructureDefinitionKind.RESOURCE && profile.getKind() != StructureDefinitionKind.LOGICAL) {
|
if (profile != null && !"Extension".equals(profile.getType()) && profile.getKind() != StructureDefinitionKind.RESOURCE && profile.getKind() != StructureDefinitionKind.LOGICAL) {
|
||||||
|
// this is a problem - we're kind of hacking things here. The problem is that we sometimes want the details from the profile to override the
|
||||||
|
// inherited attributes, and sometimes not
|
||||||
profile = null;
|
profile = null;
|
||||||
|
msg = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (profile != null) {
|
if (profile != null) {
|
||||||
|
@ -2320,15 +2324,17 @@ public class ProfileUtilities extends TranslatingUtilities {
|
||||||
} else if (source.getType().size() == 1 && source.getTypeFirstRep().hasProfile() && !source.getTypeFirstRep().getProfile().get(0).hasExtension(ToolingExtensions.EXT_PROFILE_ELEMENT)) {
|
} else if (source.getType().size() == 1 && source.getTypeFirstRep().hasProfile() && !source.getTypeFirstRep().getProfile().get(0).hasExtension(ToolingExtensions.EXT_PROFILE_ELEMENT)) {
|
||||||
// todo: should we change down the profile_element if there's one?
|
// todo: should we change down the profile_element if there's one?
|
||||||
String type = source.getTypeFirstRep().getWorkingCode();
|
String type = source.getTypeFirstRep().getWorkingCode();
|
||||||
if ("Extension".equals(type)) {
|
if (msg) {
|
||||||
System.out.println("Can't find Extension definition for "+source.getTypeFirstRep().getProfile().get(0).asStringValue()+" but trying to go on");
|
if ("Extension".equals(type)) {
|
||||||
if (allowUnknownProfile != AllowUnknownProfile.ALL_TYPES) {
|
System.out.println("Can't find Extension definition for "+source.getTypeFirstRep().getProfile().get(0).asStringValue()+" but trying to go on");
|
||||||
throw new DefinitionException("Unable to find Extension definition for "+source.getTypeFirstRep().getProfile().get(0).asStringValue());
|
if (allowUnknownProfile != AllowUnknownProfile.ALL_TYPES) {
|
||||||
}
|
throw new DefinitionException("Unable to find Extension definition for "+source.getTypeFirstRep().getProfile().get(0).asStringValue());
|
||||||
} else {
|
}
|
||||||
System.out.println("Can't find "+type+" profile "+source.getTypeFirstRep().getProfile().get(0).asStringValue()+" but trying to go on");
|
} else {
|
||||||
if (allowUnknownProfile == AllowUnknownProfile.NONE) {
|
System.out.println("Can't find "+type+" profile "+source.getTypeFirstRep().getProfile().get(0).asStringValue()+" but trying to go on");
|
||||||
throw new DefinitionException("Unable to find "+type+" profile "+source.getTypeFirstRep().getProfile().get(0).asStringValue());
|
if (allowUnknownProfile == AllowUnknownProfile.NONE) {
|
||||||
|
throw new DefinitionException("Unable to find "+type+" profile "+source.getTypeFirstRep().getProfile().get(0).asStringValue());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue