From e8973a90d8e774fdc01be9f1bdbfbb94e54bedc3 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.ccom>
Date: Wed, 30 Oct 2024 21:05:03 +1030
Subject: [PATCH] #1790 - Fix versionFromCanonical returns system instead and
 systemFromCanonical returns version

---
 .../main/java/org/hl7/fhir/r5/fhirpath/FHIRPathEngine.java    | 2 +-
 .../src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/fhirpath/FHIRPathEngine.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/fhirpath/FHIRPathEngine.java
index 126ee57cc..d73bbcd67 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/fhirpath/FHIRPathEngine.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/fhirpath/FHIRPathEngine.java
@@ -173,7 +173,7 @@ public class FHIRPathEngine {
   private StringBuilder log = new StringBuilder();
   private Set<String> primitiveTypes = new HashSet<String>();
   private Map<String, StructureDefinition> allTypes = new HashMap<String, StructureDefinition>();
-  private boolean legacyMode; // some R2 and R3 constraints assume that != is valid for emptty sets, so when running for R2/R3, this is set ot true  
+  private boolean legacyMode; // some R2 and R3 constraints assume that != is valid for empty sets, so when running for R2/R3, this is set ot true  
   private ValidationOptions terminologyServiceOptions = new ValidationOptions(FhirPublication.R5);
   private ProfileUtilities profileUtilities;
   private String location; // for error messages
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
index f0caf0e85..5ab91bd44 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
@@ -2236,7 +2236,7 @@ public class DataRenderer extends Renderer implements CodeResolver {
     return b.toString(); 
   } 
 
-  protected String versionFromCanonical(String system) { 
+  protected String systemFromCanonical(String system) { 
     if (system == null) { 
       return null; 
     } else if (system.contains("|")) { 
@@ -2246,7 +2246,7 @@ public class DataRenderer extends Renderer implements CodeResolver {
     } 
   } 
 
-  protected String systemFromCanonical(String system) { 
+  protected String versionFromCanonical(String system) { 
     if (system == null) { 
       return null; 
     } else if (system.contains("|")) {