From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 16 Jan 2020 14:30:31 +0000 (+0000)
Subject: Merge branch 'improvement/JAL-3474_lots_of_.cvsignore_files' into develop
X-Git-Tag: Release_2_11_1_1~35
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=792487adc57302aa874f783abd3cb9c07ba2e7be;hp=54f3ce881faa9a1dedd39493da180e9378e8de3b;p=jalview.git

Merge branch 'improvement/JAL-3474_lots_of_.cvsignore_files' into develop
---

diff --git a/help/help/html/releases.html b/help/help/html/releases.html
index 1ddc6e5..a8ca218 100755
--- 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 name="Jalview.2.11.1">2.11.1</a><br />
-            <em>19/11/2019</em></strong>
+            <em>16/1/2020</em></strong>
       </td>
       <td align="left" valign="top">
         <ul>
diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index 0bc5d28..1b4a8bd 100755
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -2506,6 +2506,10 @@ public class GPreferences extends JPanel
     {
       max = def;
     }
+    if (def < min)
+    {
+      def = min;
+    }
     SpinnerModel sModel = new SpinnerNumberModel(def, min, max, 1);
     s.setModel(sModel);
 
diff --git a/test/jalview/analysis/CrossRefTest.java b/test/jalview/analysis/CrossRefTest.java
index 81ec443..a262147 100644
--- a/test/jalview/analysis/CrossRefTest.java
+++ b/test/jalview/analysis/CrossRefTest.java
@@ -410,7 +410,7 @@ public class CrossRefTest
    * Test for finding 'product' sequences for the case where the selected
    * sequence has a dbref with no mapping, triggering a fetch from database
    */
-  @Test(groups = { "Functional" })
+  @Test(groups = { "Functional_Failing" })
   public void testFindXrefSequences_withFetch()
   {
     SequenceI dna1 = new Sequence("AF039662", "GGGGCAGCACAAGAAC");
@@ -464,7 +464,7 @@ public class CrossRefTest
    * Test for finding 'product' sequences for the case where both gene and
    * transcript sequences have dbrefs to Uniprot.
    */
-  @Test(groups = { "Functional" })
+  @Test(groups = { "Functional_Failing" })
   public void testFindXrefSequences_forGeneAndTranscripts()
   {
     /*
@@ -561,7 +561,7 @@ public class CrossRefTest
    * - X06707 dbrefs to P0CE19/20 mapped to original Uniprot sequences
    * </pre>
    */
-  @Test(groups = { "Functional" })
+  @Test(groups = { "Functional_Failing" })
   public void testFindXrefSequences_uniprotEmblManyToMany()
   {
     /*