Merge branch 'develop' into Jalview-JS/develop

diff --git a/help/help/html/releases.html b/help/help/html/releases.html
index 8ae6f83..205a129 100755 (executable)
--- a/help/help/html/releases.html
+++ b/help/help/html/releases.html
@@ -58,7 +58,7 @@ li:before {
     <tr>
       <td width="60" align="center" nowrap><strong><a
           id="Jalview.2.11.1">2.11.1</a><a id="Jalview.2.11.1.0">.0</a><br />
-          <em>27/03/2020</em></strong></td>
+          <em>30/03/2020</em></strong></td>
       <td align="left" valign="top">
         <ul>
           <li>
@@ -125,15 +125,13 @@ li:before {
             report
           </li>
         </ul>
-        <ul>
-          <em>Groovy Scripts</em>
-          <ul>
-            <li>
-              <!--  JAL-3547 -->exportconsensus.groovy prints a FASTA
-              file to stdout containing the consensus sequence for each
-              alignment in a Jalview session
-            </li>
-          </ul>
+        <em>Groovy Scripts</em>
+            <ul>
+          <li>
+            <!--  JAL-3547 -->exportconsensus.groovy prints a FASTA file
+            to stdout containing the consensus sequence for each
+            alignment in a Jalview session
+          </li>
         </ul>
       </td>
       <td align="left" valign="top">

diff --git a/src/jalview/io/SequenceAnnotationReport.java b/src/jalview/io/SequenceAnnotationReport.java
index 0ef4cc2..4933cd6 100644 (file)
--- a/src/jalview/io/SequenceAnnotationReport.java
+++ b/src/jalview/io/SequenceAnnotationReport.java
@@ -64,7 +64,7 @@ public class SequenceAnnotationReport
    * Comparator to order DBRefEntry by Source + accession id (case-insensitive),
    * with 'Primary' sources placed before others, and 'chromosome' first of all
    */
-  private static Comparator<DBRefEntry> comparator = new Comparator<>()
+  private static Comparator<DBRefEntry> comparator = new Comparator<DBRefEntry>()
   {
 
     @Override