git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1114062
)
JAL-4036 Changes made from code review CR-JAL-265
author
Ben Soares
<b.soares@dundee.ac.uk>
Fri, 22 Jul 2022 17:17:34 +0000
(18:17 +0100)
committer
Ben Soares
<b.soares@dundee.ac.uk>
Fri, 22 Jul 2022 17:17:34 +0000
(18:17 +0100)
src/jalview/fts/core/GFTSPanel.java
patch
|
blob
|
history
src/jalview/fts/service/uniprot/UniProtFTSRestClient.java
patch
|
blob
|
history
src/jalview/fts/service/uniprot/UniprotFTSPanel.java
patch
|
blob
|
history
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));
}
txt_search.getComponent().setToolTipText(
JvSwingUtils.wrapTooltip(true, tooltipText));
- if (btn_autosearch.isSelected())
- searchAction(true);
+ // if (btn_autosearch.isSelected())
+ searchAction(true);
setCmbSearchTargetTooltip();
}
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();
{
super();
this.clearCursors();
- uniprotSearchEndpoint = Cache.getDefault("UNIPROT_DOMAIN",
+ uniprotSearchEndpoint = Cache.getDefault("UNIPROT_2022_DOMAIN",
DEFAULT_UNIPROT_DOMAIN) + "/uniprotkb/search";
}
DEFAULT_UNIPROT_DOMAIN) + "/uniprotkb/search";
}
@@
-247,7
+247,8
@@
public class UniProtFTSRestClient extends FTSRestClient
uniprotRestRequest, xTotalResults);
} catch (Exception e)
{
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"))
{
String exceptionMsg = e.getMessage();
if (exceptionMsg.contains("SocketException"))
{
@@
-545,8
+546,7
@@
public class UniProtFTSRestClient extends FTSRestClient
}
} catch (MalformedURLException e)
{
}
} catch (MalformedURLException e)
{
- // TODO Auto-generated catch block
- e.printStackTrace();
+ Console.warn("Could not obtain next page 'cursor' value from 'u");
}
return null;
}
}
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 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";
private static final String UNIPROT_AUTOSEARCH = "FTS.UNIPROT.AUTOSEARCH";