Merge branch 'develop' into feature/JAL-4386_calculate_tree_using_secondary_structure...

diff --cc src/jalview/gui/AlignFrame.java
Simple merge

diff --cc src/jalview/gui/AnnotationLabels.java
index 9478c6f,27417f0..e5a88d0
--- 1/src/jalview/gui/AnnotationLabels.java
--- 2/src/jalview/gui/AnnotationLabels.java
+++ b/src/jalview/gui/AnnotationLabels.java
@@@ -67,10 -65,9 +67,11 @@@ import jalview.datamodel.SequenceI
  import jalview.io.FileFormat;
  import jalview.io.FormatAdapter;
  import jalview.util.Comparison;
 +import jalview.util.Constants;
  import jalview.util.MessageManager;
+ import jalview.util.ParseHtmlBodyAndLinks;
  import jalview.util.Platform;
 +import jalview.workers.SecondaryStructureConsensusThread;
  
  /**
   * The panel that holds the labels for alignment annotations, providing
@@@ -1374,8 -1349,8 +1375,9 @@@ public class AnnotationLabels extends J
      }
      SequenceI lastSeqRef = null;
      String lastLabel = null;
+     String lastDescription = null;
      AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
 +    boolean isShowStructureProvider = av.isShowStructureProvider();
      int fontHeight = g != null ? g.getFont().getSize()
              : fm.getFont().getSize();
      int y = 0;

diff --cc src/jalview/gui/CalculationChooser.java
Simple merge

diff --cc src/jalview/gui/PCAPanel.java
Simple merge