fix bug in path names for CDA

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/Element.java

@@ -930,6 +930,14 @@ public class Element extends Base {
   
   public boolean hasParentForValidator() {
     return hasParentForValidator;
+  }
+
+  public void clear() {
+    comments = null;
+    children.clear();;
+    property = null;
+    elementProperty = null;
+    xhtml = null;
   }  
   
 }

org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ChildIterator.java

@@ -96,6 +96,7 @@ public class ChildIterator {
         String n = name();
         String fn = "";
         if (element().getProperty().isChoice()) {
+          if (element().getProperty().getName().endsWith("[x]")) {
             String en = element().getProperty().getName();
             en = en.substring(0, en.length() - 3);
             String t = n.substring(en.length());
@@ -103,6 +104,9 @@ public class ChildIterator {
                 t = Utilities.uncapitalize(t);
             n = en;
             fn = ".ofType(" + t + ")";
+          } else {
+             // nothing to do? 
+          }
         }
         if (i > -1 || (element().getSpecial() == null && element().isList())) {
             sfx = "[" + Integer.toString(lastCount) + "]";

org.hl7.fhir.validation/src/main/java/org/hl7/fhir/validation/instance/utils/ElementInfo.java

@@ -111,11 +111,6 @@ public class ElementInfo {
         return path;
     }
 
-    public ElementInfo setPath(String path) {
-        this.path = path;
-        return this;
-    }
-
     public int col() {
     return element.col();
   }