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

More work on HL7org structs

This commit is contained in:
James Agnew 2015-04-14 11:58:08 -04:00
parent c5e75ebe60
commit 93de15b83a
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hapi-fhir-android/pom.xml
View File

@ -63,6 +63,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-android</artifactId>
<version>${slf4j_version}</version>
<scope>provided</scope>
</dependency>
<!-- <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId>
<version>3.1.4</version> </dependency> -->
@ -147,7 +148,7 @@
<include>javax.xml.stream:stax-api</include>
<include>javax.servlet:javax.servlet-api</include>
<include>org.codehaus.woodstox:stax2-api</include>
<include>org.slf4j:slf4j*</include>
<!--<include>org.slf4j:slf4j*</include>-->
<include>org.apache.commons:*</include>
<include>org.apache.httpcomponents:*</include>
<include>org.glassfish:javax.json</include>

4
hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IBaseResource.java
View File

@ -29,5 +29,7 @@ package org.hl7.fhir.instance.model;
* <code>ca.uhn.fhir.model.dstu.resource.Patient</code>)
*/
public interface IBaseResource extends IBase {
// nothing here yet
IIdType
}

7
hapi-fhir-structures-hl7org-dstu2/src/main/java/org/hl7/fhir/instance/model/IdType.java
View File

@ -564,7 +564,7 @@ public class IdType extends UriType implements IIdType {
if (theResouce == null) {
throw new NullPointerException("theResource can not be null");
} else if (theResouce instanceof IResource) {
return ((IResource) theResouce).getId();
return ((IBaseResource) theResouce).getIdElement();
} else if (theResouce instanceof IAnyResource) {
// TODO: implement
throw new UnsupportedOperationException();
@ -573,4 +573,9 @@ public class IdType extends UriType implements IIdType {
}
}
@Override
public IdType copy() {
return new IdType(getValue());
}
}