Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct error reporting for invalid CComplexObjectProxy nodes. #623

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Correct error reporting for invalid CComplexObjectProxy nodes. #623

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tools/src/main/java/com/nedap/archie/archetypevalidator/validations/FlatFormValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ protected void validate(CComplexObjectProxy cObject) {
addMessageWithPath(ErrorType.VUNT, cObject.path(), I18n.t("Use_node (C_COMPLEX_OBJECT_PROXY) points to type {0}, which does not conform to type {1}", replacementComplexObject.getRmTypeName(), cObject.getRmTypeName()));
}
} else {
String cObjectTypeName = cObject instanceof CComplexObjectProxy ?
String replacementObjectTypeName = replacement instanceof CComplexObjectProxy ?
"use_node (C_COMPLEX_OBJECT)" :
cObject.getClass().getSimpleName();
addMessageWithPath(ErrorType.VUNP, cObject.path(), I18n.t("Use_node (C_COMPLEX_OBJECT_PROXY) must point to a C_COMPLEX_OBJECT, but points to a {0}", cObjectTypeName));
replacement.getClass().getSimpleName();
addMessageWithPath(ErrorType.VUNP, cObject.path(), I18n.t("Use_node (C_COMPLEX_OBJECT_PROXY) must point to a C_COMPLEX_OBJECT, but points to a {0}", replacementObjectTypeName));
}
}
}
Expand Down