Merge pull request #991 from HL7/FixBindingTableOrder

Fix binding table order

Author: grahamegrieve

org.hl7.fhir.publisher.core/src/main/java/org/hl7/fhir/igtools/renderers/StructureDefinitionRenderer.java

@@ -810,6 +810,17 @@ else if (!tx.hasDescription())
     if (brd.suffix != null) {
       b.append(brd.suffix);
     }
+    if (tx.hasValueSet()) {
+      b.append("<div><code>"+Utilities.escapeXml(tx.getValueSet())+"</code><button title=\"Click to copy URL\" class=\"btn-copy\" data-clipboard-text=\""+Utilities.escapeXml(tx.getValueSet())+"\"></button></div>");
+      if (link != null) {
+        if (Utilities.isAbsoluteUrlLinkable(link)) {
+          b.append("<div>from <a href=\""+Utilities.escapeXml(link)+"\">"+Utilities.escapeXml(link)+"</a></div>");
+        } else {
+          b.append("<div>from "+Utilities.escapeXml(link)+"</div>");
+        }
+      }
+    } else {
+    }
     AdditionalBindingsRenderer abr = new AdditionalBindingsRenderer(igp, corePath, sd, path, gen, this, sdr);
     if (tx.hasExtension(ToolingExtensions.EXT_MAX_VALUESET)) {
       abr.seeMaxBinding(ToolingExtensions.getExtension(tx, ToolingExtensions.EXT_MAX_VALUESET));
@@ -826,17 +837,6 @@ else if (!tx.hasDescription())
       abr.render(x.getChildNodes(), true);
       b.append(new XhtmlComposer(true, true).compose(x));
     }
-    if (tx.hasValueSet()) { 
-      b.append("<div><code>"+Utilities.escapeXml(tx.getValueSet())+"</code><button title=\"Click to copy URL\" class=\"btn-copy\" data-clipboard-text=\""+Utilities.escapeXml(tx.getValueSet())+"\"></button></div>");
-      if (link != null) {
-        if (Utilities.isAbsoluteUrlLinkable(link)) {
-          b.append("<div>from <a href=\""+Utilities.escapeXml(link)+"\">"+Utilities.escapeXml(link)+"</a></div>");  
-        } else {
-          b.append("<div>from "+Utilities.escapeXml(link)+"</div>");  
-        }
-      }
-    } else {
-    }
     b.append("</td>");
     b.append("</tr>\r\n");
   }