From cb3319a83f84af4113ed0e31988c3bdf46f7ace4 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Thu, 8 Aug 2024 07:41:19 +0800 Subject: [PATCH] fix xml:space message --- .../java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java | 2 ++ org.hl7.fhir.utilities/src/main/resources/Messages.properties | 2 +- .../org/hl7/fhir/validation/instance/InstanceValidator.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java index 8e118ff70..b7bbb386b 100644 --- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java +++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/i18n/RenderingI18nContext.java @@ -321,6 +321,8 @@ public class RenderingI18nContext extends I18nBase { public static final String OBLIG_ELE = "OBLIG_ELE"; public static final String GENERAL_OBLIG = "GENERAL_OBLIG"; public static final String GENERAL_BINDING = "GENERAL_BINDING"; + public static final String GENERAL_BINDING_NO_VS = "GENERAL_BINDING_NO_VS"; + public static final String GENERAL_BINDING_NO_DESC = "GENERAL_BINDING_NO_DESC"; public static final String GENERAL_CARDINALITY = "GENERAL_CARDINALITY"; public static final String OP_DEF_INPAR = "OP_DEF_INPAR"; public static final String OP_DEF_OFFIC = "OP_DEF_OFFIC"; diff --git a/org.hl7.fhir.utilities/src/main/resources/Messages.properties b/org.hl7.fhir.utilities/src/main/resources/Messages.properties index 3e6e5941c..07034d13f 100644 --- a/org.hl7.fhir.utilities/src/main/resources/Messages.properties +++ b/org.hl7.fhir.utilities/src/main/resources/Messages.properties @@ -1132,5 +1132,5 @@ TYPE_SPECIFIC_CHECKS_DT_XHTML_ACTIVE_HREF = Hyperlink scheme ''{3}'' in ''{0}'' TYPE_SPECIFIC_CHECKS_DT_XHTML_UNKNOWN_HREF = Hyperlink scheme ''{3}'' in ''{0}'' at ''{1}'' for ''{2}'' is not a widely supported protocol and should be checked TYPE_SPECIFIC_CHECKS_DT_XHTML_LITERAL_HREF = Hyperlink scheme ''{3}'' in ''{0}'' at ''{1}'' for ''{2}'' is not a valid hyperlinkable scheme SM_TARGET_TYPE_UNKNOWN = The type of the target variable is not known: {0} -XHTML_XHTML_ATTRIBUTE_XML_SPACE = The attribute 'xml:space' is legal in XHTML 1.0, and therefore in resources, but was removed in XHTML 1.1, and for this reason it''s use is strongly discouraged +XHTML_XHTML_ATTRIBUTE_XML_SPACE = The attribute 'xml:space' is legal but has a fixed value of 'preserve'. It''s use is discouraged \ No newline at end of file diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java index c2f4e8e80..f22fce060 100644 --- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java +++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/InstanceValidator.java @@ -3300,7 +3300,7 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat boolean bok = an.startsWith("xmlns") || HTML_ATTRIBUTES.contains(an) || HTML_COMBO_LIST.contains(node.getName() + "." + an); if (!bok) { if ("xml:space".equals(an)) { - warning(errors, "2024-08-03", IssueType.INVALID, e.line(), e.col(), path, false, I18nConstants.XHTML_XHTML_ATTRIBUTE_XML_SPACE, an, node.getName()); + hint(errors, "2024-08-03", IssueType.INVALID, e.line(), e.col(), path, false, I18nConstants.XHTML_XHTML_ATTRIBUTE_XML_SPACE, an, node.getName()); } else { ok = rule(errors, NO_RULE_DATE, IssueType.INVALID, e.line(), e.col(), path, false, I18nConstants.XHTML_XHTML_ATTRIBUTE_ILLEGAL, an, node.getName()) && ok; }