From 374da3f3a09ccaf9713731a3033b207092340ca7 Mon Sep 17 00:00:00 2001 From: "b.debeaubien" Date: Thu, 30 Oct 2014 11:41:48 -0400 Subject: [PATCH] Fix for https://github.com/jamesagnew/hapi-fhir/issues/42 A few more eclipse exclusions for .gitignore --- .gitignore | 4 ++++ .../ca/uhn/fhir/model/dstu/FhirDstu1.java | 24 +++++-------------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.gitignore b/.gitignore index 232298d69bd..491a273dcfe 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,12 @@ /bin /target +target/ .idea/ .project/ .settings/ +.metadata/ +RemoteSystemsTempFiles/ +Servers/ *.iml *.log *.log* diff --git a/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java b/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java index c1fba6f2312..07765b9beaa 100644 --- a/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java +++ b/hapi-fhir-structures-dstu/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java @@ -31,27 +31,12 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import ca.uhn.fhir.context.*; +import ca.uhn.fhir.model.api.ICompositeDatatype; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.text.WordUtils; -import ca.uhn.fhir.context.BaseRuntimeChildDefinition; -import ca.uhn.fhir.context.BaseRuntimeDeclaredChildDefinition; -import ca.uhn.fhir.context.BaseRuntimeElementCompositeDefinition; -import ca.uhn.fhir.context.BaseRuntimeElementDefinition; import ca.uhn.fhir.context.BaseRuntimeElementDefinition.ChildTypeEnum; -import ca.uhn.fhir.context.ConfigurationException; -import ca.uhn.fhir.context.RuntimeChildChoiceDefinition; -import ca.uhn.fhir.context.RuntimeChildCompositeDatatypeDefinition; -import ca.uhn.fhir.context.RuntimeChildContainedResources; -import ca.uhn.fhir.context.RuntimeChildDeclaredExtensionDefinition; -import ca.uhn.fhir.context.RuntimeChildPrimitiveDatatypeDefinition; -import ca.uhn.fhir.context.RuntimeChildResourceBlockDefinition; -import ca.uhn.fhir.context.RuntimeChildResourceDefinition; -import ca.uhn.fhir.context.RuntimeChildUndeclaredExtensionDefinition; -import ca.uhn.fhir.context.RuntimePrimitiveDatatypeDefinition; -import ca.uhn.fhir.context.RuntimeResourceBlockDefinition; -import ca.uhn.fhir.context.RuntimeResourceDefinition; -import ca.uhn.fhir.context.RuntimeResourceReferenceDefinition; import ca.uhn.fhir.model.api.IFhirVersion; import ca.uhn.fhir.model.api.IPrimitiveDatatype; import ca.uhn.fhir.model.api.IResource; @@ -79,7 +64,7 @@ public class FhirDstu1 implements IFhirVersion { public Object createServerConformanceProvider(RestfulServer theServer) { return new ServerConformanceProvider(theServer); } - + private void fillBasics(StructureElement theElement, BaseRuntimeElementDefinition def, LinkedList path, BaseRuntimeDeclaredChildDefinition theChild) { if (path.isEmpty()) { path.add(def.getName()); @@ -311,6 +296,9 @@ public class FhirDstu1 implements IFhirVersion { if (nextChild.getChildType() != null && IPrimitiveDatatype.class.isAssignableFrom(nextChild.getChildType())) { RuntimePrimitiveDatatypeDefinition pdef = (RuntimePrimitiveDatatypeDefinition) nextChild.getSingleChildOrThrow(); defn.getDefinition().addType().setCode(DataTypeEnum.VALUESET_BINDER.fromCodeString(pdef.getName())); + } else if (nextChild.getChildType() != null && ICompositeDatatype.class.isAssignableFrom(nextChild.getChildType())) { + RuntimeCompositeDatatypeDefinition pdef = (RuntimeCompositeDatatypeDefinition) nextChild.getSingleChildOrThrow(); + defn.getDefinition().addType().setCode(DataTypeEnum.VALUESET_BINDER.fromCodeString(pdef.getName())); } else { RuntimeResourceBlockDefinition pdef = (RuntimeResourceBlockDefinition) nextChild.getSingleChildOrThrow(); scanForExtensions(theProfile, pdef);