From 5ef88d0447f1255ef8dde2895fafc487e4ce112b Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Thu, 21 Jan 2016 08:49:26 -0500 Subject: [PATCH] Avoid conflict in HL7org-DSTU2 structures --- .../org/hl7/fhir/instance/model/Account.java | 2 +- .../org/hl7/fhir/instance/model/Address.java | 2 +- .../instance/model/AllergyIntolerance.java | 2 +- .../hl7/fhir/instance/model/Appointment.java | 2 +- .../instance/model/AppointmentResponse.java | 2 +- .../hl7/fhir/instance/model/Attachment.java | 2 +- .../hl7/fhir/instance/model/AuditEvent.java | 2 +- .../org/hl7/fhir/instance/model/Base.java | 2 +- .../fhir/instance/model/BaseNarrative.java | 2 +- .../org/hl7/fhir/instance/model/BodySite.java | 2 +- .../org/hl7/fhir/instance/model/Bundle.java | 2 +- .../org/hl7/fhir/instance/model/CarePlan.java | 2 +- .../org/hl7/fhir/instance/model/Claim.java | 2 +- .../fhir/instance/model/ClaimResponse.java | 2 +- .../instance/model/ClinicalImpression.java | 2 +- .../fhir/instance/model/CodeableConcept.java | 2 +- .../org/hl7/fhir/instance/model/Coding.java | 2 +- .../hl7/fhir/instance/model/Comparison.java | 2 +- .../hl7/fhir/instance/model/Composition.java | 2 +- .../hl7/fhir/instance/model/ConceptMap.java | 2 +- .../hl7/fhir/instance/model/Condition.java | 2 +- .../hl7/fhir/instance/model/Conformance.java | 2 +- .../hl7/fhir/instance/model/ContactPoint.java | 2 +- .../org/hl7/fhir/instance/model/Contract.java | 2 +- .../org/hl7/fhir/instance/model/Coverage.java | 2 +- .../hl7/fhir/instance/model/DataElement.java | 2 +- .../fhir/instance/model/DetectedIssue.java | 2 +- .../org/hl7/fhir/instance/model/Device.java | 2 +- .../fhir/instance/model/DeviceComponent.java | 2 +- .../fhir/instance/model/DiagnosticReport.java | 2 +- .../fhir/instance/model/DocumentManifest.java | 2 +- .../instance/model/DocumentReference.java | 2 +- .../org/hl7/fhir/instance/model/Element.java | 2 +- .../instance/model/ElementDefinition.java | 2 +- .../instance/model/EligibilityResponse.java | 2 +- .../instance/model/EnrollmentResponse.java | 2 +- .../instance/model/ExplanationOfBenefit.java | 2 +- .../org/hl7/fhir/instance/model/Factory.java | 4 +-- .../instance/model/FamilyMemberHistory.java | 2 +- .../org/hl7/fhir/instance/model/Group.java | 2 +- .../instance/model/HealthcareService.java | 2 +- .../hl7/fhir/instance/model/HumanName.java | 2 +- .../hl7/fhir/instance/model/Identifier.java | 2 +- .../model/ImagingObjectSelection.java | 2 +- .../hl7/fhir/instance/model/ImagingStudy.java | 2 +- .../hl7/fhir/instance/model/Immunization.java | 2 +- .../model/ImmunizationRecommendation.java | 2 +- .../instance/model/ImplementationGuide.java | 2 +- .../org/hl7/fhir/instance/model/List_.java | 2 +- .../org/hl7/fhir/instance/model/Location.java | 2 +- .../org/hl7/fhir/instance/model/Media.java | 2 +- .../hl7/fhir/instance/model/Medication.java | 2 +- .../model/MedicationAdministration.java | 2 +- .../instance/model/MedicationDispense.java | 2 +- .../fhir/instance/model/MedicationOrder.java | 2 +- .../instance/model/MedicationStatement.java | 2 +- .../fhir/instance/model/MessageHeader.java | 2 +- .../org/hl7/fhir/instance/model/Meta.java | 2 +- .../hl7/fhir/instance/model/NamingSystem.java | 2 +- .../hl7/fhir/instance/model/Narrative.java | 2 +- .../fhir/instance/model/NutritionOrder.java | 2 +- .../hl7/fhir/instance/model/Observation.java | 2 +- .../instance/model/OperationDefinition.java | 2 +- .../fhir/instance/model/OperationOutcome.java | 2 +- .../fhir/instance/model/OrderResponse.java | 2 +- .../hl7/fhir/instance/model/Organization.java | 2 +- .../instance/model/PaymentReconciliation.java | 2 +- .../fhir/instance/model/ProcessRequest.java | 2 +- .../fhir/instance/model/ProcessResponse.java | 2 +- .../hl7/fhir/instance/model/Provenance.java | 2 +- .../org/hl7/fhir/instance/model/Quantity.java | 2 +- .../fhir/instance/model/Questionnaire.java | 2 +- .../instance/model/QuestionnaireResponse.java | 2 +- .../hl7/fhir/instance/model/Reference.java | 2 +- .../fhir/instance/model/ReferralRequest.java | 2 +- .../org/hl7/fhir/instance/model/Resource.java | 2 +- .../fhir/instance/model/RiskAssessment.java | 2 +- .../org/hl7/fhir/instance/model/Schedule.java | 2 +- .../fhir/instance/model/SearchParameter.java | 2 +- .../org/hl7/fhir/instance/model/Slot.java | 2 +- .../org/hl7/fhir/instance/model/Specimen.java | 2 +- .../instance/model/StructureDefinition.java | 2 +- .../hl7/fhir/instance/model/Subscription.java | 2 +- .../hl7/fhir/instance/model/Substance.java | 2 +- .../hl7/fhir/instance/model/TestScript.java | 2 +- .../org/hl7/fhir/instance/model/ValueSet.java | 2 +- .../instance/model/VisionPrescription.java | 2 +- .../terminologies/ValueSetExpanderSimple.java | 2 +- .../terminologies/ValueSetExpansionCache.java | 4 +-- .../fhir/{ => instance}/utilities/CSFile.java | 2 +- .../utilities/CSFileInputStream.java | 2 +- .../CommaSeparatedStringBuilder.java | 2 +- .../utilities/FileNotifier.java | 2 +- .../{ => instance}/utilities/Inflector.java | 2 +- .../utilities/MyURIResolver.java | 2 +- .../utilities/TextStreamWriter.java | 2 +- .../{ => instance}/utilities/Utilities.java | 2 +- .../utilities/ZipURIResolver.java | 2 +- .../xhtml/HeirarchicalTableGenerator.java | 4 +-- .../xhtml/HierarchicalTableGenerator.java | 4 +-- .../utilities/xhtml/NodeType.java | 2 +- .../utilities/xhtml/XhtmlComposer.java | 6 ++-- .../utilities/xhtml/XhtmlDocument.java | 2 +- .../utilities/xhtml/XhtmlNode.java | 2 +- .../utilities/xhtml/XhtmlParser.java | 2 +- .../utilities/xml/IXMLWriter.java | 2 +- .../utilities/xml/SchematronWriter.java | 11 ++++---- .../{ => instance}/utilities/xml/XMLUtil.java | 4 +-- .../fhir/instance/utils/ProfileUtilities.java | 28 +++++++++---------- .../instance/utils/ToolingExtensions.java | 2 +- .../validation/InstanceValidator.java | 6 ++-- .../validation/ValidationMessage.java | 2 +- .../uhn/fhir/model/ModelInheritanceTest.java | 2 +- .../java/ca/uhn/fhir/model/XhtmlNodeTest.java | 2 +- .../uhn/fhir/parser/JsonParserHl7OrgTest.java | 2 +- 115 files changed, 141 insertions(+), 142 deletions(-) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/CSFile.java (95%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/CSFileInputStream.java (95%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/CommaSeparatedStringBuilder.java (86%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/FileNotifier.java (94%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/Inflector.java (99%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/MyURIResolver.java (98%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/TextStreamWriter.java (95%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/Utilities.java (96%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/ZipURIResolver.java (98%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/xhtml/HeirarchicalTableGenerator.java (96%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/xhtml/HierarchicalTableGenerator.java (96%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/xhtml/NodeType.java (97%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/xhtml/XhtmlComposer.java (98%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/xhtml/XhtmlDocument.java (97%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/xhtml/XhtmlNode.java (99%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/xhtml/XhtmlParser.java (99%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/xml/IXMLWriter.java (99%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/xml/SchematronWriter.java (90%) rename hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/{ => instance}/utilities/xml/XMLUtil.java (97%) diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java index b2a8423dbbd..ab92ccec598 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Account.java @@ -33,7 +33,7 @@ package org.hl7.fhir.instance.model; import java.util.ArrayList; import java.util.List; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java index b2c5820c5ae..22c15c7869b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Address.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java index 42cf2ebe013..84bc14d6216 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AllergyIntolerance.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java index 26d377a11bb..ff20d6f40fc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Appointment.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java index 7305611b83f..4c91c7d2f7c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AppointmentResponse.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java index eda4c7d38eb..6844caa5d17 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Attachment.java @@ -34,7 +34,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java index b60cd55e3a1..aaae03cbfd4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/AuditEvent.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base.java index 935af89d860..c3bb4986226 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Base.java @@ -7,7 +7,7 @@ import java.util.List; import java.util.Map; import org.hl7.fhir.instance.model.api.IBase; -import org.hl7.fhir.utilities.xhtml.XhtmlNode; +import org.hl7.fhir.instance.utilities.xhtml.XhtmlNode; public abstract class Base implements Serializable, IBase { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseNarrative.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseNarrative.java index ede1647a483..79629d717ba 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseNarrative.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BaseNarrative.java @@ -3,7 +3,7 @@ package org.hl7.fhir.instance.model; import org.apache.commons.lang3.StringUtils; import org.hl7.fhir.instance.model.Narrative.NarrativeStatus; import org.hl7.fhir.instance.model.api.INarrative; -import org.hl7.fhir.utilities.xhtml.XhtmlNode; +import org.hl7.fhir.instance.utilities.xhtml.XhtmlNode; public abstract class BaseNarrative extends Type implements INarrative { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java index 5d026c6abf6..69d78dd9236 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/BodySite.java @@ -33,7 +33,7 @@ package org.hl7.fhir.instance.model; import java.util.ArrayList; import java.util.List; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java index 8b41b562844..8891e968adb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Bundle.java @@ -38,7 +38,7 @@ import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.instance.model.api.IBaseBundle; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java index 9a20a470257..d5ca64dc8a8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CarePlan.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java index 06e1fc075b3..589ea9b499d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Claim.java @@ -37,7 +37,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java index 387cbfc1800..cb1cf7e5d38 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClaimResponse.java @@ -39,7 +39,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcome; import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcomeEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java index dd18db6b224..f4db542b0ae 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ClinicalImpression.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java index 2df32d094ff..3efc6e9c2be 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/CodeableConcept.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java index 56d6feb8cc5..0af17fca090 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coding.java @@ -34,7 +34,7 @@ import java.util.List; import org.hl7.fhir.instance.model.api.IBaseCoding; import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Comparison.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Comparison.java index d2b4b3fceac..5dc906ea2a4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Comparison.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Comparison.java @@ -2,7 +2,7 @@ package org.hl7.fhir.instance.model; import java.util.List; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; /** * See http://www.healthintersections.com.au/?p=1941 diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java index 2ce6fe0325d..dae28e72e7b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Composition.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java index 288439b2a11..1716377e5b1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ConceptMap.java @@ -39,7 +39,7 @@ import org.hl7.fhir.instance.model.Enumerations.ConceptMapEquivalenceEnumFactory import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java index 0aac66138fe..e30f0afd99d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Condition.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java index 3095725f2d4..0a331e93460 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Conformance.java @@ -40,7 +40,7 @@ import org.hl7.fhir.instance.model.Enumerations.SearchParamType; import org.hl7.fhir.instance.model.Enumerations.SearchParamTypeEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.instance.model.api.IBaseConformance; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java index 01a9ab4b30c..807dd2a5247 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ContactPoint.java @@ -33,7 +33,7 @@ package org.hl7.fhir.instance.model; import java.util.List; import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java index a61d49f5fb9..7c87d6959eb 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Contract.java @@ -37,7 +37,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java index 99c4126fddd..f3dfe2522f1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Coverage.java @@ -33,7 +33,7 @@ package org.hl7.fhir.instance.model; import java.util.ArrayList; import java.util.List; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java index bb04d41f6c2..f2a1d93ac00 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DataElement.java @@ -37,7 +37,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DetectedIssue.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DetectedIssue.java index 47c9ef91d5a..444e2c96a85 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DetectedIssue.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DetectedIssue.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java index 1e70b3efb87..7bc3b8f6128 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Device.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java index 9cb781f41e0..1cde0aa2d32 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DeviceComponent.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java index 1e3129b60a6..46a06d1564c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DiagnosticReport.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java index 172808b44fe..4fd577a029c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentManifest.java @@ -38,7 +38,7 @@ import org.hl7.fhir.instance.model.Enumerations.DocumentReferenceStatus; import org.hl7.fhir.instance.model.Enumerations.DocumentReferenceStatusEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.instance.model.api.IBaseResource; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java index a7c2db39c73..38404665473 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/DocumentReference.java @@ -37,7 +37,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.DocumentReferenceStatus; import org.hl7.fhir.instance.model.Enumerations.DocumentReferenceStatusEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java index c30cf6ca531..61b2395f2d7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Element.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseHasExtensions; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java index 7c90284aab9..e186579e3cf 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ElementDefinition.java @@ -37,7 +37,7 @@ import org.hl7.fhir.instance.model.Enumerations.BindingStrength; import org.hl7.fhir.instance.model.Enumerations.BindingStrengthEnumFactory; import org.hl7.fhir.instance.model.api.IBaseDatatypeElement; import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java index cf54edae146..4994d996a60 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EligibilityResponse.java @@ -36,7 +36,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcome; import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcomeEnumFactory; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java index 2055800c32d..6852022bbfe 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/EnrollmentResponse.java @@ -36,7 +36,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcome; import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcomeEnumFactory; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java index 7dd211b16f9..f9a54d8cbc6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ExplanationOfBenefit.java @@ -36,7 +36,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcome; import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcomeEnumFactory; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Factory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Factory.java index 249a1126d22..9053c7dedcc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Factory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Factory.java @@ -6,8 +6,8 @@ import java.util.UUID; import org.hl7.fhir.instance.model.ContactPoint.ContactPointSystem; import org.hl7.fhir.instance.model.Narrative.NarrativeStatus; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.utilities.xhtml.XhtmlParser; +import org.hl7.fhir.instance.utilities.Utilities; +import org.hl7.fhir.instance.utilities.xhtml.XhtmlParser; /* Copyright (c) 2011+, HL7, Inc diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java index 806bec95525..6572ab05565 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/FamilyMemberHistory.java @@ -37,7 +37,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.AdministrativeGender; import org.hl7.fhir.instance.model.Enumerations.AdministrativeGenderEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java index 6169816bb5b..98af5f65447 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Group.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java index c81851a39c0..1250d2c1940 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HealthcareService.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java index a28978830e4..f5122475b97 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/HumanName.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java index e933840e111..d5ef98ad0d0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Identifier.java @@ -33,7 +33,7 @@ package org.hl7.fhir.instance.model; import java.util.List; import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java index b3eb65b0a96..4b74939aa2e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingObjectSelection.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java index 4048c7c00f6..a17db2feabd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImagingStudy.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java index 36cb5291d27..c4f4c697be8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Immunization.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java index f51967efb00..8c3f6b729c7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImmunizationRecommendation.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java index a5d44dd7a3a..3f94574fb8d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ImplementationGuide.java @@ -37,7 +37,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java index 1490a519a1b..5837f18cd0e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/List_.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java index ff28368be67..69ceb3e9e8b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Location.java @@ -36,7 +36,7 @@ import java.util.ArrayList; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java index 98fb0e3cc3e..1374be82032 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Media.java @@ -33,7 +33,7 @@ package org.hl7.fhir.instance.model; import java.util.ArrayList; import java.util.List; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java index b0dabf8e866..73bfc005f00 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Medication.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java index e5e33b6e3e3..6fe95eade3b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationAdministration.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java index 146826b5ff7..541710b81a1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationDispense.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java index cc58c029f98..05f5345b33e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationOrder.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java index 8fe954754ed..ee810e67b55 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MedicationStatement.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java index b8242890d5e..d325c7cf0c9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/MessageHeader.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java index 1a6fb8d8ca3..80f9267e04d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Meta.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseMetaType; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java index 29179f9d946..93ced766e06 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NamingSystem.java @@ -37,7 +37,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java index 8fe07d0a5fb..24a9c832dd8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Narrative.java @@ -33,7 +33,7 @@ package org.hl7.fhir.instance.model; import java.util.List; import org.hl7.fhir.instance.model.api.INarrative; -import org.hl7.fhir.utilities.xhtml.XhtmlNode; +import org.hl7.fhir.instance.utilities.xhtml.XhtmlNode; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java index ea8d43d4d8b..01177a270bd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/NutritionOrder.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java index 119f4cb8935..409c77d94aa 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Observation.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java index 99302c03ed0..c7486463038 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationDefinition.java @@ -39,7 +39,7 @@ import org.hl7.fhir.instance.model.Enumerations.BindingStrengthEnumFactory; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java index fc8a439ea08..35f45567bae 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OperationOutcome.java @@ -35,7 +35,7 @@ import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; import org.hl7.fhir.instance.model.api.IBaseOperationOutcome; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java index f966680aace..9fd9d1f614d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/OrderResponse.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java index d3844f5ea4c..16879e3f657 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Organization.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java index 17d5f55a672..d9e12a5b9b1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/PaymentReconciliation.java @@ -37,7 +37,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcome; import org.hl7.fhir.instance.model.Enumerations.RemittanceOutcomeEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java index fe81af23eea..2773ab02447 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessRequest.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java index 0e02bf2c6f9..13aebfed3d3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ProcessResponse.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java index 1a09a62c0a8..56114d4177d 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Provenance.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java index ee69dfde909..22de3a0140b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Quantity.java @@ -35,7 +35,7 @@ import java.math.BigDecimal; import java.util.List; import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java index c1afc63f40a..93ce82c837a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Questionnaire.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java index acd85249a81..5408671d851 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/QuestionnaireResponse.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java index 1a83c4dd6a6..b850eab0831 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Reference.java @@ -35,7 +35,7 @@ import java.util.List; import org.hl7.fhir.instance.model.api.IAnyResource; import org.hl7.fhir.instance.model.api.IBaseReference; import org.hl7.fhir.instance.model.api.ICompositeType; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.DatatypeDef; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java index 6bf44efa796..20907990179 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ReferralRequest.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java index ec2f3caa42f..3a2ee0fc610 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Resource.java @@ -33,7 +33,7 @@ package org.hl7.fhir.instance.model; import java.util.List; import org.hl7.fhir.instance.model.api.IAnyResource; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java index acf07972f7e..93f8d7d676b 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/RiskAssessment.java @@ -37,7 +37,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java index 7f089e03433..818dfc0f3ce 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Schedule.java @@ -33,7 +33,7 @@ package org.hl7.fhir.instance.model; import java.util.ArrayList; import java.util.List; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java index 9dfb294ee8a..71e0e4f29c1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/SearchParameter.java @@ -39,7 +39,7 @@ import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFac import org.hl7.fhir.instance.model.Enumerations.SearchParamType; import org.hl7.fhir.instance.model.Enumerations.SearchParamTypeEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java index ea8e387bab6..db68e925534 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Slot.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Child; import ca.uhn.fhir.model.api.annotation.Description; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java index ff631325b12..43892268098 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Specimen.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java index 37a4cbaf618..9abf1dbf649 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/StructureDefinition.java @@ -37,7 +37,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java index 7a7fb072c92..8abb9ee9ee6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Subscription.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java index d953cb36443..e1c46a89488 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/Substance.java @@ -35,7 +35,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java index 351112a1f7e..f0cff941b51 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/TestScript.java @@ -37,7 +37,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java index 60ff3f3c9fe..d45291bf4fd 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/ValueSet.java @@ -37,7 +37,7 @@ import java.util.List; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatus; import org.hl7.fhir.instance.model.Enumerations.ConformanceResourceStatusEnumFactory; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java index a725be13e76..3c475ca0fd3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/VisionPrescription.java @@ -37,7 +37,7 @@ import java.util.Date; import java.util.List; import org.hl7.fhir.instance.model.api.IBaseBackboneElement; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import ca.uhn.fhir.model.api.annotation.Block; import ca.uhn.fhir.model.api.annotation.Child; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/terminologies/ValueSetExpanderSimple.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/terminologies/ValueSetExpanderSimple.java index 42dbab01d64..0f9ddea2abc 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/terminologies/ValueSetExpanderSimple.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/terminologies/ValueSetExpanderSimple.java @@ -49,9 +49,9 @@ import org.hl7.fhir.instance.model.ValueSet.ValueSetComposeComponent; import org.hl7.fhir.instance.model.ValueSet.ValueSetExpansionComponent; import org.hl7.fhir.instance.model.ValueSet.ValueSetExpansionContainsComponent; import org.hl7.fhir.instance.model.ValueSet.ValueSetExpansionParameterComponent; +import org.hl7.fhir.instance.utilities.Utilities; import org.hl7.fhir.instance.utils.IWorkerContext; import org.hl7.fhir.instance.utils.ToolingExtensions; -import org.hl7.fhir.utilities.Utilities; public class ValueSetExpanderSimple implements ValueSetExpander { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/terminologies/ValueSetExpansionCache.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/terminologies/ValueSetExpansionCache.java index 32de5e20427..71023276ca9 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/terminologies/ValueSetExpansionCache.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/terminologies/ValueSetExpansionCache.java @@ -41,11 +41,11 @@ import org.hl7.fhir.instance.model.OperationOutcome; import org.hl7.fhir.instance.model.Resource; import org.hl7.fhir.instance.model.ValueSet; import org.hl7.fhir.instance.terminologies.ValueSetExpander.ValueSetExpansionOutcome; +import org.hl7.fhir.instance.utilities.Utilities; +import org.hl7.fhir.instance.utilities.xhtml.XhtmlComposer; import org.hl7.fhir.instance.utils.EOperationOutcome; import org.hl7.fhir.instance.utils.IWorkerContext; import org.hl7.fhir.instance.utils.ToolingExtensions; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.utilities.xhtml.XhtmlComposer; public class ValueSetExpansionCache implements ValueSetExpanderFactory { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/CSFile.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/CSFile.java similarity index 95% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/CSFile.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/CSFile.java index 7c447b6deda..e6ed47126b1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/CSFile.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/CSFile.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities; +package org.hl7.fhir.instance.utilities; import java.io.File; import java.io.IOException; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/CSFileInputStream.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/CSFileInputStream.java similarity index 95% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/CSFileInputStream.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/CSFileInputStream.java index 16d5a02a93d..ba1de0ca7f1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/CSFileInputStream.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/CSFileInputStream.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities; +package org.hl7.fhir.instance.utilities; import java.io.File; import java.io.FileInputStream; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/CommaSeparatedStringBuilder.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/CommaSeparatedStringBuilder.java similarity index 86% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/CommaSeparatedStringBuilder.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/CommaSeparatedStringBuilder.java index b8b642306bd..b257bdefdb4 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/CommaSeparatedStringBuilder.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/CommaSeparatedStringBuilder.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.utilities; +package org.hl7.fhir.instance.utilities; /** * Encapsulates StringBuilder to build strings of values separated by comma diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/FileNotifier.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/FileNotifier.java similarity index 94% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/FileNotifier.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/FileNotifier.java index eaa818f2dba..3b4f096de38 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/FileNotifier.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/FileNotifier.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.utilities; +package org.hl7.fhir.instance.utilities; /* * #%L diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/Inflector.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/Inflector.java similarity index 99% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/Inflector.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/Inflector.java index 41d9bdc5d2c..cdf9d3cd523 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/Inflector.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/Inflector.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities; +package org.hl7.fhir.instance.utilities; /* * #%L diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/MyURIResolver.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/MyURIResolver.java similarity index 98% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/MyURIResolver.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/MyURIResolver.java index 76828b0031b..f25d449309c 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/MyURIResolver.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/MyURIResolver.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.utilities; +package org.hl7.fhir.instance.utilities; /* * #%L diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/TextStreamWriter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/TextStreamWriter.java similarity index 95% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/TextStreamWriter.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/TextStreamWriter.java index 2424861b554..e290ab67b8a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/TextStreamWriter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/TextStreamWriter.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities; +package org.hl7.fhir.instance.utilities; import java.io.IOException; import java.io.OutputStream; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/Utilities.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/Utilities.java similarity index 96% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/Utilities.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/Utilities.java index 5332463a4d1..4ce75b3aca3 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/Utilities.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/Utilities.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities; +package org.hl7.fhir.instance.utilities; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/ZipURIResolver.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/ZipURIResolver.java similarity index 98% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/ZipURIResolver.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/ZipURIResolver.java index 806e888048c..10d701d9bb7 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/ZipURIResolver.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/ZipURIResolver.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.utilities; +package org.hl7.fhir.instance.utilities; /* * #%L diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/HeirarchicalTableGenerator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/HeirarchicalTableGenerator.java similarity index 96% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/HeirarchicalTableGenerator.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/HeirarchicalTableGenerator.java index dec18cc796b..ae4a7d27cb6 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/HeirarchicalTableGenerator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/HeirarchicalTableGenerator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.utilities.xhtml; +package org.hl7.fhir.instance.utilities.xhtml; /* Copyright (c) 2011+, HL7, Inc @@ -46,7 +46,7 @@ import javax.imageio.ImageIO; import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FileUtils; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; public class HeirarchicalTableGenerator { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/HierarchicalTableGenerator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/HierarchicalTableGenerator.java similarity index 96% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/HierarchicalTableGenerator.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/HierarchicalTableGenerator.java index 25c19388a22..404a7106668 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/HierarchicalTableGenerator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/HierarchicalTableGenerator.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.utilities.xhtml; +package org.hl7.fhir.instance.utilities.xhtml; /* Copyright (c) 2011+, HL7, Inc @@ -46,7 +46,7 @@ import javax.imageio.ImageIO; import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FileUtils; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; public class HierarchicalTableGenerator { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/NodeType.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/NodeType.java similarity index 97% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/NodeType.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/NodeType.java index fcd3a9fb25c..2012ab3205e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/NodeType.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/NodeType.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities.xhtml; +package org.hl7.fhir.instance.utilities.xhtml; /* * #%L diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlComposer.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/XhtmlComposer.java similarity index 98% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlComposer.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/XhtmlComposer.java index 8fe7e2557dc..89f602fa395 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlComposer.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/XhtmlComposer.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities.xhtml; +package org.hl7.fhir.instance.utilities.xhtml; /* * #%L @@ -55,8 +55,8 @@ import java.io.OutputStreamWriter; import java.io.StringWriter; import java.io.Writer; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.utilities.xml.IXMLWriter; +import org.hl7.fhir.instance.utilities.Utilities; +import org.hl7.fhir.instance.utilities.xml.IXMLWriter; public class XhtmlComposer { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlDocument.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/XhtmlDocument.java similarity index 97% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlDocument.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/XhtmlDocument.java index 2540d1e4f7d..84e22f10aa0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlDocument.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/XhtmlDocument.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities.xhtml; +package org.hl7.fhir.instance.utilities.xhtml; /* * #%L diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/XhtmlNode.java similarity index 99% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/XhtmlNode.java index 080064ee9ed..c805c7491af 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/XhtmlNode.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities.xhtml; +package org.hl7.fhir.instance.utilities.xhtml; /* * #%L diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/XhtmlParser.java similarity index 99% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/XhtmlParser.java index 46372908529..bcd11be18e5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlParser.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xhtml/XhtmlParser.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities.xhtml; +package org.hl7.fhir.instance.utilities.xhtml; /* * #%L diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xml/IXMLWriter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xml/IXMLWriter.java similarity index 99% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xml/IXMLWriter.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xml/IXMLWriter.java index 0ab71ab9fcc..e1b712b12e5 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xml/IXMLWriter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xml/IXMLWriter.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities.xml; +package org.hl7.fhir.instance.utilities.xml; /* * #%L diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xml/SchematronWriter.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xml/SchematronWriter.java similarity index 90% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xml/SchematronWriter.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xml/SchematronWriter.java index 9a8a2a23725..5cc0262275e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xml/SchematronWriter.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xml/SchematronWriter.java @@ -1,4 +1,4 @@ -package org.hl7.fhir.utilities.xml; +package org.hl7.fhir.instance.utilities.xml; import java.io.IOException; import java.io.OutputStream; @@ -6,11 +6,10 @@ import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; - -import org.hl7.fhir.utilities.TextStreamWriter; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.utilities.xml.SchematronWriter.SchematronType; -import org.hl7.fhir.utilities.xml.SchematronWriter.Section; +import org.hl7.fhir.instance.utilities.TextStreamWriter; +import org.hl7.fhir.instance.utilities.Utilities; +import org.hl7.fhir.instance.utilities.xml.SchematronWriter.SchematronType; +import org.hl7.fhir.instance.utilities.xml.SchematronWriter.Section; public class SchematronWriter extends TextStreamWriter { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xml/XMLUtil.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xml/XMLUtil.java similarity index 97% rename from hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xml/XMLUtil.java rename to hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xml/XMLUtil.java index 9dfae5ef9a6..c279b41c0f8 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/utilities/xml/XMLUtil.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utilities/xml/XMLUtil.java @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package org.hl7.fhir.utilities.xml; +package org.hl7.fhir.instance.utilities.xml; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -37,7 +37,7 @@ import java.util.List; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import org.hl7.fhir.utilities.Utilities; +import org.hl7.fhir.instance.utilities.Utilities; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ProfileUtilities.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ProfileUtilities.java index 2e439d5dfdd..a48bf64e482 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ProfileUtilities.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ProfileUtilities.java @@ -37,24 +37,24 @@ import org.hl7.fhir.instance.model.ValueSet; import org.hl7.fhir.instance.model.ValueSet.ValueSetExpansionComponent; import org.hl7.fhir.instance.model.ValueSet.ValueSetExpansionContainsComponent; import org.hl7.fhir.instance.terminologies.ValueSetExpander.ValueSetExpansionOutcome; +import org.hl7.fhir.instance.utilities.CommaSeparatedStringBuilder; +import org.hl7.fhir.instance.utilities.TextStreamWriter; +import org.hl7.fhir.instance.utilities.Utilities; +import org.hl7.fhir.instance.utilities.xhtml.HierarchicalTableGenerator; +import org.hl7.fhir.instance.utilities.xhtml.XhtmlNode; +import org.hl7.fhir.instance.utilities.xhtml.HierarchicalTableGenerator.Cell; +import org.hl7.fhir.instance.utilities.xhtml.HierarchicalTableGenerator.Piece; +import org.hl7.fhir.instance.utilities.xhtml.HierarchicalTableGenerator.Row; +import org.hl7.fhir.instance.utilities.xhtml.HierarchicalTableGenerator.TableModel; +import org.hl7.fhir.instance.utilities.xml.SchematronWriter; +import org.hl7.fhir.instance.utilities.xml.SchematronWriter.Assert; +import org.hl7.fhir.instance.utilities.xml.SchematronWriter.Rule; +import org.hl7.fhir.instance.utilities.xml.SchematronWriter.SchematronType; +import org.hl7.fhir.instance.utilities.xml.SchematronWriter.Section; import org.hl7.fhir.instance.utils.ProfileUtilities.ExtensionContext; import org.hl7.fhir.instance.utils.ProfileUtilities.ProfileKnowledgeProvider.BindingResolution; import org.hl7.fhir.instance.validation.ValidationMessage; import org.hl7.fhir.instance.validation.ValidationMessage.Source; -import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; -import org.hl7.fhir.utilities.TextStreamWriter; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator; -import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator.Cell; -import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator.Piece; -import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator.Row; -import org.hl7.fhir.utilities.xhtml.HierarchicalTableGenerator.TableModel; -import org.hl7.fhir.utilities.xhtml.XhtmlNode; -import org.hl7.fhir.utilities.xml.SchematronWriter; -import org.hl7.fhir.utilities.xml.SchematronWriter.Assert; -import org.hl7.fhir.utilities.xml.SchematronWriter.Rule; -import org.hl7.fhir.utilities.xml.SchematronWriter.SchematronType; -import org.hl7.fhir.utilities.xml.SchematronWriter.Section; /** * This class provides a set of utility operations for working with Profiles. diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ToolingExtensions.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ToolingExtensions.java index 901a80d3559..0b9a0908c94 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ToolingExtensions.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/utils/ToolingExtensions.java @@ -57,8 +57,8 @@ import org.hl7.fhir.instance.model.UriType; import org.hl7.fhir.instance.model.ValueSet; import org.hl7.fhir.instance.model.ValueSet.ConceptDefinitionComponent; import org.hl7.fhir.instance.model.ValueSet.ValueSetCodeSystemComponent; +import org.hl7.fhir.instance.utilities.Utilities; import org.hl7.fhir.instance.validation.ValidationMessage.Source; -import org.hl7.fhir.utilities.Utilities; public class ToolingExtensions { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/InstanceValidator.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/InstanceValidator.java index ea42cd60d3d..0ee0e6c0ee1 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/InstanceValidator.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/InstanceValidator.java @@ -39,6 +39,9 @@ import org.hl7.fhir.instance.model.ValueSet.ConceptDefinitionComponent; import org.hl7.fhir.instance.model.ValueSet.ValueSetExpansionContainsComponent; import org.hl7.fhir.instance.terminologies.ValueSetExpander.ETooCostly; import org.hl7.fhir.instance.terminologies.ValueSetExpander.ValueSetExpansionOutcome; +import org.hl7.fhir.instance.utilities.CommaSeparatedStringBuilder; +import org.hl7.fhir.instance.utilities.Utilities; +import org.hl7.fhir.instance.utilities.xml.XMLUtil; import org.hl7.fhir.instance.terminologies.ValueSetExpanderFactory; import org.hl7.fhir.instance.terminologies.ValueSetExpansionCache; import org.hl7.fhir.instance.utils.EOperationOutcome; @@ -46,9 +49,6 @@ import org.hl7.fhir.instance.utils.IWorkerContext; import org.hl7.fhir.instance.utils.IWorkerContext.ValidationResult; import org.hl7.fhir.instance.utils.ProfileUtilities; import org.hl7.fhir.instance.validation.ValidationMessage.Source; -import org.hl7.fhir.utilities.CommaSeparatedStringBuilder; -import org.hl7.fhir.utilities.Utilities; -import org.hl7.fhir.utilities.xml.XMLUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/ValidationMessage.java b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/ValidationMessage.java index 524104d44bf..fd2b5710687 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/ValidationMessage.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/validation/ValidationMessage.java @@ -34,9 +34,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; import org.hl7.fhir.instance.model.OperationOutcome; import org.hl7.fhir.instance.model.OperationOutcome.IssueSeverity; import org.hl7.fhir.instance.model.OperationOutcome.OperationOutcomeIssueComponent; +import org.hl7.fhir.instance.utilities.Utilities; import org.hl7.fhir.instance.model.StringType; import org.hl7.fhir.instance.utils.ToolingExtensions; -import org.hl7.fhir.utilities.Utilities; public class ValidationMessage { diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/ModelInheritanceTest.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/ModelInheritanceTest.java index cdf7e286711..99c4d89b33e 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/ModelInheritanceTest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/ModelInheritanceTest.java @@ -59,7 +59,7 @@ import org.hl7.fhir.instance.model.api.IDomainResource; import org.hl7.fhir.instance.model.api.IIdType; import org.hl7.fhir.instance.model.api.INarrative; import org.hl7.fhir.instance.model.api.IPrimitiveType; -import org.hl7.fhir.utilities.xhtml.XhtmlNode; +import org.hl7.fhir.instance.utilities.xhtml.XhtmlNode; import org.junit.Test; import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/XhtmlNodeTest.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/XhtmlNodeTest.java index a24e8a78c41..9e706e9fdf0 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/XhtmlNodeTest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/model/XhtmlNodeTest.java @@ -3,7 +3,7 @@ package ca.uhn.fhir.model; import static org.junit.Assert.*; import org.hl7.fhir.instance.model.Narrative; -import org.hl7.fhir.utilities.xhtml.XhtmlNode; +import org.hl7.fhir.instance.utilities.xhtml.XhtmlNode; import org.junit.Ignore; import org.junit.Test; diff --git a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java index 1cb7e80dea6..5390b38f08a 100644 --- a/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java +++ b/hapi-fhir-structures-hl7org-dstu2/src/test/java/ca/uhn/fhir/parser/JsonParserHl7OrgTest.java @@ -55,7 +55,7 @@ import org.hl7.fhir.instance.model.ValueSet.ValueSetCodeSystemComponent; import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhir.instance.model.api.INarrative; import org.hl7.fhir.instance.model.api.IPrimitiveType; -import org.hl7.fhir.utilities.xhtml.XhtmlNode; +import org.hl7.fhir.instance.utilities.xhtml.XhtmlNode; import org.junit.After; import org.junit.Test; import org.xml.sax.SAXException;