Merge branch '1351-escape-xml' into 'devel_15.0.x'

tag order fixed

See merge request !1235

CHANGELOG

@@ -18,8 +18,10 @@ minerva (15.0.3) stable; urgency=medium
     end for catalysis (#1350)
   * Bug fix: elements name were not escaped properly when exporting to GPML
     (#1351)
+  * Bug fix: reaction with description and pubmed reference was incorrectly
+    exported to GPML (#1352)
 
- -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 8 Jul 2020 16:00:00 +0200
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Thu, 13 Aug 2020 15:00:00 +0200
 
 minerva (15.0.2) stable; urgency=medium
   * Bug fix: annotations using identifiers.org urls sometimes required http and

pathvisio/src/main/java/lcsb/mapviewer/wikipathway/XML/ModelToGPML.java

@@ -697,10 +697,10 @@ public class ModelToGPML {
       StringBuilder tmp = new StringBuilder("");
 
       interactions.append("  <Interaction GraphId=\"" + reaction.getIdReaction() + "\">\n");
-      interactions.append(biopaxParser.toReferenceXml(reaction.getMiriamData()));
       if (reaction.getNotes() != null) {
         interactions.append("  <Comment>" + StringEscapeUtils.escapeXml11(reaction.getNotes().trim()) + "</Comment>\n");
       }
+      interactions.append(biopaxParser.toReferenceXml(reaction.getMiriamData()));
       interactions.append("    <Graphics "
           + "ConnectorType=\"Segmented\" "
           + "ZOrder=\"" + reaction.getZ() + "\" "