Remove Java 7 dependency

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/CodingDt.java

@@ -99,8 +99,7 @@ public class CodingDt
 	private BooleanDt myPrimary;
 	
 	@Child(name="valueSet", order=5, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.ValueSet.class,
+		ca.uhn.fhir.model.dstu.resource.ValueSet.class	})
-	})
 	@Description(
 		shortDefinition="Set this coding was chosen from",
 		formalDefinition="The set of possible coded values this coding was chosen from or constrained by"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/composite/IdentifierDt.java

@@ -113,8 +113,7 @@ public class IdentifierDt
 	private PeriodDt myPeriod;
 	
 	@Child(name="assigner", order=5, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Organization that issued id (may be just text)",
 		formalDefinition="Organization that issued/manages the identifier"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AdverseReaction.java

@@ -122,8 +122,7 @@ public class AdverseReaction extends BaseResource implements IResource {
 	private DateTimeDt myDate;
 	
 	@Child(name="subject", order=2, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who had the reaction",
 		formalDefinition="The subject of the adverse reaction"
@@ -138,9 +137,7 @@ public class AdverseReaction extends BaseResource implements IResource {
 	private BooleanDt myDidNotOccurFlag;
 	
 	@Child(name="recorder", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-	})
 	@Description(
 		shortDefinition="Who recorded the reaction",
 		formalDefinition="Identifies the individual responsible for the information in the reaction record."
@@ -706,8 +703,7 @@ public class AdverseReaction extends BaseResource implements IResource {
 	private BoundCodeDt<CausalityExpectationEnum> myCausalityExpectation;
 	
 	@Child(name="substance", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Substance.class,
+		ca.uhn.fhir.model.dstu.resource.Substance.class	})
-	})
 	@Description(
 		shortDefinition="Presumed causative substance",
 		formalDefinition="Substance that is presumed to have caused the adverse reaction"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Alert.java

@@ -91,8 +91,7 @@ public class Alert extends BaseResource implements IResource {
 	private BoundCodeDt<AlertStatusEnum> myStatus;
 	
 	@Child(name="subject", order=3, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who is alert about?",
 		formalDefinition="The person who this alert concerns"
@@ -100,10 +99,7 @@ public class Alert extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="author", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="Alert creator",
 		formalDefinition="The person or device that created the alert"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AllergyIntolerance.java

@@ -158,8 +158,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
 	private BoundCodeDt<SensitivityStatusEnum> myStatus;
 	
 	@Child(name="subject", order=5, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who the sensitivity is for",
 		formalDefinition="The patient who has the allergy or intolerance"
@@ -167,9 +166,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="recorder", order=6, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-	})
 	@Description(
 		shortDefinition="Who recorded the sensitivity",
 		formalDefinition="Indicates who has responsibility for the record"
@@ -177,8 +174,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
 	private ResourceReferenceDt myRecorder;
 	
 	@Child(name="substance", order=7, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Substance.class,
+		ca.uhn.fhir.model.dstu.resource.Substance.class	})
-	})
 	@Description(
 		shortDefinition="The substance that causes the sensitivity",
 		formalDefinition="The substance that causes the sensitivity"
@@ -186,8 +182,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubstance;
 	
 	@Child(name="reaction", order=8, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.AdverseReaction.class,
+		ca.uhn.fhir.model.dstu.resource.AdverseReaction.class	})
-	})
 	@Description(
 		shortDefinition="Reactions associated with the sensitivity",
 		formalDefinition="Reactions associated with the sensitivity"
@@ -195,8 +190,7 @@ public class AllergyIntolerance extends BaseResource implements IResource {
 	private java.util.List<ResourceReferenceDt> myReaction;
 	
 	@Child(name="sensitivityTest", order=9, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Observation.class,
+		ca.uhn.fhir.model.dstu.resource.Observation.class	})
-	})
 	@Description(
 		shortDefinition="Observations that confirm or refute",
 		formalDefinition="Observations that confirm or refute the sensitivity"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Appointment.java

@@ -175,8 +175,7 @@ public class Appointment extends BaseResource implements IResource {
 	private StringDt myTimezone;
 	
 	@Child(name="slot", order=8, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Slot.class,
+		ca.uhn.fhir.model.dstu.resource.Slot.class	})
-	})
 	@Description(
 		shortDefinition="The slot that this appointment is filling. If provided then the schedule will not be provided as slots are not recursive, and the start/end values MUST be the same as from the slot",
 		formalDefinition=""
@@ -184,8 +183,7 @@ public class Appointment extends BaseResource implements IResource {
 	private java.util.List<ResourceReferenceDt> mySlot;
 	
 	@Child(name="location", order=9, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="The primary location that this appointment is to take place",
 		formalDefinition=""
@@ -200,8 +198,7 @@ public class Appointment extends BaseResource implements IResource {
 	private StringDt myComment;
 	
 	@Child(name="order", order=11, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Order.class,
+		ca.uhn.fhir.model.dstu.resource.Order.class	})
-	})
 	@Description(
 		shortDefinition="An Order that lead to the creation of this appointment",
 		formalDefinition=""
@@ -216,10 +213,7 @@ public class Appointment extends BaseResource implements IResource {
 	private java.util.List<Participant> myParticipant;
 	
 	@Child(name="recorder", order=13, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="Who recorded the appointment",
 		formalDefinition=""
@@ -980,11 +974,7 @@ public class Appointment extends BaseResource implements IResource {
 	private java.util.List<BoundCodeableConceptDt<ParticipantTypeEnum>> myType;
 	
 	@Child(name="individual", order=1, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="A Person of device that is participating in the appointment",
 		formalDefinition=""
@@ -1006,8 +996,7 @@ public class Appointment extends BaseResource implements IResource {
 	private CodeDt myStatus;
 	
 	@Child(name="observation", order=4, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Observation.class,
+		ca.uhn.fhir.model.dstu.resource.Observation.class	})
-	})
 	@Description(
 		shortDefinition="Observations that lead to the creation of this appointment. (Is this 80%)",
 		formalDefinition=""

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/AppointmentResponse.java

@@ -102,8 +102,7 @@ public class AppointmentResponse extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="appointment", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Appointment.class,
+		ca.uhn.fhir.model.dstu.resource.Appointment.class	})
-	})
 	@Description(
 		shortDefinition="Parent appointment that this response is replying to",
 		formalDefinition=""
@@ -118,11 +117,7 @@ public class AppointmentResponse extends BaseResource implements IResource {
 	private java.util.List<BoundCodeableConceptDt<ParticipantTypeEnum>> myParticipantType;
 	
 	@Child(name="individual", order=3, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="A Person of device that is participating in the appointment",
 		formalDefinition=""
@@ -172,10 +167,7 @@ public class AppointmentResponse extends BaseResource implements IResource {
 	private StringDt myTimezone;
 	
 	@Child(name="recorder", order=10, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="Who recorded the appointment response",
 		formalDefinition=""

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Availability.java

@@ -105,12 +105,7 @@ public class Availability extends BaseResource implements IResource {
 	private CodeableConceptDt myType;
 	
 	@Child(name="individual", order=2, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class, 		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="The type of resource this availability resource is providing availability information for",
 		formalDefinition=""
@@ -132,10 +127,7 @@ public class Availability extends BaseResource implements IResource {
 	private StringDt myComment;
 	
 	@Child(name="author", order=5, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="Who authored the availability",
 		formalDefinition=""

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/CarePlan.java

@@ -153,8 +153,7 @@ public class CarePlan extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="patient", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who care plan is for",
 		formalDefinition="Identifies the patient/subject whose intended care is described by the plan."
@@ -183,8 +182,7 @@ public class CarePlan extends BaseResource implements IResource {
 	private DateTimeDt myModified;
 	
 	@Child(name="concern", order=5, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Condition.class,
+		ca.uhn.fhir.model.dstu.resource.Condition.class	})
-	})
 	@Description(
 		shortDefinition="Health issues this plan addresses",
 		formalDefinition="Identifies the conditions/problems/concerns/diagnoses/etc. whose management and/or mitigation are handled by this plan."
@@ -781,11 +779,7 @@ public class CarePlan extends BaseResource implements IResource {
 	private CodeableConceptDt myRole;
 	
 	@Child(name="member", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
-	})
 	@Description(
 		shortDefinition="Who is involved",
 		formalDefinition="The specific person or organization who is participating/expected to participate in the care plan."
@@ -904,8 +898,7 @@ public class CarePlan extends BaseResource implements IResource {
 	private StringDt myNotes;
 	
 	@Child(name="concern", order=3, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Condition.class,
+		ca.uhn.fhir.model.dstu.resource.Condition.class	})
-	})
 	@Description(
 		shortDefinition="Health issues this goal addresses",
 		formalDefinition="The identified conditions that this goal relates to - the condition that caused it to be created, or that it is intended to address"
@@ -1141,8 +1134,7 @@ public class CarePlan extends BaseResource implements IResource {
 	private BooleanDt myProhibited;
 	
 	@Child(name="actionResulting", order=3, min=0, max=Child.MAX_UNLIMITED, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="Appointments, orders, etc.",
 		formalDefinition="Resources that describe follow-on actions resulting from the plan, such as drug prescriptions, encounter records, appointments, etc."
@@ -1157,11 +1149,7 @@ public class CarePlan extends BaseResource implements IResource {
 	private StringDt myNotes;
 	
 	@Child(name="detail", order=5, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Procedure.class,
+		ca.uhn.fhir.model.dstu.resource.Procedure.class, 		ca.uhn.fhir.model.dstu.resource.MedicationPrescription.class, 		ca.uhn.fhir.model.dstu.resource.DiagnosticOrder.class, 		ca.uhn.fhir.model.dstu.resource.Encounter.class	})
-		ca.uhn.fhir.model.dstu.resource.MedicationPrescription.class,
-		ca.uhn.fhir.model.dstu.resource.DiagnosticOrder.class,
-		ca.uhn.fhir.model.dstu.resource.Encounter.class,
-	})
 	@Description(
 		shortDefinition="Activity details defined in specific resource",
 		formalDefinition="The details of the proposed activity represented in a specific resource"
@@ -1515,10 +1503,7 @@ public class CarePlan extends BaseResource implements IResource {
 	private CodeableConceptDt myCode;
 	
 	@Child(name="timing", order=2, min=0, max=1, type={
-		ScheduleDt.class,
+		ScheduleDt.class, 		PeriodDt.class, 		StringDt.class	})
-		PeriodDt.class,
-		StringDt.class,
-	})
 	@Description(
 		shortDefinition="When activity is to occur",
 		formalDefinition="The period, timing or frequency upon which the described activity is to occur."
@@ -1526,8 +1511,7 @@ public class CarePlan extends BaseResource implements IResource {
 	private IDatatype myTiming;
 	
 	@Child(name="location", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="Where it should happen",
 		formalDefinition="Identifies the facility where the activity will occur.  E.g. home, hospital, specific clinic, etc."
@@ -1535,11 +1519,7 @@ public class CarePlan extends BaseResource implements IResource {
 	private ResourceReferenceDt myLocation;
 	
 	@Child(name="performer", order=4, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Organization.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-	})
 	@Description(
 		shortDefinition="Who's responsible?",
 		formalDefinition="Identifies who's expected to be involved in the activity."
@@ -1547,9 +1527,7 @@ public class CarePlan extends BaseResource implements IResource {
 	private java.util.List<ResourceReferenceDt> myPerformer;
 	
 	@Child(name="product", order=5, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Medication.class,
+		ca.uhn.fhir.model.dstu.resource.Medication.class, 		ca.uhn.fhir.model.dstu.resource.Substance.class	})
-		ca.uhn.fhir.model.dstu.resource.Substance.class,
-	})
 	@Description(
 		shortDefinition="What's administered/supplied",
 		formalDefinition="Identifies the food, drug or other product being consumed or supplied in the activity."

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Claim.java

@@ -93,8 +93,7 @@ public class Claim extends BaseResource implements IResource {
 	private DateDt myServicedate;
 	
 	@Child(name="provider", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Responsible practitioner",
 		formalDefinition="The practitioner who is responsible for the services rendered to the patient"
@@ -102,8 +101,7 @@ public class Claim extends BaseResource implements IResource {
 	private ResourceReferenceDt myProvider;
 	
 	@Child(name="billingProvider", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Provider who is the payee",
 		formalDefinition="The provider who is to be reimbursed for the claim (the party to whom any benefit is assigned)"
@@ -111,8 +109,7 @@ public class Claim extends BaseResource implements IResource {
 	private ResourceReferenceDt myBillingProvider;
 	
 	@Child(name="referrer", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Provider who is the payee",
 		formalDefinition=""
@@ -871,8 +868,7 @@ public class Claim extends BaseResource implements IResource {
 	public static class Coverage extends BaseElement implements IResourceBlock {
 	
 	@Child(name="issuer", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="An identifier for the plan issuer",
 		formalDefinition="The program or plan underwriter or payor."

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Composition.java

@@ -218,12 +218,7 @@ public class Composition extends BaseResource implements IResource {
 	private CodingDt myConfidentiality;
 	
 	@Child(name="subject", order=7, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Group.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Location.class	})
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-		ca.uhn.fhir.model.dstu.resource.Group.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Location.class,
-	})
 	@Description(
 		shortDefinition="Who and/or what the composition is about",
 		formalDefinition="Who or what the composition is about. The composition can be about a person, (patient or healthcare practitioner), a device (I.e. machine) or even a group of subjects (such as a document about a herd of livestock, or a set of patients that share a common exposure)"
@@ -231,11 +226,7 @@ public class Composition extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="author", order=8, min=1, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="Who and/or what authored the composition",
 		formalDefinition="Identifies who is responsible for the information in the composition.  (Not necessarily who typed it in.)"
@@ -250,8 +241,7 @@ public class Composition extends BaseResource implements IResource {
 	private java.util.List<Attester> myAttester;
 	
 	@Child(name="custodian", order=10, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Org which maintains the composition",
 		formalDefinition="Identifies the organization or group who is responsible for ongoing maintenance of and access to the composition/document information"
@@ -266,8 +256,7 @@ public class Composition extends BaseResource implements IResource {
 	private Event myEvent;
 	
 	@Child(name="encounter", order=12, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Encounter.class,
+		ca.uhn.fhir.model.dstu.resource.Encounter.class	})
-	})
 	@Description(
 		shortDefinition="Context of the conposition",
 		formalDefinition="Describes the clinical encounter or type of care this documentation is associated with."
@@ -900,10 +889,7 @@ public class Composition extends BaseResource implements IResource {
 	private DateTimeDt myTime;
 	
 	@Child(name="party", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
-	})
 	@Description(
 		shortDefinition="Who attested the composition",
 		formalDefinition="Who attested the composition in the specified way"
@@ -1098,8 +1084,7 @@ public class Composition extends BaseResource implements IResource {
 	private PeriodDt myPeriod;
 	
 	@Child(name="detail", order=2, min=0, max=Child.MAX_UNLIMITED, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="Full details for the event(s) the composition consents",
 		formalDefinition="Full details for the event(s) the composition/documentation consents"
@@ -1287,10 +1272,7 @@ public class Composition extends BaseResource implements IResource {
 	private CodeableConceptDt myCode;
 	
 	@Child(name="subject", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Group.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Group.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="If section different to composition",
 		formalDefinition="Identifies the primary subject of the section."
@@ -1298,8 +1280,7 @@ public class Composition extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="content", order=3, min=0, max=1, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="The actual data for the section",
 		formalDefinition="Identifies the discrete data that provides the content for the section."

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ConceptMap.java

@@ -257,8 +257,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	private DateTimeDt myDate;
 	
 	@Child(name="source", order=10, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.ValueSet.class,
+		ca.uhn.fhir.model.dstu.resource.ValueSet.class	})
-	})
 	@Description(
 		shortDefinition="Identifies the source value set which is being mapped",
 		formalDefinition="The source value set that specifies the concepts that are being mapped"
@@ -266,8 +265,7 @@ public class ConceptMap extends BaseResource implements IResource {
 	private ResourceReferenceDt mySource;
 	
 	@Child(name="target", order=11, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.ValueSet.class,
+		ca.uhn.fhir.model.dstu.resource.ValueSet.class	})
-	})
 	@Description(
 		shortDefinition="Provides context to the mappings",
 		formalDefinition="The target value set provides context to the mappings. Note that the mapping is made between concepts, not between value sets, but the value set provides important context about how the concept mapping choices are made"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Condition.java

@@ -217,8 +217,7 @@ public class Condition extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="subject", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who has the condition?",
 		formalDefinition="Indicates the patient who the condition record is associated with"
@@ -226,8 +225,7 @@ public class Condition extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="encounter", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Encounter.class,
+		ca.uhn.fhir.model.dstu.resource.Encounter.class	})
-	})
 	@Description(
 		shortDefinition="Encounter when condition first asserted",
 		formalDefinition="Encounter during which the condition was first asserted"
@@ -235,9 +233,7 @@ public class Condition extends BaseResource implements IResource {
 	private ResourceReferenceDt myEncounter;
 	
 	@Child(name="asserter", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-	})
 	@Description(
 		shortDefinition="Person who asserts this condition",
 		formalDefinition="Person who takes responsibility for asserting the existence of the condition as part of the electronic record"
@@ -287,9 +283,7 @@ public class Condition extends BaseResource implements IResource {
 	private CodeableConceptDt mySeverity;
 	
 	@Child(name="onset", order=10, min=0, max=1, type={
-		DateDt.class,
+		DateDt.class, 		AgeDt.class	})
-		AgeDt.class,
-	})
 	@Description(
 		shortDefinition="Estimated or actual date, or age",
 		formalDefinition="Estimated or actual date the condition began, in the opinion of the clinician"
@@ -297,10 +291,7 @@ public class Condition extends BaseResource implements IResource {
 	private IDatatype myOnset;
 	
 	@Child(name="abatement", order=11, min=0, max=1, type={
-		DateDt.class,
+		DateDt.class, 		AgeDt.class, 		BooleanDt.class	})
-		AgeDt.class,
-		BooleanDt.class,
-	})
 	@Description(
 		shortDefinition="If/when in resolution/remission",
 		formalDefinition="The date or estimated date that the condition resolved or went into remission. This is called \"abatement\" because of the many overloaded connotations associated with \"remission\" or \"resolution\" - Conditions are never really resolved, but they can abate."
@@ -1099,8 +1090,7 @@ public class Condition extends BaseResource implements IResource {
 	private CodeableConceptDt mySummary;
 	
 	@Child(name="assessment", order=1, min=0, max=Child.MAX_UNLIMITED, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="Formal record of assessment",
 		formalDefinition="Reference to a formal record of the evidence on which the staging assessment is based"
@@ -1221,8 +1211,7 @@ public class Condition extends BaseResource implements IResource {
 	private CodeableConceptDt myCode;
 	
 	@Child(name="detail", order=1, min=0, max=Child.MAX_UNLIMITED, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="Supporting information found elsewhere",
 		formalDefinition="Links to other relevant information, including pathology reports"
@@ -1470,12 +1459,7 @@ public class Condition extends BaseResource implements IResource {
 	private CodeableConceptDt myCode;
 	
 	@Child(name="target", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Condition.class,
+		ca.uhn.fhir.model.dstu.resource.Condition.class, 		ca.uhn.fhir.model.dstu.resource.Procedure.class, 		ca.uhn.fhir.model.dstu.resource.MedicationAdministration.class, 		ca.uhn.fhir.model.dstu.resource.Immunization.class, 		ca.uhn.fhir.model.dstu.resource.MedicationStatement.class	})
-		ca.uhn.fhir.model.dstu.resource.Procedure.class,
-		ca.uhn.fhir.model.dstu.resource.MedicationAdministration.class,
-		ca.uhn.fhir.model.dstu.resource.Immunization.class,
-		ca.uhn.fhir.model.dstu.resource.MedicationStatement.class,
-	})
 	@Description(
 		shortDefinition="Relationship target resource",
 		formalDefinition="Target of the relationship"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Conformance.java

@@ -339,8 +339,7 @@ public class Conformance extends BaseResource implements IResource {
 	private java.util.List<CodeDt> myFormat;
 	
 	@Child(name="profile", order=14, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Profile.class,
+		ca.uhn.fhir.model.dstu.resource.Profile.class	})
-	})
 	@Description(
 		shortDefinition="Profiles supported by the system",
 		formalDefinition="A list of profiles supported by the system. For a server, \"supported by the system\" means the system hosts/produces a set of recourses, conformant to a particular profile, and allows its clients to search using this profile and to find appropriate data. For a client, it means the system will search by this profile and process data according to the guidance implicit in the profile."
@@ -2463,8 +2462,7 @@ public class Conformance extends BaseResource implements IResource {
 	private BoundCodeDt<ResourceTypeEnum> myType;
 	
 	@Child(name="profile", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Profile.class,
+		ca.uhn.fhir.model.dstu.resource.Profile.class	})
-	})
 	@Description(
 		shortDefinition="What structural features are supported",
 		formalDefinition="A specification of the profile that describes the solution's support for the resource, including any constraints on cardinality, bindings, lengths or other limitations"
@@ -4086,8 +4084,7 @@ public class Conformance extends BaseResource implements IResource {
 	private BoundCodeDt<ResourceTypeEnum> myFocus;
 	
 	@Child(name="request", order=5, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Profile.class,
+		ca.uhn.fhir.model.dstu.resource.Profile.class	})
-	})
 	@Description(
 		shortDefinition="Profile that describes the request",
 		formalDefinition="Information about the request for this event"
@@ -4095,8 +4092,7 @@ public class Conformance extends BaseResource implements IResource {
 	private ResourceReferenceDt myRequest;
 	
 	@Child(name="response", order=6, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Profile.class,
+		ca.uhn.fhir.model.dstu.resource.Profile.class	})
-	})
 	@Description(
 		shortDefinition="Profile that describes the response",
 		formalDefinition="Information about the response for this event"
@@ -4486,8 +4482,7 @@ public class Conformance extends BaseResource implements IResource {
 	private StringDt myDocumentation;
 	
 	@Child(name="profile", order=2, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Profile.class,
+		ca.uhn.fhir.model.dstu.resource.Profile.class	})
-	})
 	@Description(
 		shortDefinition="Constraint on a resource used in the document",
 		formalDefinition="A constraint on a resource used in the document"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Coverage.java

@@ -156,8 +156,7 @@ public class Coverage extends BaseResource implements IResource {
 
 
 	@Child(name="issuer", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="An identifier for the plan issuer",
 		formalDefinition="The program or plan underwriter or payor."

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Device.java

@@ -198,8 +198,7 @@ public class Device extends BaseResource implements IResource {
 	private StringDt myLotNumber;
 	
 	@Child(name="owner", order=8, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Organization responsible for device",
 		formalDefinition="An organization that is responsible for the provision and ongoing maintenance of the device"
@@ -207,8 +206,7 @@ public class Device extends BaseResource implements IResource {
 	private ResourceReferenceDt myOwner;
 	
 	@Child(name="location", order=9, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="Where the resource is found",
 		formalDefinition="The resource may be found in a literal location (i.e. GPS coordinates), a logical place (i.e. \"in/with the patient\"), or a coded location"
@@ -216,8 +214,7 @@ public class Device extends BaseResource implements IResource {
 	private ResourceReferenceDt myLocation;
 	
 	@Child(name="patient", order=10, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="If the resource is affixed to a person",
 		formalDefinition="Patient information, if the resource is affixed to a person"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DeviceObservationReport.java

@@ -126,8 +126,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
 	private IdentifierDt myIdentifier;
 	
 	@Child(name="source", order=2, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Device.class,
+		ca.uhn.fhir.model.dstu.resource.Device.class	})
-	})
 	@Description(
 		shortDefinition="Identifies/describes where the data came from",
 		formalDefinition="Identification information for the device that is the source of the data"
@@ -135,10 +134,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
 	private ResourceReferenceDt mySource;
 	
 	@Child(name="subject", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Location.class	})
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Location.class,
-	})
 	@Description(
 		shortDefinition="Subject of the measurement",
 		formalDefinition="The subject of the measurement"
@@ -683,8 +679,7 @@ public class DeviceObservationReport extends BaseResource implements IResource {
 	public static class VirtualDeviceChannelMetric extends BaseElement implements IResourceBlock {
 	
 	@Child(name="observation", order=0, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Observation.class,
+		ca.uhn.fhir.model.dstu.resource.Observation.class	})
-	})
 	@Description(
 		shortDefinition="The data for the metric",
 		formalDefinition="The data for the metric"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticOrder.java

@@ -227,11 +227,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 
 
 	@Child(name="subject", order=0, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Group.class, 		ca.uhn.fhir.model.dstu.resource.Location.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Group.class,
-		ca.uhn.fhir.model.dstu.resource.Location.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="Who and/or what test is about",
 		formalDefinition="Who or what the investigation is to be performed on. This is usually a human patient, but diagnostic tests can also be requested on animals, groups of humans or animals, devices such as dialysis machines, or even locations (typically for environmental scans)"
@@ -239,8 +235,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="orderer", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Who ordered the test",
 		formalDefinition="The practitioner that holds legal responsibility for ordering the investigation"
@@ -255,8 +250,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="encounter", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Encounter.class,
+		ca.uhn.fhir.model.dstu.resource.Encounter.class	})
-	})
 	@Description(
 		shortDefinition="The encounter that this diagnostic order is associated with",
 		formalDefinition="An encounter that provides additional informaton about the healthcare context in which this request is made"
@@ -271,8 +265,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	private StringDt myClinicalNotes;
 	
 	@Child(name="specimen", order=5, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Specimen.class,
+		ca.uhn.fhir.model.dstu.resource.Specimen.class	})
-	})
 	@Description(
 		shortDefinition="If the whole order relates to specific specimens",
 		formalDefinition="One or more specimens that the diagnostic investigation is about"
@@ -838,9 +831,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	private DateTimeDt myDateTime;
 	
 	@Child(name="actor", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="Who recorded or did this",
 		formalDefinition="The person who was responsible for performing or recording the action"
@@ -1046,8 +1037,7 @@ public class DiagnosticOrder extends BaseResource implements IResource {
 	private CodeableConceptDt myCode;
 	
 	@Child(name="specimen", order=1, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Specimen.class,
+		ca.uhn.fhir.model.dstu.resource.Specimen.class	})
-	})
 	@Description(
 		shortDefinition="If this item relates to specific specimens",
 		formalDefinition="If the item is related to a specific speciment"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DiagnosticReport.java

@@ -220,11 +220,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private DateTimeDt myIssued;
 	
 	@Child(name="subject", order=3, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Group.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Location.class	})
-		ca.uhn.fhir.model.dstu.resource.Group.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Location.class,
-	})
 	@Description(
 		shortDefinition="The subject of the report, usually, but not always, the patient",
 		formalDefinition="The subject of the report. Usually, but not always, this is a patient. However diagnostic services also perform analyses on specimens collected from a variety of other sources"
@@ -232,9 +228,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="performer", order=4, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
-	})
 	@Description(
 		shortDefinition="Responsible Diagnostic Service",
 		formalDefinition="The diagnostic service that is responsible for issuing the report"
@@ -249,8 +243,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private IdentifierDt myIdentifier;
 	
 	@Child(name="requestDetail", order=6, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.DiagnosticOrder.class,
+		ca.uhn.fhir.model.dstu.resource.DiagnosticOrder.class	})
-	})
 	@Description(
 		shortDefinition="What was requested",
 		formalDefinition="Details concerning a test requested."
@@ -265,9 +258,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private CodeableConceptDt myServiceCategory;
 	
 	@Child(name="diagnostic", order=8, min=1, max=1, type={
-		DateTimeDt.class,
+		DateTimeDt.class, 		PeriodDt.class	})
-		PeriodDt.class,
-	})
 	@Description(
 		shortDefinition="Physiologically Relevant time/time-period for report",
 		formalDefinition="The time or time-period the observed values are related to. This is usually either the time of the procedure or of specimen collection(s), but very often the source of the date/time is not known, only the date/time itself"
@@ -275,8 +266,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private IDatatype myDiagnostic;
 	
 	@Child(name="specimen", order=9, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Specimen.class,
+		ca.uhn.fhir.model.dstu.resource.Specimen.class	})
-	})
 	@Description(
 		shortDefinition="Specimens this report is based on",
 		formalDefinition="Details about the specimens on which this Disagnostic report is based"
@@ -284,8 +274,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private java.util.List<ResourceReferenceDt> mySpecimen;
 	
 	@Child(name="result", order=10, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Observation.class,
+		ca.uhn.fhir.model.dstu.resource.Observation.class	})
-	})
 	@Description(
 		shortDefinition="Observations - simple, or complex nested groups",
 		formalDefinition="Observations that are part of this diagnostic report. Observations can be simple name/value pairs (e.g. \"atomic\" results), or they can be grouping observations that include references to other members of the group (e.g. \"panels\")"
@@ -293,8 +282,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private java.util.List<ResourceReferenceDt> myResult;
 	
 	@Child(name="imagingStudy", order=11, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.ImagingStudy.class,
+		ca.uhn.fhir.model.dstu.resource.ImagingStudy.class	})
-	})
 	@Description(
 		shortDefinition="Reference to full details of imaging associated with the diagnostic report",
 		formalDefinition="One or more links to full details of any imaging performed during the diagnostic investigation. Typically, this is imaging performed by DICOM enabled modalities, but this is not required. A fully enabled PACS viewer can use this information to provide views of the source images"
@@ -1068,8 +1056,7 @@ public class DiagnosticReport extends BaseResource implements IResource {
 	private StringDt myComment;
 	
 	@Child(name="link", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Media.class,
+		ca.uhn.fhir.model.dstu.resource.Media.class	})
-	})
 	@Description(
 		shortDefinition="Reference to the image source",
 		formalDefinition=""

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentManifest.java

@@ -188,11 +188,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="subject", order=2, min=1, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Group.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-		ca.uhn.fhir.model.dstu.resource.Group.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="The subject of the set of documents",
 		formalDefinition="Who or what the set of documents is about. The documents can be about a person, (patient or healthcare practitioner), a device (i.e. machine) or even a group of subjects (such as a document about a herd of farm animals, or a set of patients that share a common exposure). If the documents cross more than one subject, then more than one subject is allowed here (unusual use case)"
@@ -200,10 +196,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	private java.util.List<ResourceReferenceDt> mySubject;
 	
 	@Child(name="recipient", order=3, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
-	})
 	@Description(
 		shortDefinition="Intended to get notified about this set of documents",
 		formalDefinition="A patient, practitioner, or organization for which this set of documents is intended"
@@ -218,11 +211,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	private CodeableConceptDt myType;
 	
 	@Child(name="author", order=5, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="Who and/or what authored the document",
 		formalDefinition="Identifies who is responsible for adding the information to the document"
@@ -251,8 +240,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	private BoundCodeDt<DocumentReferenceStatusEnum> myStatus;
 	
 	@Child(name="supercedes", order=9, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.DocumentManifest.class,
+		ca.uhn.fhir.model.dstu.resource.DocumentManifest.class	})
-	})
 	@Description(
 		shortDefinition="If this document manifest replaces another",
 		formalDefinition="Whether this document manifest replaces another"
@@ -274,10 +262,7 @@ public class DocumentManifest extends BaseResource implements IResource {
 	private CodeableConceptDt myConfidentiality;
 	
 	@Child(name="content", order=12, min=1, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.DocumentReference.class,
+		ca.uhn.fhir.model.dstu.resource.DocumentReference.class, 		ca.uhn.fhir.model.dstu.resource.Binary.class, 		ca.uhn.fhir.model.dstu.resource.Media.class	})
-		ca.uhn.fhir.model.dstu.resource.Binary.class,
-		ca.uhn.fhir.model.dstu.resource.Media.class,
-	})
 	@Description(
 		shortDefinition="Contents of this set of documents",
 		formalDefinition="The list of resources that describe the parts of this document reference. Usually, these would be document references, but direct references to binary attachments and images are also allowed"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/DocumentReference.java

@@ -305,11 +305,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="subject", order=2, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Group.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-		ca.uhn.fhir.model.dstu.resource.Group.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="Who|what is the subject of the document",
 		formalDefinition="Who or what the document is about. The document can be about a person, (patient or healthcare practitioner), a device (I.e. machine) or even a group of subjects (such as a document about a herd of farm animals, or a set of patients that share a common exposure)"
@@ -331,11 +327,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	private CodeableConceptDt myClassElement;
 	
 	@Child(name="author", order=5, min=1, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="Who and/or what authored the document",
 		formalDefinition="Identifies who is responsible for adding the information to the document"
@@ -343,8 +335,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	private java.util.List<ResourceReferenceDt> myAuthor;
 	
 	@Child(name="custodian", order=6, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Org which maintains the document",
 		formalDefinition="Identifies the organization or group who is responsible for ongoing maintenance of and access to the document"
@@ -359,9 +350,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	private UriDt myPolicyManager;
 	
 	@Child(name="authenticator", order=8, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
-	})
 	@Description(
 		shortDefinition="Who/What authenticated the document",
 		formalDefinition="Which person or organization authenticates that this document is valid"
@@ -1608,8 +1597,7 @@ public class DocumentReference extends BaseResource implements IResource {
 	private BoundCodeDt<DocumentRelationshipTypeEnum> myCode;
 	
 	@Child(name="target", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.DocumentReference.class,
+		ca.uhn.fhir.model.dstu.resource.DocumentReference.class	})
-	})
 	@Description(
 		shortDefinition="Target of the relationship",
 		formalDefinition="The target document of this relationship"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Encounter.java

@@ -189,8 +189,7 @@ public class Encounter extends BaseResource implements IResource {
 	private java.util.List<BoundCodeableConceptDt<EncounterTypeEnum>> myType;
 	
 	@Child(name="subject", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="The patient present at the encounter",
 		formalDefinition=""
@@ -226,8 +225,7 @@ public class Encounter extends BaseResource implements IResource {
 	private BoundCodeableConceptDt<EncounterReasonCodesEnum> myReason;
 	
 	@Child(name="indication", order=9, min=0, max=1, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="Reason the encounter takes place (resource)",
 		formalDefinition="Reason the encounter takes place, as specified using information from another resource. For admissions, this is the admission diagnosis."
@@ -256,8 +254,7 @@ public class Encounter extends BaseResource implements IResource {
 	private java.util.List<Location> myLocation;
 	
 	@Child(name="serviceProvider", order=13, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Department or team providing care",
 		formalDefinition=""
@@ -265,8 +262,7 @@ public class Encounter extends BaseResource implements IResource {
 	private ResourceReferenceDt myServiceProvider;
 	
 	@Child(name="partOf", order=14, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Encounter.class,
+		ca.uhn.fhir.model.dstu.resource.Encounter.class	})
-	})
 	@Description(
 		shortDefinition="Another Encounter this encounter is part of",
 		formalDefinition="Another Encounter of which this encounter is a part of (administratively or in time)."
@@ -961,9 +957,7 @@ public class Encounter extends BaseResource implements IResource {
 	private java.util.List<BoundCodeableConceptDt<ParticipantTypeEnum>> myType;
 	
 	@Child(name="individual", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="Persons involved in the encounter other than the patient",
 		formalDefinition=""
@@ -1094,8 +1088,7 @@ public class Encounter extends BaseResource implements IResource {
 	private IdentifierDt myPreAdmissionIdentifier;
 	
 	@Child(name="origin", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="The location from which the patient came before admission",
 		formalDefinition=""
@@ -1145,8 +1138,7 @@ public class Encounter extends BaseResource implements IResource {
 	private java.util.List<CodeableConceptDt> mySpecialArrangement;
 	
 	@Child(name="destination", order=8, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="Location to which the patient is discharged",
 		formalDefinition=""
@@ -1161,8 +1153,7 @@ public class Encounter extends BaseResource implements IResource {
 	private CodeableConceptDt myDischargeDisposition;
 	
 	@Child(name="dischargeDiagnosis", order=10, min=0, max=1, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="The final diagnosis given a patient before release from the hospital after all testing, surgery, and workup are complete",
 		formalDefinition=""
@@ -1718,8 +1709,7 @@ public class Encounter extends BaseResource implements IResource {
 	public static class HospitalizationAccomodation extends BaseElement implements IResourceBlock {
 	
 	@Child(name="bed", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="The bed that is assigned to the patient",
 		formalDefinition=""
@@ -1828,8 +1818,7 @@ public class Encounter extends BaseResource implements IResource {
 	public static class Location extends BaseElement implements IResourceBlock {
 	
 	@Child(name="location", order=0, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="Location the encounter takes place",
 		formalDefinition="The location where the encounter takes place"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/FamilyHistory.java

@@ -83,8 +83,7 @@ public class FamilyHistory extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="subject", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Patient history is about",
 		formalDefinition="The person who this history concerns"
@@ -378,10 +377,7 @@ public class FamilyHistory extends BaseResource implements IResource {
 	private CodeableConceptDt myRelationship;
 	
 	@Child(name="born", order=2, min=0, max=1, type={
-		PeriodDt.class,
+		PeriodDt.class, 		DateDt.class, 		StringDt.class	})
-		DateDt.class,
-		StringDt.class,
-	})
 	@Description(
 		shortDefinition="(approximate) date of birth",
 		formalDefinition="The actual or approximate date of birth of the relative"
@@ -389,12 +385,7 @@ public class FamilyHistory extends BaseResource implements IResource {
 	private IDatatype myBorn;
 	
 	@Child(name="deceased", order=3, min=0, max=1, type={
-		BooleanDt.class,
+		BooleanDt.class, 		AgeDt.class, 		RangeDt.class, 		DateDt.class, 		StringDt.class	})
-		AgeDt.class,
-		RangeDt.class,
-		DateDt.class,
-		StringDt.class,
-	})
 	@Description(
 		shortDefinition="Dead? How old/when?",
 		formalDefinition="If this resource is indicating that the related person is deceased, then an indicator of whether the person is deceased (yes) or not (no) or the age or age range or description of age at death - can be indicated here. If the reason for death is known, then it can be indicated in the outcome code of the condition - in this case the deceased property should still be set."
@@ -695,10 +686,7 @@ public class FamilyHistory extends BaseResource implements IResource {
 	private CodeableConceptDt myOutcome;
 	
 	@Child(name="onset", order=2, min=0, max=1, type={
-		AgeDt.class,
+		AgeDt.class, 		RangeDt.class, 		StringDt.class	})
-		RangeDt.class,
-		StringDt.class,
-	})
 	@Description(
 		shortDefinition="When condition first manifested",
 		formalDefinition="Either the age of onset, range of approximate age or descriptive string can be recorded.  For conditions with multiple occurrences, this describes the first known occurrence."

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFMeta.java

@@ -964,8 +964,7 @@ public class GVFMeta extends BaseResource implements IResource {
 	public static class Subject extends BaseElement implements IResourceBlock {
 	
 	@Child(name="patient", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Identity of the subejct",
 		formalDefinition="Identity of the subejct"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GVFVariant.java

@@ -88,8 +88,7 @@ public class GVFVariant extends BaseResource implements IResource {
 	private Subject mySubject;
 	
 	@Child(name="meta", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.GVFMeta.class,
+		ca.uhn.fhir.model.dstu.resource.GVFMeta.class	})
-	})
 	@Description(
 		shortDefinition="GVF Meta",
 		formalDefinition="Meta information of a GVF file"
@@ -1655,8 +1654,7 @@ public class GVFVariant extends BaseResource implements IResource {
 	public static class Subject extends BaseElement implements IResourceBlock {
 	
 	@Child(name="patient", order=0, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Subject",
 		formalDefinition="Patient resource that stores information of the subejct"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneExpression.java

@@ -89,8 +89,7 @@ public class GeneExpression extends BaseResource implements IResource {
 
 
 	@Child(name="subject", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Subject described by the resource",
 		formalDefinition="Subject described by the resource"
@@ -105,8 +104,7 @@ public class GeneExpression extends BaseResource implements IResource {
 	private Gene myGene;
 	
 	@Child(name="microarray", order=2, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Microarray.class,
+		ca.uhn.fhir.model.dstu.resource.Microarray.class	})
-	})
 	@Description(
 		shortDefinition="Microarray that studies the gene",
 		formalDefinition="Microarray that studies the gene"
@@ -618,8 +616,7 @@ public class GeneExpression extends BaseResource implements IResource {
 	public static class RnaSeq extends BaseElement implements IResourceBlock {
 	
 	@Child(name="inputLab", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.SequencingLab.class,
+		ca.uhn.fhir.model.dstu.resource.SequencingLab.class	})
-	})
 	@Description(
 		shortDefinition="Input lab for the RNA-Seq",
 		formalDefinition="Input lab for the RNA-Seq"
@@ -627,8 +624,7 @@ public class GeneExpression extends BaseResource implements IResource {
 	private ResourceReferenceDt myInputLab;
 	
 	@Child(name="inputAnalysis", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.SequencingAnalysis.class,
+		ca.uhn.fhir.model.dstu.resource.SequencingAnalysis.class	})
-	})
 	@Description(
 		shortDefinition="Input analysis for the RNA-Seq",
 		formalDefinition="Input analysis for the RNA-Seq"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/GeneticAnalysis.java

@@ -92,8 +92,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
 
 
 	@Child(name="subject", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Subject of the analysis",
 		formalDefinition="Subject of the analysis"
@@ -101,8 +100,7 @@ public class GeneticAnalysis extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="author", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Author of the analysis",
 		formalDefinition="Author of the analysis"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Group.java

@@ -207,12 +207,7 @@ public class Group extends BaseResource implements IResource {
 	private java.util.List<Characteristic> myCharacteristic;
 	
 	@Child(name="member", order=7, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Medication.class, 		ca.uhn.fhir.model.dstu.resource.Substance.class	})
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Medication.class,
-		ca.uhn.fhir.model.dstu.resource.Substance.class,
-	})
 	@Description(
 		shortDefinition="Who is in group",
 		formalDefinition="Identifies the resource instances that are members of the group."
@@ -619,11 +614,7 @@ public class Group extends BaseResource implements IResource {
 	private CodeableConceptDt myCode;
 	
 	@Child(name="value", order=1, min=1, max=1, type={
-		CodeableConceptDt.class,
+		CodeableConceptDt.class, 		BooleanDt.class, 		QuantityDt.class, 		RangeDt.class	})
-		BooleanDt.class,
-		QuantityDt.class,
-		RangeDt.class,
-	})
 	@Description(
 		shortDefinition="Value held by characteristic",
 		formalDefinition="The value of the trait that holds (or does not hold - see 'exclude') for members of the group"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImagingStudy.java

@@ -178,8 +178,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	private DateTimeDt myDateTime;
 	
 	@Child(name="subject", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who the images are of",
 		formalDefinition="Who the images are of"
@@ -208,8 +207,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="order", order=5, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.DiagnosticOrder.class,
+		ca.uhn.fhir.model.dstu.resource.DiagnosticOrder.class	})
-	})
 	@Description(
 		shortDefinition="Order(s) that caused this study to be performed",
 		formalDefinition="A list of the diagnostic orders that resulted in this imaging study being performed"
@@ -224,8 +222,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	private java.util.List<BoundCodeDt<ImagingModalityEnum>> myModality;
 	
 	@Child(name="referrer", order=7, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Referring physician (0008,0090)",
 		formalDefinition="The requesting/referring physician"
@@ -275,8 +272,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	private java.util.List<CodingDt> myProcedure;
 	
 	@Child(name="interpreter", order=14, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Who interpreted images (0008,1060)",
 		formalDefinition="Who read study and interpreted the images"
@@ -1729,8 +1725,7 @@ public class ImagingStudy extends BaseResource implements IResource {
 	private UriDt myUrl;
 	
 	@Child(name="attachment", order=6, min=0, max=1, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="A FHIR resource with content for this instance",
 		formalDefinition=""

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Immunization.java

@@ -242,8 +242,7 @@ public class Immunization extends BaseResource implements IResource {
 	private CodeableConceptDt myVaccineType;
 	
 	@Child(name="subject", order=3, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who was immunized?",
 		formalDefinition="The patient to whom the vaccine was to be administered"
@@ -265,8 +264,7 @@ public class Immunization extends BaseResource implements IResource {
 	private BooleanDt myReported;
 	
 	@Child(name="performer", order=6, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Who administered vaccine?",
 		formalDefinition="Clinician who administered the vaccine"
@@ -274,8 +272,7 @@ public class Immunization extends BaseResource implements IResource {
 	private ResourceReferenceDt myPerformer;
 	
 	@Child(name="requester", order=7, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Who ordered vaccination?",
 		formalDefinition="Clinician who ordered the vaccination"
@@ -283,8 +280,7 @@ public class Immunization extends BaseResource implements IResource {
 	private ResourceReferenceDt myRequester;
 	
 	@Child(name="manufacturer", order=8, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Vaccine manufacturer",
 		formalDefinition="Name of vaccine manufacturer"
@@ -292,8 +288,7 @@ public class Immunization extends BaseResource implements IResource {
 	private ResourceReferenceDt myManufacturer;
 	
 	@Child(name="location", order=9, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="Where did vaccination occur?",
 		formalDefinition="The service delivery location where the vaccine administration occurred."
@@ -1390,9 +1385,7 @@ public class Immunization extends BaseResource implements IResource {
 	private DateTimeDt myDate;
 	
 	@Child(name="detail", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.AdverseReaction.class,
+		ca.uhn.fhir.model.dstu.resource.AdverseReaction.class, 		ca.uhn.fhir.model.dstu.resource.Observation.class	})
-		ca.uhn.fhir.model.dstu.resource.Observation.class,
-	})
 	@Description(
 		shortDefinition="Additional information on reaction",
 		formalDefinition="Details of the reaction"
@@ -1581,8 +1574,7 @@ public class Immunization extends BaseResource implements IResource {
 	private StringDt myDescription;
 	
 	@Child(name="authority", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Who is responsible for protocol",
 		formalDefinition="Indicates the authority who published the protocol?  E.g. ACIP"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ImmunizationRecommendation.java

@@ -164,8 +164,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="subject", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who this profile is for",
 		formalDefinition="The patient who is the subject of the profile"
@@ -436,8 +435,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	private RecommendationProtocol myProtocol;
 	
 	@Child(name="supportingImmunization", order=6, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Immunization.class,
+		ca.uhn.fhir.model.dstu.resource.Immunization.class	})
-	})
 	@Description(
 		shortDefinition="Past immunizations supporting recommendation",
 		formalDefinition="Immunization event history that supports the status and recommendation"
@@ -445,10 +443,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	private java.util.List<ResourceReferenceDt> mySupportingImmunization;
 	
 	@Child(name="supportingPatientInformation", order=7, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Observation.class,
+		ca.uhn.fhir.model.dstu.resource.Observation.class, 		ca.uhn.fhir.model.dstu.resource.AdverseReaction.class, 		ca.uhn.fhir.model.dstu.resource.AllergyIntolerance.class	})
-		ca.uhn.fhir.model.dstu.resource.AdverseReaction.class,
-		ca.uhn.fhir.model.dstu.resource.AllergyIntolerance.class,
-	})
 	@Description(
 		shortDefinition="Patient observations supporting recommendation",
 		formalDefinition="Patient Information that supports the status and recommendation.  This includes patient observations, adverse reactions and allergy/intolerance information."
@@ -998,8 +993,7 @@ public class ImmunizationRecommendation extends BaseResource implements IResourc
 	private StringDt myDescription;
 	
 	@Child(name="authority", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Who is responsible for protocol",
 		formalDefinition="Indicates the authority who published the protocol?  E.g. ACIP"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/ListResource.java

@@ -140,11 +140,7 @@ public class ListResource extends BaseResource implements IResource {
 	private CodeableConceptDt myCode;
 	
 	@Child(name="subject", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Group.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Location.class	})
-		ca.uhn.fhir.model.dstu.resource.Group.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Location.class,
-	})
 	@Description(
 		shortDefinition="If all resources have the same subject",
 		formalDefinition="The common subject (or patient) of the resources that are in the list, if there is one"
@@ -152,10 +148,7 @@ public class ListResource extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="source", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="Who and/or what defined the list contents",
 		formalDefinition="The entity responsible for deciding what the contents of the list were"
@@ -665,8 +658,7 @@ public class ListResource extends BaseResource implements IResource {
 	private DateTimeDt myDate;
 	
 	@Child(name="item", order=3, min=1, max=1, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="Actual entry",
 		formalDefinition="A reference to the actual resource from which data was derived"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Location.java

@@ -205,8 +205,7 @@ public class Location extends BaseResource implements IResource {
 	private Position myPosition;
 	
 	@Child(name="managingOrganization", order=8, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="The organization that is responsible for the provisioning and upkeep of the location",
 		formalDefinition=""
@@ -221,8 +220,7 @@ public class Location extends BaseResource implements IResource {
 	private BoundCodeDt<LocationStatusEnum> myStatus;
 	
 	@Child(name="partOf", order=10, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="Another Location which this Location is physically part of",
 		formalDefinition=""

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Media.java

@@ -163,12 +163,7 @@ public class Media extends BaseResource implements IResource {
 	private DateTimeDt myDateTime;
 	
 	@Child(name="subject", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Group.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Specimen.class	})
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-		ca.uhn.fhir.model.dstu.resource.Group.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Specimen.class,
-	})
 	@Description(
 		shortDefinition="Who/What this Media is a record of",
 		formalDefinition="Who/What this Media is a record of"
@@ -176,8 +171,7 @@ public class Media extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="operator", order=5, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="The person who generated the image",
 		formalDefinition="The person who administered the collection of the image"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Medication.java

@@ -154,8 +154,7 @@ public class Medication extends BaseResource implements IResource {
 	private BooleanDt myIsBrand;
 	
 	@Child(name="manufacturer", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Manufacturer of the item",
 		formalDefinition="Describes the details of the manufacturer"
@@ -615,9 +614,7 @@ public class Medication extends BaseResource implements IResource {
 	public static class ProductIngredient extends BaseElement implements IResourceBlock {
 	
 	@Child(name="item", order=0, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Substance.class,
+		ca.uhn.fhir.model.dstu.resource.Substance.class, 		ca.uhn.fhir.model.dstu.resource.Medication.class	})
-		ca.uhn.fhir.model.dstu.resource.Medication.class,
-	})
 	@Description(
 		shortDefinition="The product contained",
 		formalDefinition="The actual ingredient - either a substance (simple ingredient) or another medication"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationAdministration.java

@@ -173,8 +173,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	private BoundCodeDt<MedicationAdministrationStatusEnum> myStatus;
 	
 	@Child(name="patient", order=2, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who received medication?",
 		formalDefinition="The person or animal to whom the medication was given."
@@ -182,8 +181,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	private ResourceReferenceDt myPatient;
 	
 	@Child(name="practitioner", order=3, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Who administered substance?",
 		formalDefinition="The individual who was responsible for giving the medication to the patient."
@@ -191,8 +189,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	private ResourceReferenceDt myPractitioner;
 	
 	@Child(name="encounter", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Encounter.class,
+		ca.uhn.fhir.model.dstu.resource.Encounter.class	})
-	})
 	@Description(
 		shortDefinition="Encounter administered as part of",
 		formalDefinition="The visit or admission the or other contact between patient and health care provider the medication administration was performed as part of."
@@ -200,8 +197,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	private ResourceReferenceDt myEncounter;
 	
 	@Child(name="prescription", order=5, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.MedicationPrescription.class,
+		ca.uhn.fhir.model.dstu.resource.MedicationPrescription.class	})
-	})
 	@Description(
 		shortDefinition="Order administration performed against",
 		formalDefinition="The original request, instruction or authority to perform the administration."
@@ -230,8 +226,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	private PeriodDt myWhenGiven;
 	
 	@Child(name="medication", order=9, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Medication.class,
+		ca.uhn.fhir.model.dstu.resource.Medication.class	})
-	})
 	@Description(
 		shortDefinition="What was administered?",
 		formalDefinition="Identifies the medication that was administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications."
@@ -239,8 +234,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	private ResourceReferenceDt myMedication;
 	
 	@Child(name="device", order=10, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Device.class,
+		ca.uhn.fhir.model.dstu.resource.Device.class	})
-	})
 	@Description(
 		shortDefinition="Device used to administer",
 		formalDefinition="The device used in administering the medication to the patient.  E.g. a particular infusion pump"
@@ -816,9 +810,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	public static class Dosage extends BaseElement implements IResourceBlock {
 	
 	@Child(name="timing", order=0, min=0, max=1, type={
-		DateTimeDt.class,
+		DateTimeDt.class, 		PeriodDt.class	})
-		PeriodDt.class,
-	})
 	@Description(
 		shortDefinition="When dose(s) were given",
 		formalDefinition="The timing schedule for giving the medication to the patient.  This may be a single time point (using dateTime) or it may be a start and end dateTime (Period)"
@@ -826,9 +818,7 @@ public class MedicationAdministration extends BaseResource implements IResource
 	private IDatatype myTiming;
 	
 	@Child(name="asNeeded", order=1, min=0, max=1, type={
-		BooleanDt.class,
+		BooleanDt.class, 		CodeableConceptDt.class	})
-		CodeableConceptDt.class,
-	})
 	@Description(
 		shortDefinition="Take \"as needed\" f(or x)",
 		formalDefinition="If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose.  If a CodeableConcept is present, it indicates the pre-condition for taking the Medication"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationDispense.java

@@ -196,8 +196,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	private BoundCodeDt<MedicationDispenseStatusEnum> myStatus;
 	
 	@Child(name="patient", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who the dispense is for",
 		formalDefinition="A link to a resource representing the person to whom the medication will be given."
@@ -205,8 +204,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	private ResourceReferenceDt myPatient;
 	
 	@Child(name="dispenser", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Practitioner responsible for dispensing medication",
 		formalDefinition="The individual responsible for dispensing the medication"
@@ -214,8 +212,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	private ResourceReferenceDt myDispenser;
 	
 	@Child(name="authorizingPrescription", order=4, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.MedicationPrescription.class,
+		ca.uhn.fhir.model.dstu.resource.MedicationPrescription.class	})
-	})
 	@Description(
 		shortDefinition="Medication order that authorizes the dispense",
 		formalDefinition="Indicates the medication order that is being dispensed against."
@@ -590,8 +587,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	private QuantityDt myQuantity;
 	
 	@Child(name="medication", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Medication.class,
+		ca.uhn.fhir.model.dstu.resource.Medication.class	})
-	})
 	@Description(
 		shortDefinition="What medication was supplied",
 		formalDefinition="Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications."
@@ -613,8 +609,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	private DateTimeDt myWhenHandedOver;
 	
 	@Child(name="destination", order=7, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="Where the medication was sent",
 		formalDefinition="Identification of the facility/location where the medication was shipped to, as part of the dispense event."
@@ -622,9 +617,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	private ResourceReferenceDt myDestination;
 	
 	@Child(name="receiver", order=8, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-	})
 	@Description(
 		shortDefinition="Who collected the medication",
 		formalDefinition="Identifies the person who picked up the medication.  This will usually be a patient or their carer, but some cases exist where it can be a healthcare professional"
@@ -1168,10 +1161,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	private CodeableConceptDt myAdditionalInstructions;
 	
 	@Child(name="timing", order=1, min=0, max=1, type={
-		DateTimeDt.class,
+		DateTimeDt.class, 		PeriodDt.class, 		ScheduleDt.class	})
-		PeriodDt.class,
-		ScheduleDt.class,
-	})
 	@Description(
 		shortDefinition="When medication should be administered",
 		formalDefinition="The timing schedule for giving the medication to the patient.  The Schedule data type allows many different expressions, for example.  \"Every  8 hours\"; \"Three times a day\"; \"1/2 an hour before breakfast for 10 days from 23-Dec 2011:\";  \"15 Oct 2013, 17 Oct 2013 and 1 Nov 2013\""
@@ -1179,9 +1169,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	private IDatatype myTiming;
 	
 	@Child(name="asNeeded", order=2, min=0, max=1, type={
-		BooleanDt.class,
+		BooleanDt.class, 		CodeableConceptDt.class	})
-		CodeableConceptDt.class,
-	})
 	@Description(
 		shortDefinition="Take \"as needed\" f(or x)",
 		formalDefinition="If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose.  If a CodeableConcept is present, it indicates the pre-condition for taking the Medication"
@@ -1602,8 +1590,7 @@ public class MedicationDispense extends BaseResource implements IResource {
 	private java.util.List<CodeableConceptDt> myReason;
 	
 	@Child(name="responsibleParty", order=2, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Who is responsible for the substitution",
 		formalDefinition="The person or organization that has primary responsibility for the substitution"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationPrescription.java

@@ -156,8 +156,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	private BoundCodeDt<MedicationPrescriptionStatusEnum> myStatus;
 	
 	@Child(name="patient", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who prescription is for",
 		formalDefinition="A link to a resource representing the person to whom the medication will be given."
@@ -165,8 +164,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	private ResourceReferenceDt myPatient;
 	
 	@Child(name="prescriber", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Who ordered the medication(s)",
 		formalDefinition="The healthcare professional responsible for authorizing the prescription"
@@ -174,8 +172,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	private ResourceReferenceDt myPrescriber;
 	
 	@Child(name="encounter", order=5, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Encounter.class,
+		ca.uhn.fhir.model.dstu.resource.Encounter.class	})
-	})
 	@Description(
 		shortDefinition="Created during encounter / admission / stay",
 		formalDefinition="A link to a resource that identifies the particular occurrence of contact between patient and health care provider."
@@ -183,9 +180,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	private ResourceReferenceDt myEncounter;
 	
 	@Child(name="reason", order=6, min=0, max=1, type={
-		CodeableConceptDt.class,
+		CodeableConceptDt.class, 		Condition.class	})
-		Condition.class,
-	})
 	@Description(
 		shortDefinition="Reason or indication for writing the prescription",
 		formalDefinition="Can be the reason or the indication for writing the prescription."
@@ -193,8 +188,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	private IDatatype myReason;
 	
 	@Child(name="medication", order=7, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Medication.class,
+		ca.uhn.fhir.model.dstu.resource.Medication.class	})
-	})
 	@Description(
 		shortDefinition="Medication to be taken",
 		formalDefinition="Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications."
@@ -735,10 +729,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	private CodeableConceptDt myAdditionalInstructions;
 	
 	@Child(name="timing", order=2, min=0, max=1, type={
-		DateTimeDt.class,
+		DateTimeDt.class, 		PeriodDt.class, 		ScheduleDt.class	})
-		PeriodDt.class,
-		ScheduleDt.class,
-	})
 	@Description(
 		shortDefinition="When medication should be administered",
 		formalDefinition="The timing schedule for giving the medication to the patient.  The Schedule data type allows many different expressions, for example.  \"Every  8 hours\"; \"Three times a day\"; \"1/2 an hour before breakfast for 10 days from 23-Dec 2011:\";  \"15 Oct 2013, 17 Oct 2013 and 1 Nov 2013\""
@@ -746,9 +737,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	private IDatatype myTiming;
 	
 	@Child(name="asNeeded", order=3, min=0, max=1, type={
-		BooleanDt.class,
+		BooleanDt.class, 		CodeableConceptDt.class	})
-		CodeableConceptDt.class,
-	})
 	@Description(
 		shortDefinition="Take \"as needed\" f(or x)",
 		formalDefinition="If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose.  If a CodeableConcept is present, it indicates the pre-condition for taking the Medication"
@@ -1198,8 +1187,7 @@ public class MedicationPrescription extends BaseResource implements IResource {
 	public static class Dispense extends BaseElement implements IResourceBlock {
 	
 	@Child(name="medication", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Medication.class,
+		ca.uhn.fhir.model.dstu.resource.Medication.class	})
-	})
 	@Description(
 		shortDefinition="Product to be supplied",
 		formalDefinition="Identifies the medication that is to be dispensed.  This may be a more specifically defined than the medicationPrescription.medication . This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications."

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MedicationStatement.java

@@ -123,8 +123,7 @@ public class MedicationStatement extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="patient", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who was/is taking medication",
 		formalDefinition="The person or animal who is /was taking the medication."
@@ -153,8 +152,7 @@ public class MedicationStatement extends BaseResource implements IResource {
 	private PeriodDt myWhenGiven;
 	
 	@Child(name="medication", order=5, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Medication.class,
+		ca.uhn.fhir.model.dstu.resource.Medication.class	})
-	})
 	@Description(
 		shortDefinition="What medication was taken?",
 		formalDefinition="Identifies the medication being administered. This is either a link to a resource representing the details of the medication or a simple attribute carrying a code that identifies the medication from a known list of medications."
@@ -162,8 +160,7 @@ public class MedicationStatement extends BaseResource implements IResource {
 	private ResourceReferenceDt myMedication;
 	
 	@Child(name="device", order=6, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Device.class,
+		ca.uhn.fhir.model.dstu.resource.Device.class	})
-	})
 	@Description(
 		shortDefinition="E.g. infusion pump",
 		formalDefinition="An identifier or a link to a resource that identifies a device used in administering the medication to the patient."
@@ -609,9 +606,7 @@ public class MedicationStatement extends BaseResource implements IResource {
 	private ScheduleDt myTiming;
 	
 	@Child(name="asNeeded", order=1, min=0, max=1, type={
-		BooleanDt.class,
+		BooleanDt.class, 		CodeableConceptDt.class	})
-		CodeableConceptDt.class,
-	})
 	@Description(
 		shortDefinition="Take \"as needed\" f(or x)",
 		formalDefinition="If set to true or if specified as a CodeableConcept, indicates that the medication is only taken when needed within the specified schedule rather than at every scheduled dose.  If a CodeableConcept is present, it indicates the pre-condition for taking the Medication"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/MessageHeader.java

@@ -110,8 +110,7 @@ public class MessageHeader extends BaseResource implements IResource {
 	private java.util.List<Destination> myDestination;
 	
 	@Child(name="enterer", order=6, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="The source of the data entry",
 		formalDefinition="The person or device that performed the data entry leading to this message. Where there is more than one candidate, pick the most proximal to the message. Can provide other enterers in extensions"
@@ -119,8 +118,7 @@ public class MessageHeader extends BaseResource implements IResource {
 	private ResourceReferenceDt myEnterer;
 	
 	@Child(name="author", order=7, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="The source of the decision",
 		formalDefinition="The logical author of the message - the person or device that decided the described event should happen. Where there is more than one candidate, pick the most proximal to the MessageHeader. Can provide other authors in extensions"
@@ -128,9 +126,7 @@ public class MessageHeader extends BaseResource implements IResource {
 	private ResourceReferenceDt myAuthor;
 	
 	@Child(name="receiver", order=8, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
-	})
 	@Description(
 		shortDefinition="Intended \"real-world\" recipient for the data",
 		formalDefinition="Allows data conveyed by a message to be addressed to a particular person or department when routing to a specific application isn't sufficient."
@@ -138,9 +134,7 @@ public class MessageHeader extends BaseResource implements IResource {
 	private ResourceReferenceDt myReceiver;
 	
 	@Child(name="responsible", order=9, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
-	})
 	@Description(
 		shortDefinition="Final responsibility for event",
 		formalDefinition="The person or organization that accepts overall responsibility for the contents of the message. The implication is that the message event happened under the policies of the responsible party"
@@ -155,8 +149,7 @@ public class MessageHeader extends BaseResource implements IResource {
 	private CodeableConceptDt myReason;
 	
 	@Child(name="data", order=11, min=0, max=Child.MAX_UNLIMITED, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="The actual content of the message",
 		formalDefinition="The actual data of the message - a reference to the root/focus class of the event."
@@ -652,8 +645,7 @@ public class MessageHeader extends BaseResource implements IResource {
 	private BoundCodeDt<ResponseTypeEnum> myCode;
 	
 	@Child(name="details", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.OperationOutcome.class,
+		ca.uhn.fhir.model.dstu.resource.OperationOutcome.class	})
-	})
 	@Description(
 		shortDefinition="Specific list of hints/warnings/errors",
 		formalDefinition="Full details of any issues found in the message"
@@ -1091,8 +1083,7 @@ public class MessageHeader extends BaseResource implements IResource {
 	private StringDt myName;
 	
 	@Child(name="target", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Device.class,
+		ca.uhn.fhir.model.dstu.resource.Device.class	})
-	})
 	@Description(
 		shortDefinition="Particular delivery destination within the destination",
 		formalDefinition="Identifies the target end system in situations where the initial message transmission is to an intermediary system."

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Microarray.java

@@ -101,8 +101,7 @@ public class Microarray extends BaseResource implements IResource {
 	private java.util.List<Subject> mySubject;
 	
 	@Child(name="organization", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Organization",
 		formalDefinition="Organization that does the microarray"
@@ -397,8 +396,7 @@ public class Microarray extends BaseResource implements IResource {
 	public static class Subject extends BaseElement implements IResourceBlock {
 	
 	@Child(name="patient", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Resource that corresponds to the subject",
 		formalDefinition="Resource that corresponds to the subject"
@@ -553,8 +551,7 @@ public class Microarray extends BaseResource implements IResource {
 	public static class Scanner extends BaseElement implements IResourceBlock {
 	
 	@Child(name="manufacturer", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Scanner manufacturer",
 		formalDefinition="Manufactuerer of the scanner"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Observation.java

@@ -236,14 +236,7 @@ public class Observation extends BaseResource implements IResource {
 	private CodeableConceptDt myName;
 	
 	@Child(name="value", order=1, min=0, max=1, type={
-		QuantityDt.class,
+		QuantityDt.class, 		CodeableConceptDt.class, 		AttachmentDt.class, 		RatioDt.class, 		PeriodDt.class, 		SampledDataDt.class, 		StringDt.class	})
-		CodeableConceptDt.class,
-		AttachmentDt.class,
-		RatioDt.class,
-		PeriodDt.class,
-		SampledDataDt.class,
-		StringDt.class,
-	})
 	@Description(
 		shortDefinition="Actual result",
 		formalDefinition="The information determined as a result of making the observation, if the information has a simple value"
@@ -265,9 +258,7 @@ public class Observation extends BaseResource implements IResource {
 	private StringDt myComments;
 	
 	@Child(name="applies", order=4, min=0, max=1, type={
-		DateTimeDt.class,
+		DateTimeDt.class, 		PeriodDt.class	})
-		PeriodDt.class,
-	})
 	@Description(
 		shortDefinition="Physiologically Relevant time/time-period for observation",
 		formalDefinition="The time or time-period the observed value is asserted as being true. For biological subjects - e.g. human patients - this is usually called the \"physiologically relevant time\". This is usually either the time of the procedure or of specimen collection, but very often the source of the date/time is not known, only the date/time itself"
@@ -317,11 +308,7 @@ public class Observation extends BaseResource implements IResource {
 	private IdentifierDt myIdentifier;
 	
 	@Child(name="subject", order=11, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Group.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Location.class	})
-		ca.uhn.fhir.model.dstu.resource.Group.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Location.class,
-	})
 	@Description(
 		shortDefinition="Who and/or what this is about",
 		formalDefinition="The thing the observation is being made about"
@@ -329,8 +316,7 @@ public class Observation extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="specimen", order=12, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Specimen.class,
+		ca.uhn.fhir.model.dstu.resource.Specimen.class	})
-	})
 	@Description(
 		shortDefinition="Specimen used for this observation",
 		formalDefinition="The specimen that was used when this observation was made"
@@ -338,10 +324,7 @@ public class Observation extends BaseResource implements IResource {
 	private ResourceReferenceDt mySpecimen;
 	
 	@Child(name="performer", order=13, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
-	})
 	@Description(
 		shortDefinition="Who did the observation",
 		formalDefinition="Who was responsible for asserting the observed value as \"true\""
@@ -1343,8 +1326,7 @@ public class Observation extends BaseResource implements IResource {
 	private BoundCodeDt<ObservationRelationshipTypeEnum> myType;
 	
 	@Child(name="target", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Observation.class,
+		ca.uhn.fhir.model.dstu.resource.Observation.class	})
-	})
 	@Description(
 		shortDefinition="Observation that is related to this one",
 		formalDefinition="A reference to the observation that is related to this observation"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Order.java

@@ -158,8 +158,7 @@ public class Order extends BaseResource implements IResource {
 	private DateTimeDt myDate;
 	
 	@Child(name="subject", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Patient this order is about",
 		formalDefinition=""
@@ -167,8 +166,7 @@ public class Order extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="source", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Who initiated the order",
 		formalDefinition=""
@@ -176,10 +174,7 @@ public class Order extends BaseResource implements IResource {
 	private ResourceReferenceDt mySource;
 	
 	@Child(name="target", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-	})
 	@Description(
 		shortDefinition="Who is intended to fulfill the order",
 		formalDefinition=""
@@ -187,9 +182,7 @@ public class Order extends BaseResource implements IResource {
 	private ResourceReferenceDt myTarget;
 	
 	@Child(name="reason", order=5, min=0, max=1, type={
-		CodeableConceptDt.class,
+		CodeableConceptDt.class, 		IResource.class	})
-		IResource.class,
-	})
 	@Description(
 		shortDefinition="Text - why the order was made",
 		formalDefinition=""
@@ -197,8 +190,7 @@ public class Order extends BaseResource implements IResource {
 	private IDatatype myReason;
 	
 	@Child(name="authority", order=6, min=0, max=1, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="If required by policy",
 		formalDefinition=""
@@ -213,8 +205,7 @@ public class Order extends BaseResource implements IResource {
 	private When myWhen;
 	
 	@Child(name="detail", order=8, min=1, max=Child.MAX_UNLIMITED, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="What action is being ordered",
 		formalDefinition=""

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/OrderResponse.java

@@ -121,8 +121,7 @@ public class OrderResponse extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="request", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Order.class,
+		ca.uhn.fhir.model.dstu.resource.Order.class	})
-	})
 	@Description(
 		shortDefinition="The order that this is a response to",
 		formalDefinition="A reference to the order that this is in response to"
@@ -137,10 +136,7 @@ public class OrderResponse extends BaseResource implements IResource {
 	private DateTimeDt myDate;
 	
 	@Child(name="who", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Organization.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="Who made the response",
 		formalDefinition="The person, organization, or device credited with making the response"
@@ -148,9 +144,7 @@ public class OrderResponse extends BaseResource implements IResource {
 	private ResourceReferenceDt myWho;
 	
 	@Child(name="authority", order=4, min=0, max=1, type={
-		CodeableConceptDt.class,
+		CodeableConceptDt.class, 		IResource.class	})
-		IResource.class,
-	})
 	@Description(
 		shortDefinition="If required by policy",
 		formalDefinition="A reference to an authority policy that is the reason for the response. Usually this is used when the order is rejected, to provide a reason for rejection"
@@ -172,8 +166,7 @@ public class OrderResponse extends BaseResource implements IResource {
 	private StringDt myDescription;
 	
 	@Child(name="fulfillment", order=7, min=0, max=Child.MAX_UNLIMITED, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="Details of the outcome of performing the order",
 		formalDefinition="Links to resources that provide details of the outcome of performing the order. E.g. Diagnostic Reports in a response that is made to an order that referenced a diagnostic order"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Organization.java

@@ -172,8 +172,7 @@ public class Organization extends BaseResource implements IResource {
 	private java.util.List<AddressDt> myAddress;
 	
 	@Child(name="partOf", order=5, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="The organization of which this organization forms a part",
 		formalDefinition="The organization of which this organization forms a part"
@@ -188,8 +187,7 @@ public class Organization extends BaseResource implements IResource {
 	private java.util.List<Contact> myContact;
 	
 	@Child(name="location", order=7, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="Location(s) the organization uses to provide services",
 		formalDefinition="Location(s) the organization uses to provide services"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Other.java

@@ -103,8 +103,7 @@ public class Other extends BaseResource implements IResource {
 	private CodeableConceptDt myCode;
 	
 	@Child(name="subject", order=2, min=0, max=1, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="Identifies the",
 		formalDefinition="Identifies the patient, practitioner, device or any other resource that is the \"focus\" of this resoruce."
@@ -112,10 +111,7 @@ public class Other extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="author", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="Who created",
 		formalDefinition="Indicates who was responsible for creating the resource instance"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Patient.java

@@ -261,9 +261,7 @@ public class Patient extends BaseResource implements IResource {
 	private DateTimeDt myBirthDate;
 	
 	@Child(name="deceased", order=5, min=0, max=1, type={
-		BooleanDt.class,
+		BooleanDt.class, 		DateTimeDt.class	})
-		DateTimeDt.class,
-	})
 	@Description(
 		shortDefinition="Indicates if the individual is deceased or not",
 		formalDefinition="Indicates if the individual is deceased or not"
@@ -285,9 +283,7 @@ public class Patient extends BaseResource implements IResource {
 	private BoundCodeableConceptDt<MaritalStatusCodesEnum> myMaritalStatus;
 	
 	@Child(name="multipleBirth", order=8, min=0, max=1, type={
-		BooleanDt.class,
+		BooleanDt.class, 		IntegerDt.class	})
-		IntegerDt.class,
-	})
 	@Description(
 		shortDefinition="Whether patient is part of a multiple birth",
 		formalDefinition="Indicates whether the patient is part of a multiple or indicates the actual birth order."
@@ -323,9 +319,7 @@ public class Patient extends BaseResource implements IResource {
 	private java.util.List<CodeableConceptDt> myCommunication;
 	
 	@Child(name="careProvider", order=13, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class, 		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-	})
 	@Description(
 		shortDefinition="Patient's nominated care provider",
 		formalDefinition="Patient's nominated care provider"
@@ -333,8 +327,7 @@ public class Patient extends BaseResource implements IResource {
 	private java.util.List<ResourceReferenceDt> myCareProvider;
 	
 	@Child(name="managingOrganization", order=14, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Organization that is the custodian of the patient record",
 		formalDefinition="Organization that is the custodian of the patient record"
@@ -1282,8 +1275,7 @@ public class Patient extends BaseResource implements IResource {
 	private BoundCodeableConceptDt<AdministrativeGenderCodesEnum> myGender;
 	
 	@Child(name="organization", order=5, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Organization that is associated with the contact",
 		formalDefinition="Organization on behalf of which the contact is acting or for which the contact is working."
@@ -1737,8 +1729,7 @@ public class Patient extends BaseResource implements IResource {
 	public static class Link extends BaseElement implements IResourceBlock {
 	
 	@Child(name="other", order=0, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="The other patient resource that the link refers to",
 		formalDefinition="The other patient resource that the link refers to"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Practitioner.java

@@ -210,8 +210,7 @@ public class Practitioner extends BaseResource implements IResource {
 	private java.util.List<AttachmentDt> myPhoto;
 	
 	@Child(name="organization", order=7, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="The represented organization",
 		formalDefinition="The organization that the practitioner represents"
@@ -240,8 +239,7 @@ public class Practitioner extends BaseResource implements IResource {
 	private PeriodDt myPeriod;
 	
 	@Child(name="location", order=11, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="The location(s) at which this practitioner provides care",
 		formalDefinition="The location(s) at which this practitioner provides care"
@@ -1023,8 +1021,7 @@ public class Practitioner extends BaseResource implements IResource {
 	private PeriodDt myPeriod;
 	
 	@Child(name="issuer", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Organization.class,
+		ca.uhn.fhir.model.dstu.resource.Organization.class	})
-	})
 	@Description(
 		shortDefinition="Organization that regulates and issues the qualification",
 		formalDefinition="Organization that regulates and issues the qualification"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Procedure.java

@@ -101,8 +101,7 @@ public class Procedure extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="subject", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Who procedure was performed on",
 		formalDefinition="The person on whom the procedure was performed"
@@ -145,8 +144,7 @@ public class Procedure extends BaseResource implements IResource {
 	private PeriodDt myDate;
 	
 	@Child(name="encounter", order=7, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Encounter.class,
+		ca.uhn.fhir.model.dstu.resource.Encounter.class	})
-	})
 	@Description(
 		shortDefinition="The encounter when procedure performed",
 		formalDefinition="The encounter during which the procedure was performed"
@@ -161,8 +159,7 @@ public class Procedure extends BaseResource implements IResource {
 	private StringDt myOutcome;
 	
 	@Child(name="report", order=9, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.DiagnosticReport.class,
+		ca.uhn.fhir.model.dstu.resource.DiagnosticReport.class	})
-	})
 	@Description(
 		shortDefinition="Any report that results from the procedure",
 		formalDefinition="This could be a histology result. There could potentially be multiple reports - e.g. if this was a procedure that made multiple biopsies"
@@ -921,8 +918,7 @@ public class Procedure extends BaseResource implements IResource {
 	public static class Performer extends BaseElement implements IResourceBlock {
 	
 	@Child(name="person", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="The reference to the practitioner",
 		formalDefinition="The practitioner who was involved in the procedure"
@@ -1037,23 +1033,7 @@ public class Procedure extends BaseResource implements IResource {
 	private BoundCodeDt<ProcedureRelationshipTypeEnum> myType;
 	
 	@Child(name="target", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.AdverseReaction.class,
+		ca.uhn.fhir.model.dstu.resource.AdverseReaction.class, 		ca.uhn.fhir.model.dstu.resource.AllergyIntolerance.class, 		ca.uhn.fhir.model.dstu.resource.CarePlan.class, 		ca.uhn.fhir.model.dstu.resource.Condition.class, 		ca.uhn.fhir.model.dstu.resource.DeviceObservationReport.class, 		ca.uhn.fhir.model.dstu.resource.DiagnosticReport.class, 		ca.uhn.fhir.model.dstu.resource.FamilyHistory.class, 		ca.uhn.fhir.model.dstu.resource.ImagingStudy.class, 		ca.uhn.fhir.model.dstu.resource.Immunization.class, 		ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation.class, 		ca.uhn.fhir.model.dstu.resource.MedicationAdministration.class, 		ca.uhn.fhir.model.dstu.resource.MedicationDispense.class, 		ca.uhn.fhir.model.dstu.resource.MedicationPrescription.class, 		ca.uhn.fhir.model.dstu.resource.MedicationStatement.class, 		ca.uhn.fhir.model.dstu.resource.Observation.class, 		ca.uhn.fhir.model.dstu.resource.Procedure.class	})
-		ca.uhn.fhir.model.dstu.resource.AllergyIntolerance.class,
-		ca.uhn.fhir.model.dstu.resource.CarePlan.class,
-		ca.uhn.fhir.model.dstu.resource.Condition.class,
-		ca.uhn.fhir.model.dstu.resource.DeviceObservationReport.class,
-		ca.uhn.fhir.model.dstu.resource.DiagnosticReport.class,
-		ca.uhn.fhir.model.dstu.resource.FamilyHistory.class,
-		ca.uhn.fhir.model.dstu.resource.ImagingStudy.class,
-		ca.uhn.fhir.model.dstu.resource.Immunization.class,
-		ca.uhn.fhir.model.dstu.resource.ImmunizationRecommendation.class,
-		ca.uhn.fhir.model.dstu.resource.MedicationAdministration.class,
-		ca.uhn.fhir.model.dstu.resource.MedicationDispense.class,
-		ca.uhn.fhir.model.dstu.resource.MedicationPrescription.class,
-		ca.uhn.fhir.model.dstu.resource.MedicationStatement.class,
-		ca.uhn.fhir.model.dstu.resource.Observation.class,
-		ca.uhn.fhir.model.dstu.resource.Procedure.class,
-	})
 	@Description(
 		shortDefinition="The related item - e.g. a procedure",
 		formalDefinition=""

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Profile.java

@@ -3730,9 +3730,7 @@ public class Profile extends BaseResource implements IResource {
 	private StringDt myDescription;
 	
 	@Child(name="reference", order=4, min=0, max=1, type={
-		UriDt.class,
+		UriDt.class, 		ValueSet.class	})
-		ValueSet.class,
-	})
 	@Description(
 		shortDefinition="Source of value set",
 		formalDefinition="Points to the value set or external definition that identifies the set of codes to be used"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Provenance.java

@@ -127,8 +127,7 @@ public class Provenance extends BaseResource implements IResource {
 
 
 	@Child(name="target", order=0, min=1, max=Child.MAX_UNLIMITED, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="Target resource(s) (usually version specific)",
 		formalDefinition="The resource(s) that were generated by  the activity described in this resource. A provenance can point to more than one target if multiple resources were created/updated by the same activity"
@@ -157,8 +156,7 @@ public class Provenance extends BaseResource implements IResource {
 	private CodeableConceptDt myReason;
 	
 	@Child(name="location", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="Where the activity occurred, if relevant",
 		formalDefinition="Where the activity occurred, if relevant"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Query.java

@@ -321,8 +321,7 @@ public class Query extends BaseResource implements IResource {
 	private java.util.List<ExtensionDt> myLast;
 	
 	@Child(name="reference", order=8, min=0, max=Child.MAX_UNLIMITED, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="Resources that are the results of the search",
 		formalDefinition=""

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Questionnaire.java

@@ -160,9 +160,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	private DateTimeDt myAuthored;
 	
 	@Child(name="subject", order=2, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="The subject of the questions",
 		formalDefinition="The subject of the questionnaires: this is the patient that the answers apply to, but this person is not necessarily the source of information"
@@ -170,10 +168,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	private ResourceReferenceDt mySubject;
 	
 	@Child(name="author", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="Person who received and recorded the answers",
 		formalDefinition="Person who received the answers to the questions in the Questionnaire and recorded them in the system"
@@ -181,10 +176,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	private ResourceReferenceDt myAuthor;
 	
 	@Child(name="source", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="The person who answered the questions",
 		formalDefinition="The person who answered the questions about the subject. Only used when this is not the subject him/herself"
@@ -206,8 +198,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="encounter", order=7, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Encounter.class,
+		ca.uhn.fhir.model.dstu.resource.Encounter.class	})
-	})
 	@Description(
 		shortDefinition="Primary encounter during which the answers were collected",
 		formalDefinition="Encounter during which this questionnaire answers were collected. When there were multiple encounters, this is the one considered most relevant to the context of the answers."
@@ -657,8 +648,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	private StringDt myText;
 	
 	@Child(name="subject", order=3, min=0, max=1, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="The subject this group's answers are about",
 		formalDefinition="More specific subject this section's answers are about, details the subject given in Questionnaire"
@@ -1007,14 +997,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	private StringDt myText;
 	
 	@Child(name="answer", order=2, min=0, max=1, type={
-		DecimalDt.class,
+		DecimalDt.class, 		IntegerDt.class, 		BooleanDt.class, 		DateDt.class, 		StringDt.class, 		DateTimeDt.class, 		InstantDt.class	})
-		IntegerDt.class,
-		BooleanDt.class,
-		DateDt.class,
-		StringDt.class,
-		DateTimeDt.class,
-		InstantDt.class,
-	})
 	@Description(
 		shortDefinition="Single-valued answer to the question",
 		formalDefinition="Single-valued answer to the question"
@@ -1029,8 +1012,7 @@ public class Questionnaire extends BaseResource implements IResource {
 	private java.util.List<CodingDt> myChoice;
 	
 	@Child(name="options", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.ValueSet.class,
+		ca.uhn.fhir.model.dstu.resource.ValueSet.class	})
-	})
 	@Description(
 		shortDefinition="Valueset containing the possible options",
 		formalDefinition="Reference to a valueset containing the possible options"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/RelatedPerson.java

@@ -140,8 +140,7 @@ public class RelatedPerson extends BaseResource implements IResource {
 	private java.util.List<IdentifierDt> myIdentifier;
 	
 	@Child(name="patient", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="The patient this person is related to",
 		formalDefinition="The patient this person is related to"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SecurityEvent.java

@@ -823,10 +823,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	private java.util.List<CodeableConceptDt> myRole;
 	
 	@Child(name="reference", order=1, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="Direct reference to resource",
 		formalDefinition="Direct reference to a resource that identifies the participant"
@@ -1573,8 +1570,7 @@ public class SecurityEvent extends BaseResource implements IResource {
 	private IdentifierDt myIdentifier;
 	
 	@Child(name="reference", order=1, min=0, max=1, type={
-		IResource.class,
+		IResource.class	})
-	})
 	@Description(
 		shortDefinition="Specific instance of resource (e.g. versioned)",
 		formalDefinition="Identifies a specific instance of the participant object. The reference should always be version specific"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingAnalysis.java

@@ -92,8 +92,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
 
 
 	@Child(name="subject", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Subject",
 		formalDefinition="Subject of the analysis"
@@ -129,8 +128,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
 	private java.util.List<AttachmentDt> myFile;
 	
 	@Child(name="inputLab", order=5, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.SequencingLab.class,
+		ca.uhn.fhir.model.dstu.resource.SequencingLab.class	})
-	})
 	@Description(
 		shortDefinition="Input lab",
 		formalDefinition="SequencingLab taken into account of the analysis"
@@ -138,8 +136,7 @@ public class SequencingAnalysis extends BaseResource implements IResource {
 	private java.util.List<ResourceReferenceDt> myInputLab;
 	
 	@Child(name="inputAnalysis", order=6, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.SequencingAnalysis.class,
+		ca.uhn.fhir.model.dstu.resource.SequencingAnalysis.class	})
-	})
 	@Description(
 		shortDefinition="Input analysis",
 		formalDefinition="SequencingAnalysis taken into account of the analysis"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/SequencingLab.java

@@ -123,8 +123,7 @@ public class SequencingLab extends BaseResource implements IResource {
 
 
 	@Child(name="subject", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Subject",
 		formalDefinition="Subject of the sequencing lab"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Slot.java

@@ -116,8 +116,7 @@ public class Slot extends BaseResource implements IResource {
 	private CodeableConceptDt myType;
 	
 	@Child(name="availability", order=2, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Availability.class,
+		ca.uhn.fhir.model.dstu.resource.Availability.class	})
-	})
 	@Description(
 		shortDefinition="The availability resource that this slot defines an interval of status information",
 		formalDefinition=""
@@ -153,10 +152,7 @@ public class Slot extends BaseResource implements IResource {
 	private StringDt myComment;
 	
 	@Child(name="author", order=7, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class, 		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class	})
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
-		ca.uhn.fhir.model.dstu.resource.RelatedPerson.class,
-	})
 	@Description(
 		shortDefinition="Who authored the slot",
 		formalDefinition=""

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Specimen.java

@@ -104,11 +104,7 @@ public class Specimen extends BaseResource implements IResource {
 	private java.util.List<Source> mySource;
 	
 	@Child(name="subject", order=3, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class, 		ca.uhn.fhir.model.dstu.resource.Group.class, 		ca.uhn.fhir.model.dstu.resource.Device.class, 		ca.uhn.fhir.model.dstu.resource.Substance.class	})
-		ca.uhn.fhir.model.dstu.resource.Group.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-		ca.uhn.fhir.model.dstu.resource.Substance.class,
-	})
 	@Description(
 		shortDefinition="Where the specimen came from. This may be the patient(s) or from the environment or  a device",
 		formalDefinition=""
@@ -665,8 +661,7 @@ public class Specimen extends BaseResource implements IResource {
 	private BoundCodeDt<HierarchicalRelationshipTypeEnum> myRelationship;
 	
 	@Child(name="target", order=1, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Specimen.class,
+		ca.uhn.fhir.model.dstu.resource.Specimen.class	})
-	})
 	@Description(
 		shortDefinition="The subject of the relationship",
 		formalDefinition="The specimen resource that is the target of this relationship"
@@ -793,8 +788,7 @@ public class Specimen extends BaseResource implements IResource {
 	public static class Collection extends BaseElement implements IResourceBlock {
 	
 	@Child(name="collector", order=0, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Who collected the specimen",
 		formalDefinition="Person who collected the specimen"
@@ -809,9 +803,7 @@ public class Specimen extends BaseResource implements IResource {
 	private java.util.List<StringDt> myComment;
 	
 	@Child(name="collected", order=2, min=0, max=1, type={
-		DateTimeDt.class,
+		DateTimeDt.class, 		PeriodDt.class	})
-		PeriodDt.class,
-	})
 	@Description(
 		shortDefinition="Collection time",
 		formalDefinition="Time when specimen was collected from subject - the physiologically relevant time"
@@ -1180,8 +1172,7 @@ public class Specimen extends BaseResource implements IResource {
 	private BoundCodeableConceptDt<SpecimenTreatmentProcedureEnum> myProcedure;
 	
 	@Child(name="additive", order=2, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Substance.class,
+		ca.uhn.fhir.model.dstu.resource.Substance.class	})
-	})
 	@Description(
 		shortDefinition="Material used in the processing step",
 		formalDefinition=""
@@ -1387,8 +1378,7 @@ public class Specimen extends BaseResource implements IResource {
 	private QuantityDt mySpecimenQuantity;
 	
 	@Child(name="additive", order=5, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Substance.class,
+		ca.uhn.fhir.model.dstu.resource.Substance.class	})
-	})
 	@Description(
 		shortDefinition="Additive associated with container",
 		formalDefinition="Additive associated with the container"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Substance.java

@@ -608,8 +608,7 @@ public class Substance extends BaseResource implements IResource {
 	private RatioDt myQuantity;
 	
 	@Child(name="substance", order=1, min=1, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Substance.class,
+		ca.uhn.fhir.model.dstu.resource.Substance.class	})
-	})
 	@Description(
 		shortDefinition="A component of the substance",
 		formalDefinition="Another substance that is a component of this substance"

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/Supply.java

@@ -160,10 +160,7 @@ public class Supply extends BaseResource implements IResource {
 	private BoundCodeDt<SupplyStatusEnum> myStatus;
 	
 	@Child(name="orderedItem", order=3, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Medication.class,
+		ca.uhn.fhir.model.dstu.resource.Medication.class, 		ca.uhn.fhir.model.dstu.resource.Substance.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Substance.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="Medication, Substance, or Device requested to be supplied",
 		formalDefinition="The item that is requested to be supplied"
@@ -171,8 +168,7 @@ public class Supply extends BaseResource implements IResource {
 	private ResourceReferenceDt myOrderedItem;
 	
 	@Child(name="patient", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Patient for whom the item is supplied",
 		formalDefinition="A link to a resource representing the person whom the ordered item is for"
@@ -506,10 +502,7 @@ public class Supply extends BaseResource implements IResource {
 	private QuantityDt myQuantity;
 	
 	@Child(name="suppliedItem", order=4, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Medication.class,
+		ca.uhn.fhir.model.dstu.resource.Medication.class, 		ca.uhn.fhir.model.dstu.resource.Substance.class, 		ca.uhn.fhir.model.dstu.resource.Device.class	})
-		ca.uhn.fhir.model.dstu.resource.Substance.class,
-		ca.uhn.fhir.model.dstu.resource.Device.class,
-	})
 	@Description(
 		shortDefinition="Medication, Substance, or Device supplied",
 		formalDefinition="Identifies the medication or substance being dispensed. This is either a link to a resource representing the details of the medication or substance or a simple attribute carrying a code that identifies the medication from a known list of medications."
@@ -517,8 +510,7 @@ public class Supply extends BaseResource implements IResource {
 	private ResourceReferenceDt mySuppliedItem;
 	
 	@Child(name="supplier", order=5, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Dispenser",
 		formalDefinition="The individual responsible for dispensing the medication"
@@ -540,8 +532,7 @@ public class Supply extends BaseResource implements IResource {
 	private PeriodDt myWhenHandedOver;
 	
 	@Child(name="destination", order=8, min=0, max=1, type={
-		ca.uhn.fhir.model.dstu.resource.Location.class,
+		ca.uhn.fhir.model.dstu.resource.Location.class	})
-	})
 	@Description(
 		shortDefinition="Where the Supply was sent",
 		formalDefinition="Identification of the facility/location where the Supply was shipped to, as part of the dispense event."
@@ -549,8 +540,7 @@ public class Supply extends BaseResource implements IResource {
 	private ResourceReferenceDt myDestination;
 	
 	@Child(name="receiver", order=9, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Practitioner.class,
+		ca.uhn.fhir.model.dstu.resource.Practitioner.class	})
-	})
 	@Description(
 		shortDefinition="Who collected the Supply",
 		formalDefinition="Identifies the person who picked up the Supply."

hapi-fhir-base/src/main/java/ca/uhn/fhir/model/dstu/resource/User.java

@@ -158,8 +158,7 @@ public class User extends BaseResource implements IResource {
 	private java.util.List<ContactDt> myContact;
 	
 	@Child(name="patient", order=7, min=0, max=Child.MAX_UNLIMITED, type={
-		ca.uhn.fhir.model.dstu.resource.Patient.class,
+		ca.uhn.fhir.model.dstu.resource.Patient.class	})
-	})
 	@Description(
 		shortDefinition="Patient compartments the user has access to (if level is patient/family)",
 		formalDefinition=""

hapi-fhir-base/src/site/example/java/example/Narrative.java

@@ -1,19 +1,11 @@
 package example;
 
 import java.io.IOException;
-import java.util.List;
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.model.api.ExtensionDt;
-import ca.uhn.fhir.model.dstu.composite.AddressDt;
-import ca.uhn.fhir.model.dstu.composite.HumanNameDt;
 import ca.uhn.fhir.model.dstu.resource.Patient;
-import ca.uhn.fhir.model.dstu.valueset.IdentifierUseEnum;
 import ca.uhn.fhir.model.dstu.valueset.NarrativeStatusEnum;
-import ca.uhn.fhir.model.primitive.DateTimeDt;
-import ca.uhn.fhir.model.primitive.StringDt;
 import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGenerator;
-import ca.uhn.fhir.narrative.DefaultThymeleafNarrativeGeneratorTest;
 import ca.uhn.fhir.parser.DataFormatException;
 
 public class Narrative {

hapi-fhir-base/src/test/java/ca/uhn/fhir/parser/XmlParserTest.java

@@ -1,9 +1,13 @@
 package ca.uhn.fhir.parser;
 
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.*;
+import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.*;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;
@@ -11,9 +15,6 @@ import java.io.StringReader;
 import java.nio.charset.Charset;
 import java.util.List;
 
-import net.sf.json.JSON;
-import net.sf.json.JSONSerializer;
-
 import org.apache.commons.io.IOUtils;
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;

hapi-tinder-plugin/.classpath

@@ -1,168 +1,100 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/*.java" kind="src" path="src/test/resources"/>
+  <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
-	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+  <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
-	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+  <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/hapi-fhir-base"/>
+  <classpathentry kind="output" path="target/classes"/>
-	<classpathentry kind="var" path="M2_REPO/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" sourcepath="M2_REPO/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/javax/json/javax.json-api/1.0/javax.json-api-1.0.jar" sourcepath="M2_REPO/javax/json/javax.json-api/1.0/javax.json-api-1.0-sources.jar"/>
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/javax/enterprise/cdi-api/1.0/cdi-api-1.0-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/javax/inject/javax.inject/1/javax.inject-1-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2.jar" sourcepath="M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/enterprise/cdi-api/1.0/cdi-api-1.0.jar" sourcepath="M2_REPO/javax/enterprise/cdi-api/1.0/cdi-api-1.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar" sourcepath="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/javax/inject/javax.inject/1/javax.inject-1.jar" sourcepath="M2_REPO/javax/inject/javax.inject/1/javax.inject-1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar">
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="var" path="M2_REPO/ca/uhn/hapi/fhir/hapi-fhir-base/0.1/hapi-fhir-base-0.1.jar" sourcepath="M2_REPO/ca/uhn/hapi/fhir/hapi-fhir-base/0.1/hapi-fhir-base-0.1-sources.jar">
     <attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-javadoc.jar!/"/>
+      <attribute value="jar:file:/home/t3903uhn/.m2/repository/ca/uhn/hapi/fhir/hapi-fhir-base/0.1/hapi-fhir-base-0.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-	<classpathentry kind="var" path="M2_REPO/commons-chain/commons-chain/1.1/commons-chain-1.1.jar" sourcepath="M2_REPO/commons-chain/commons-chain/1.1/commons-chain-1.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/glassfish/javax.json/1.0.4/javax.json-1.0.4.jar" sourcepath="M2_REPO/org/glassfish/javax.json/1.0.4/javax.json-1.0.4-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.9/commons-codec-1.9.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.9/commons-codec-1.9-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0.jar" sourcepath="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-sources.jar">
     <attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/commons-codec/commons-codec/1.9/commons-codec-1.9-javadoc.jar!/"/>
+      <attribute value="jar:file:/home/t3903uhn/.m2/repository/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-javadoc.jar!/" name="javadoc_location"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8.jar" sourcepath="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/2.4/commons-io-2.4.jar" sourcepath="M2_REPO/commons-io/commons-io/2.4/commons-io-2.4-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/commons-io/commons-io/2.4/commons-io-2.4-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4-javadoc.jar!/"/>
     </attributes>
   </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar" sourcepath="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.2.1/commons-lang3-3.2.1.jar" sourcepath="M2_REPO/org/apache/commons/commons-lang3/3.2.1/commons-lang3-3.2.1-sources.jar">
     <attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/apache/commons/commons-lang3/3.2.1/commons-lang3-3.2.1-javadoc.jar!/"/>
+      <attribute value="jar:file:/home/t3903uhn/.m2/repository/org/apache/commons/commons-lang3/3.2.1/commons-lang3-3.2.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-	<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.9/commons-codec-1.9.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.9/commons-codec-1.9-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar" sourcepath="M2_REPO/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/2.4/commons-io-2.4.jar" sourcepath="M2_REPO/commons-io/commons-io/2.4/commons-io-2.4-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.1/dom4j-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6-sources.jar">
-	<classpathentry kind="var" path="M2_REPO/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" sourcepath="M2_REPO/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar">
     <attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-javadoc.jar!/"/>
+      <attribute value="jar:file:/home/t3903uhn/.m2/repository/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6-javadoc.jar!/" name="javadoc_location"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1.jar" sourcepath="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/com/google/guava/guava/10.0.1/guava-10.0.1-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.3.3/httpclient-4.3.3-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.3.2/httpcore-4.3.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/org/apache/velocity/velocity/1.7/velocity-1.7.jar" sourcepath="M2_REPO/org/apache/velocity/velocity/1.7/velocity-1.7-sources.jar"/>
-		<attributes>
+  <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"/>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/junit/junit/4.11/junit-4.11-javadoc.jar!/"/>
+  <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar"/>
-		</attributes>
+  <classpathentry kind="var" path="M2_REPO/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar"/>
-	</classpathentry>
+  <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8.jar" sourcepath="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-chain/commons-chain/1.1/commons-chain-1.1.jar" sourcepath="M2_REPO/commons-chain/commons-chain/1.1/commons-chain-1.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar" sourcepath="M2_REPO/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.1/dom4j-1.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar" sourcepath="M2_REPO/oro/oro/2.0.8/oro-2.0.8-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/sslext/sslext/1.2-0/sslext-1.2-0.jar" sourcepath="M2_REPO/sslext/sslext/1.2-0/sslext-1.2-0-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar" sourcepath="M2_REPO/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2.jar" sourcepath="M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar" sourcepath="M2_REPO/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar" sourcepath="M2_REPO/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-classic/1.1.1/logback-classic-1.1.1.jar" sourcepath="M2_REPO/ch/qos/logback/logback-classic/1.1.1/logback-classic-1.1.1-sources.jar">
     <attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/ch/qos/logback/logback-classic/1.1.1/logback-classic-1.1.1-javadoc.jar!/"/>
+      <attribute value="jar:file:/home/t3903uhn/.m2/repository/ch/qos/logback/logback-classic/1.1.1/logback-classic-1.1.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/ch/qos/logback/logback-core/1.1.1/logback-core-1.1.1.jar" sourcepath="M2_REPO/ch/qos/logback/logback-core/1.1.1/logback-core-1.1.1-sources.jar">
     <attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/ch/qos/logback/logback-core/1.1.1/logback-core-1.1.1-javadoc.jar!/"/>
+      <attribute value="jar:file:/home/t3903uhn/.m2/repository/ch/qos/logback/logback-core/1.1.1/logback-core-1.1.1-javadoc.jar!/" name="javadoc_location"/>
     </attributes>
   </classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/3.2.1/maven-artifact-3.2.1.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact/3.2.1/maven-artifact-3.2.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar" sourcepath="M2_REPO/junit/junit/4.11/junit-4.11-sources.jar">
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.jar" sourcepath="M2_REPO/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1-sources.jar"/>
+    <attributes>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/3.2.1/maven-model-3.2.1.jar" sourcepath="M2_REPO/org/apache/maven/maven-model/3.2.1/maven-model-3.2.1-sources.jar"/>
+      <attribute value="jar:file:/home/t3903uhn/.m2/repository/junit/junit/4.11/junit-4.11-javadoc.jar!/" name="javadoc_location"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.jar" sourcepath="M2_REPO/org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2-sources.jar"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar">
+    <attributes>
+      <attribute value="jar:file:/home/t3903uhn/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" name="javadoc_location"/>
+    </attributes>
+  </classpathentry>
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar"/>
+  <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/3.2.1/maven-plugin-api-3.2.1.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/3.2.1/maven-plugin-api-3.2.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.plexus/0.0.0.M5/org.eclipse.sisu.plexus-0.0.0.M5.jar" sourcepath="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.plexus/0.0.0.M5/org.eclipse.sisu.plexus-0.0.0.M5-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1.jar" sourcepath="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1-sources.jar"/>
+  <classpathentry kind="var" path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.jar" sourcepath="M2_REPO/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.inject/0.0.0.M5/org.eclipse.sisu.inject-0.0.0.M5.jar" sourcepath="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.inject/0.0.0.M5/org.eclipse.sisu.inject-0.0.0.M5-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/eclipse/sisu/org.eclipse.sisu.inject/0.0.0.M5/org.eclipse.sisu.inject-0.0.0.M5-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.plexus/0.0.0.M5/org.eclipse.sisu.plexus-0.0.0.M5.jar" sourcepath="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.plexus/0.0.0.M5/org.eclipse.sisu.plexus-0.0.0.M5-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/eclipse/sisu/org.eclipse.sisu.plexus/0.0.0.M5/org.eclipse.sisu.plexus-0.0.0.M5-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/oro/oro/2.0.8/oro-2.0.8.jar" sourcepath="M2_REPO/oro/oro/2.0.8/oro-2.0.8-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/sonatype/sisu/sisu-guice/3.1.0/sisu-guice-3.1.0-no_aop.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6-sources.jar">
+  <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/>
-		<attributes>
+  <classpathentry kind="var" path="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.inject/0.0.0.M5/org.eclipse.sisu.inject-0.0.0.M5.jar" sourcepath="M2_REPO/org/eclipse/sisu/org.eclipse.sisu.inject/0.0.0.M5/org.eclipse.sisu.inject-0.0.0.M5-sources.jar"/>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/slf4j/slf4j-api/1.7.6/slf4j-api-1.7.6-javadoc.jar!/"/>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5-sources.jar"/>
-		</attributes>
+  <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4-sources.jar"/>
-	</classpathentry>
+  <classpathentry kind="var" path="M2_REPO/org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2.jar" sourcepath="M2_REPO/org/apache/maven/plugin-tools/maven-plugin-annotations/3.2/maven-plugin-annotations-3.2-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/sslext/sslext/1.2-0/sslext-1.2-0.jar" sourcepath="M2_REPO/sslext/sslext/1.2-0/sslext-1.2-0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1.jar" sourcepath="M2_REPO/org/codehaus/woodstox/stax2-api/3.1.1/stax2-api-3.1.1-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8.jar" sourcepath="M2_REPO/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/apache/struts/struts-core/1.3.8/struts-core-1.3.8-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8.jar" sourcepath="M2_REPO/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/apache/struts/struts-taglib/1.3.8/struts-taglib-1.3.8-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8.jar" sourcepath="M2_REPO/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/apache/struts/struts-tiles/1.3.8/struts-tiles-1.3.8-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/apache/velocity/velocity/1.7/velocity-1.7.jar" sourcepath="M2_REPO/org/apache/velocity/velocity/1.7/velocity-1.7-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/apache/velocity/velocity/1.7/velocity-1.7-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/apache/velocity/velocity-tools/2.0/velocity-tools-2.0-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0.jar" sourcepath="M2_REPO/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-sources.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="jar:file:/Users/james/.m2/repository/org/codehaus/woodstox/woodstox-core-asl/4.2.0/woodstox-core-asl-4.2.0-javadoc.jar!/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="var" path="M2_REPO/ca/uhn/hapi/fhir/hapi-fhir-base/1.0-SNAPSHOT/hapi-fhir-base-1.0-SNAPSHOT.jar"/>
-	<classpathentry kind="output" path="bin"/>
 </classpath>

hapi-tinder-plugin/.project

@@ -1,9 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
   <name>hapi-tinder-plugin</name>
   <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects>
+  <projects/>
-    <project>hapi-fhir-base</project>
-  </projects>
   <buildSpec>
     <buildCommand>
       <name>org.eclipse.jdt.core.javabuilder</name>

hapi-tinder-plugin/src/main/resources/vm/templates.vm

@@ -8,9 +8,9 @@
 	@Child(name="${child.elementNameSimplified}", order=${foreach.index}, min=${child.cardMin}, max=${child.cardMaxForChildAnnotation}, type={
 #foreach ($nextType in ${child.referenceTypesForMultiple})
 #if ( ${child.resourceRef} && ${nextType} != "IResource" )
-		${nextType}.class,
+		${nextType}.class#{if}($foreach.hasNext), #{end}
 #else
-		${nextType}.class,
+		${nextType}.class#{if}($foreach.hasNext), #{end}
 #end
 #end
 	})