Merge branch 'develop' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3

diff --git a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
index 980dac6..f5e98bd 100644 (file)
--- a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@ -227,18 +227,22 @@ public class UniProtFTSRestClient extends FTSRestClient
         throw new Exception(errorMessage);
 
       }
-      // new Uniprot API is not including a "X-Total-Results" header when there
-      // are 0 results
-      List<String> resultsHeaders = clientResponse.getHeaders()
-              .get("X-Total-Results");
       int xTotalResults = 0;
       if (Platform.isJS())
       {
         xTotalResults = 1;
       }
-      else if (resultsHeaders != null && resultsHeaders.size() >= 1)
+      else
       {
-        xTotalResults = Integer.valueOf(resultsHeaders.get(0));
+        // new Uniprot API is not including a "X-Total-Results" header when
+        // there
+        // are 0 results
+        List<String> resultsHeaders = clientResponse.getHeaders()
+                .get("X-Total-Results");
+        if (resultsHeaders != null && resultsHeaders.size() >= 1)
+        {
+          xTotalResults = Integer.valueOf(resultsHeaders.get(0));
+        }
       }
       clientResponse = null;
       client = null;

diff --git a/src/jalview/io/cache/JvCacheableInputBox.java b/src/jalview/io/cache/JvCacheableInputBox.java
index e4e2d99..be6ec37 100644 (file)
--- a/src/jalview/io/cache/JvCacheableInputBox.java
+++ b/src/jalview/io/cache/JvCacheableInputBox.java
@@ -20,10 +20,8 @@
  */
 package jalview.io.cache;
 
-import jalview.bin.Cache;
-import jalview.util.MessageManager;
-import jalview.util.Platform;
-
+import java.awt.Dimension;
+import java.awt.FontMetrics;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.FocusListener;
@@ -47,6 +45,10 @@ import javax.swing.event.CaretListener;
 import javax.swing.event.DocumentListener;
 import javax.swing.text.JTextComponent;
 
+import jalview.bin.Cache;
+import jalview.util.MessageManager;
+import jalview.util.Platform;
+
 /**
  * A class that provides an editable combobox with a memory of previous entries
  * that may be persisted
@@ -114,6 +116,9 @@ public class JvCacheableInputBox<E>
     {
       appCache = null;
       textComponent = textField = new JTextField();
+      FontMetrics fm = textField.getFontMetrics(textField.getFont());
+      textField.setPreferredSize(new Dimension(
+              fm.stringWidth(prototypeDisplayValue), fm.getHeight() + 4));
       // {
       // @Override
       // public Dimension getPreferredSize() {