From 15424572ef1ddd540d134992dbb5cc88b0f34f85 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 19 Apr 2017 05:18:49 -0400 Subject: [PATCH] Complete R3 merge --- .../convertors/VersionConvertorAdvisor.java | 32 ++++--------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorAdvisor.java b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorAdvisor.java index fbf3ae67297..4d9c8faf4b8 100644 --- a/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorAdvisor.java +++ b/hapi-fhir-converter/src/main/java/org/hl7/fhir/convertors/VersionConvertorAdvisor.java @@ -1,4 +1,3 @@ -<<<<<<< HEAD package org.hl7.fhir.convertors; /*- @@ -27,32 +26,13 @@ import org.hl7.fhir.dstu3.model.ValueSet; import org.hl7.fhir.exceptions.FHIRException; public interface VersionConvertorAdvisor { - boolean ignoreEntry(org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent src); + boolean ignoreEntry(org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent src); - // called ? - org.hl7.fhir.instance.model.Resource convert(org.hl7.fhir.dstu3.model.Resource resource) throws FHIRException; + // called ? + org.hl7.fhir.instance.model.Resource convert(org.hl7.fhir.dstu3.model.Resource resource) throws FHIRException; - // called when an r2 value set has a codeSystem in it - void handleCodeSystem(CodeSystem tgtcs, ValueSet source); + // called when an r2 value set has a codeSystem in it + void handleCodeSystem(CodeSystem tgtcs, ValueSet source); - CodeSystem getCodeSystem(ValueSet src); + CodeSystem getCodeSystem(ValueSet src); } -======= -package org.hl7.fhir.convertors; - -import org.hl7.fhir.dstu3.model.CodeSystem; -import org.hl7.fhir.dstu3.model.ValueSet; -import org.hl7.fhir.exceptions.FHIRException; - -public interface VersionConvertorAdvisor { - boolean ignoreEntry(org.hl7.fhir.dstu3.model.Bundle.BundleEntryComponent src); - - // called ? - org.hl7.fhir.instance.model.Resource convert(org.hl7.fhir.dstu3.model.Resource resource) throws FHIRException; - - // called when an r2 value set has a codeSystem in it - void handleCodeSystem(CodeSystem tgtcs, ValueSet source); - - CodeSystem getCodeSystem(ValueSet src); -} ->>>>>>> dstu3_latest_structs