From 9c1a6e61e6684549f20dfa08fa4db8cf9b32ec00 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Tue, 7 Jan 2020 08:49:38 -0500 Subject: [PATCH] Drop unneeded type attribute --- .../src/main/java/org/hl7/fhir/r5/model/Narrative.java | 2 +- .../src/main/java/org/hl7/fhir/r5/model/XhtmlType.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java index b1fbbf949..12e6530dc 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Narrative.java @@ -209,7 +209,7 @@ public class Narrative extends BaseNarrative implements INarrative { /** * The actual narrative content, a stripped down version of XHTML. */ - @Child(name = "div", type = {XhtmlType.class}, order=1, min=1, max=1, modifier=false, summary=false) + @Child(name = "div", type = {}, order=1, min=1, max=1, modifier=false, summary=false) @Description(shortDefinition="Limited xhtml content", formalDefinition="The actual narrative content, a stripped down version of XHTML." ) protected XhtmlNode div; diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/XhtmlType.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/XhtmlType.java index b57e87dc8..a9a75c1e1 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/XhtmlType.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/XhtmlType.java @@ -24,12 +24,14 @@ package org.hl7.fhir.r5.model; import java.io.IOException; import java.util.List; +import ca.uhn.fhir.model.api.annotation.DatatypeDef; import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.r5.model.StringType; import org.hl7.fhir.utilities.xhtml.NodeType; import org.hl7.fhir.utilities.xhtml.XhtmlComposer; import org.hl7.fhir.utilities.xhtml.XhtmlNode; + public class XhtmlType extends Element { private Narrative place;