Merge branch 'task/JAL-3577_Jalview_Test_installers' into develop

diff --git a/help/help/html/releases.html b/help/help/html/releases.html
index 06ff979..0097655 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>2/04/2020</em></strong></td>
+          <em>9/04/2020</em></strong></td>
       <td align="left" valign="top">
         <ul>
           <li>
@@ -119,6 +119,9 @@ li:before {
           <li>
             <!-- JAL-3508 -->New point release version scheme - 2.11.1.0
           </li>
+          <li>
+            <!-- JAL-3577 -->'Jalview Test' installers/apps for easier access to test-release channel builds            
+          </li> 
         </ul> <em>Build System</em>
         <ul>
           <li>
@@ -141,6 +144,14 @@ li:before {
       <td align="left" valign="top">
         <ul>
           <li>
+            <!-- JAL-3581 -->Hidden sequence markers still visible when
+            'Show hidden markers' option is not ticked
+          </li>
+          <li>
+            <!-- JAL-3571 -->Feature Editor dialog can be opened when
+            'Show Sequence Features' option is not ticked
+          </li>
+          <li>
             <!-- JAL-3549 -->Undo 'Null' operation shown after sort by
             buttons in Feature Settings dialog are clicked when no
             features are visible

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 1b8dda7..7564dda 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -143,7 +143,7 @@ public class Desktop extends jalview.jbgui.GDesktop
 
   protected static final String CONFIRM_KEYBOARD_QUIT = "CONFIRM_KEYBOARD_QUIT";
 
-  public static HashMap<String, FileWriter> savingFiles = new HashMap<>();
+  public static HashMap<String, FileWriter> savingFiles = new HashMap<String, FileWriter>();
 
   private JalviewChangeSupport changeSupport = new JalviewChangeSupport();
 

diff --git a/src/jalview/gui/IdCanvas.java b/src/jalview/gui/IdCanvas.java
index 793c005..a925227 100755 (executable)
--- a/src/jalview/gui/IdCanvas.java
+++ b/src/jalview/gui/IdCanvas.java
@@ -20,10 +20,6 @@
  */
 package jalview.gui;
 
-import jalview.datamodel.SequenceI;
-import jalview.viewmodel.ViewportListenerI;
-import jalview.viewmodel.ViewportRanges;
-
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Font;
@@ -37,6 +33,10 @@ import java.util.List;
 
 import javax.swing.JPanel;
 
+import jalview.datamodel.SequenceI;
+import jalview.viewmodel.ViewportListenerI;
+import jalview.viewmodel.ViewportRanges;
+
 /**
  * DOCUMENT ME!
  * 
@@ -137,7 +137,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI
     g.drawString(s.getDisplayId(av.getShowJVSuffix()), xPos,
             (((i - starty + 1) * charHeight) + ypos) - (charHeight / 5));
 
-    if (hiddenRows)
+    if (hiddenRows && av.getShowHiddenMarkers())
     {
       drawMarker(g, av, i, starty, ypos);
     }
@@ -359,7 +359,7 @@ public class IdCanvas extends JPanel implements ViewportListenerI
       g.drawString(string, xPos, (((i - startSeq) * charHeight) + charHeight)
               - (charHeight / 5));
 
-      if (hasHiddenRows)
+      if (hasHiddenRows && av.getShowHiddenMarkers())
       {
         drawMarker(g, alignViewport, i, startSeq, 0);
       }