Merge branch 'develop' into bug/JAL-2210_ensembl_uniprot_primaryrefs_alternate

diff --combined test/jalview/gui/StructureChooserTest.java
index 16dfa6b,4c7df46..1e41a16
--- 1/test/jalview/gui/StructureChooserTest.java
--- 2/test/jalview/gui/StructureChooserTest.java
+++ b/test/jalview/gui/StructureChooserTest.java
@@@ -44,7 -44,7 +44,7 @@@ public class StructureChooserTes
    {
      seq = new Sequence("PDB|4kqy|4KQY|A", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1,
              26);
 -    seq.setDatasetSequence(seq);
 +    seq.createDatasetSequence();
      for (int x = 1; x < 5; x++)
      {
        DBRefEntry dbRef = new DBRefEntry();
@@@ -105,24 -105,16 +105,16 @@@
    }
  
    @Test(groups = { "Functional" })
-   public void populateFilterComboBoxTest()
+   public void populateFilterComboBoxTest() throws InterruptedException
    {
      SequenceI[] selectedSeqs = new SequenceI[] { seq };
      StructureChooser sc = new StructureChooser(selectedSeqs, seq, null);
-     sc.populateFilterComboBox();
+     sc.populateFilterComboBox(false);
      int optionsSize = sc.getCmbFilterOption().getItemCount();
      assertEquals(3, optionsSize); // if structures are not discovered then don't
                                    // populate filter options
  
-     sc.setStructuresDiscovered(true);
-     sc.populateFilterComboBox();
-     try
-     {
-       Thread.sleep(2000);
-     } catch (InterruptedException e)
-     {
-       e.printStackTrace();
-     }
+     sc.populateFilterComboBox(true);
      optionsSize = sc.getCmbFilterOption().getItemCount();
      assertTrue(optionsSize > 3); // if structures are found, filter options
                                   // should be populated