From 8855fe1bc6743519dfefa467d90d1f2d00449abf Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Mon, 14 Sep 2020 18:08:44 +1000 Subject: [PATCH] Fix bug generating copyright --- .../configuration/CanonicalResource.java | 35 +++++++++++-------- .../configuration/NamingSystem.java | 3 ++ .../configuration/OperationDefinition.java | 3 ++ .../org/hl7/fhir/r5/model/NamingSystem.java | 3 ++ 4 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 org.hl7.fhir.core.generator/configuration/NamingSystem.java create mode 100644 org.hl7.fhir.core.generator/configuration/OperationDefinition.java diff --git a/org.hl7.fhir.core.generator/configuration/CanonicalResource.java b/org.hl7.fhir.core.generator/configuration/CanonicalResource.java index 354661f7e..88d2f9572 100644 --- a/org.hl7.fhir.core.generator/configuration/CanonicalResource.java +++ b/org.hl7.fhir.core.generator/configuration/CanonicalResource.java @@ -1,16 +1,21 @@ @Override - public String toString() { - return fhirType()+"["+getUrl()+"]"; - } - - public String present() { - if (hasTitle()) - return getTitle(); - if (hasName()) - return getName(); - return toString(); - } - - public String getVUrl() { - return getUrl() + (hasVersion() ? "|"+getVersion() : ""); - } \ No newline at end of file + public String toString() { + return fhirType()+"["+getUrl()+"]"; + } + + public String present() { + if (hasTitle()) + return getTitle(); + if (hasName()) + return getName(); + return toString(); + } + + public String getVUrl() { + return getUrl() + (hasVersion() ? "|"+getVersion() : ""); + } + + public boolean supportsCopyright() { + return true; + } + \ No newline at end of file diff --git a/org.hl7.fhir.core.generator/configuration/NamingSystem.java b/org.hl7.fhir.core.generator/configuration/NamingSystem.java new file mode 100644 index 000000000..e378b10fb --- /dev/null +++ b/org.hl7.fhir.core.generator/configuration/NamingSystem.java @@ -0,0 +1,3 @@ + public boolean supportsCopyright() { + return false; + } diff --git a/org.hl7.fhir.core.generator/configuration/OperationDefinition.java b/org.hl7.fhir.core.generator/configuration/OperationDefinition.java new file mode 100644 index 000000000..e378b10fb --- /dev/null +++ b/org.hl7.fhir.core.generator/configuration/OperationDefinition.java @@ -0,0 +1,3 @@ + public boolean supportsCopyright() { + return false; + } diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.java index a7314fd5c..3e991f7d7 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/NamingSystem.java @@ -2922,6 +2922,9 @@ public class NamingSystem extends CanonicalResource { */ public static final ca.uhn.fhir.rest.gclient.TokenClientParam VERSION = new ca.uhn.fhir.rest.gclient.TokenClientParam(SP_VERSION); + public boolean supportsCopyright() { + return false; + } }