JAL-4036 Changes made from code review CR-JAL-265

diff --git a/src/jalview/fts/core/GFTSPanel.java b/src/jalview/fts/core/GFTSPanel.java
index a6ef37d..d52ff89 100644 (file)
--- a/src/jalview/fts/core/GFTSPanel.java
+++ b/src/jalview/fts/core/GFTSPanel.java
@@ -544,8 +544,8 @@ public abstract class GFTSPanel extends JPanel implements GFTSPanelI
           }
           txt_search.getComponent().setToolTipText(
                   JvSwingUtils.wrapTooltip(true, tooltipText));
-          if (btn_autosearch.isSelected())
-            searchAction(true);
+          // if (btn_autosearch.isSelected())
+          searchAction(true);
 
           setCmbSearchTargetTooltip();
         }

diff --git a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
index 05ccba7..88397f5 100644 (file)
--- a/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
+++ b/src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
@@ -95,7 +95,7 @@ public class UniProtFTSRestClient extends FTSRestClient
   {
     super();
     this.clearCursors();
-    uniprotSearchEndpoint = Cache.getDefault("UNIPROT_DOMAIN",
+    uniprotSearchEndpoint = Cache.getDefault("UNIPROT_2022_DOMAIN",
             DEFAULT_UNIPROT_DOMAIN) + "/uniprotkb/search";
   }
 
@@ -247,7 +247,8 @@ public class UniProtFTSRestClient extends FTSRestClient
               uniprotRestRequest, xTotalResults);
     } catch (Exception e)
     {
-      Console.debug("Exception caught from response", e);
+      Console.warn("Problem with the query: " + e.getMessage());
+      Console.debug("Exception stacktrace:", e);
       String exceptionMsg = e.getMessage();
       if (exceptionMsg.contains("SocketException"))
       {
@@ -545,8 +546,7 @@ public class UniProtFTSRestClient extends FTSRestClient
       }
     } catch (MalformedURLException e)
     {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
+      Console.warn("Could not obtain next page 'cursor' value from 'u");
     }
     return null;
   }

diff --git a/src/jalview/fts/service/uniprot/UniprotFTSPanel.java b/src/jalview/fts/service/uniprot/UniprotFTSPanel.java
index 68a5696..aa0942f 100644 (file)
--- a/src/jalview/fts/service/uniprot/UniprotFTSPanel.java
+++ b/src/jalview/fts/service/uniprot/UniprotFTSPanel.java
@@ -47,7 +47,7 @@ public class UniprotFTSPanel extends GFTSPanel
 
   private static Map<String, Integer> tempUserPrefs = new HashMap<>();
 
-  private static final String UNIPROT_FTS_CACHE_KEY = "CACHE.UNIPROT_FTS";
+  private static final String UNIPROT_FTS_CACHE_KEY = "CACHE.UNIPROT_2022_FTS";
 
   private static final String UNIPROT_AUTOSEARCH = "FTS.UNIPROT.AUTOSEARCH";