honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a compile issue reported by Bill de Beaubien

This commit is contained in:
James Agnew 2014-12-10 10:17:33 -05:00
parent c901330583
commit c4c26e482f
6 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hapi-fhir-base/src/main/java/ca/uhn/fhir/context/BaseRuntimeElementDefinition.java
View File

@ -137,7 +137,7 @@ public abstract class BaseRuntimeElementDefinition<T extends IElement> {
for (RuntimeChildDeclaredExtensionDefinition next : myExtensions) {
String extUrl = next.getExtensionUrl();
if (myUrlToExtension.containsKey(extUrl)) {
throw new ConfigurationException("Duplicate extension URL: " + extUrl);
throw new ConfigurationException("Duplicate extension URL[" + extUrl + "] in Element[" + getName() + "]");
} else {
myUrlToExtension.put(extUrl, next);
}

1
hapi-fhir-structures-hl7org-dev/bin/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/bin/

23
hapi-fhir-structures-hl7org-dev/bin/.project Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>hapi-fhir-structures-hl7org-dev</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

5
hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/composite/HumanNameDt.java
View File

@ -566,6 +566,11 @@ public class HumanNameDt
return this;
}
@Override
public StringDt getTextElement() {
return getText();
}

2
restful-server-example/.settings/org.eclipse.wst.common.component
View File

@ -9,7 +9,7 @@
<dependent-module archiveName="hapi-fhir-structures-dstu-0.8-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/hapi-fhir-structures-dstu/hapi-fhir-structures-dstu">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module deploy-path="/" handle="module:/overlay/prj/hapi-fhir-testpage-overlay?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
<dependent-module deploy-path="/" handle="module:/overlay/var/M2_REPO/ca/uhn/hapi/fhir/hapi-fhir-testpage-overlay/0.8-SNAPSHOT/hapi-fhir-testpage-overlay-0.8-SNAPSHOT.war?unpackFolder=target/m2e-wtp/overlays&amp;includes=**/**&amp;excludes=META-INF/MANIFEST.MF">
<dependency-type>consumes</dependency-type>
</dependent-module>
<dependent-module deploy-path="/" handle="module:/overlay/slf/?includes=**/**&amp;excludes=META-INF/MANIFEST.MF">

2
restful-server-example/src/main/java/ca/uhn/example/model/MyOrganization.java
View File

@ -43,7 +43,7 @@ public class MyOrganization extends Organization {
* of this file.
*/
@Description(shortDefinition="Contains emergency contact details")
@Extension(url = "http://foo#billingCode", isModifier = false, definedLocally = true)
@Extension(url = "http://foo#emergencyContact", isModifier = false, definedLocally = true)
@Child(name = "emergencyContact", min=0, max=Child.MAX_UNLIMITED)
private List<EmergencyContact> myEmergencyContact;