From a4b545ba218e6e4b80c4162a66400bbf70cad028 Mon Sep 17 00:00:00 2001 From: mochaholic Date: Mon, 23 Feb 2015 08:49:21 -0700 Subject: [PATCH] Merged with the latest master snapshot. --- .../src/main/java/ca/uhn/fhir/model/dev/FhirDev.java | 2 +- .../src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java | 2 +- .../src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dev/FhirDev.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dev/FhirDev.java index 4fc2a43ac68..c50e1d743cd 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dev/FhirDev.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dev/FhirDev.java @@ -108,7 +108,7 @@ public class FhirDev implements IFhirVersion { } - @Override + //@Override public IBaseExtension newExtension() { return null; } diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java index d3b0383ada0..dabe17737c4 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu/FhirDstu1.java @@ -380,7 +380,7 @@ public class FhirDstu1 implements IFhirVersion { return ContainedDt.class; } - @Override + //@Override public IBaseExtension newExtension() { return null; } diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java index 54fc0759cb3..8a10b831cbd 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/model/dstu2/FhirDstu2.java @@ -93,7 +93,7 @@ public class FhirDstu2 implements IFhirVersion { throw new UnsupportedOperationException(); } - @Override + //@Override public IBaseExtension newExtension() { return null; }