git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/JAL-3143ensemblJSON' into trialMerge
[jalview.git]
/
src
/
jalview
/
ext
/
ensembl
/
EnsemblFeatures.java
diff --git
a/src/jalview/ext/ensembl/EnsemblFeatures.java
b/src/jalview/ext/ensembl/EnsemblFeatures.java
index
2772498
..
2dd6ebb
100644
(file)
--- a/
src/jalview/ext/ensembl/EnsemblFeatures.java
+++ b/
src/jalview/ext/ensembl/EnsemblFeatures.java
@@
-109,18
+109,16
@@
class EnsemblFeatures extends EnsemblRestClient
* @return
*/
@SuppressWarnings("unchecked")
* @return
*/
@SuppressWarnings("unchecked")
-private SequenceI parseFeaturesJson(List<String> queries)
+ private SequenceI parseFeaturesJson(List<String> queries)
{
{
-
-
SequenceI seq = new Sequence("Dummy", "");
SequenceI seq = new Sequence("Dummy", "");
-
try
{
try
{
-
Iterator<Object> rvals = (Iterator<Object>) getJSON(null, queries, -1, MODE_ITERATOR, null);
if (rvals == null)
Iterator<Object> rvals = (Iterator<Object>) getJSON(null, queries, -1, MODE_ITERATOR, null);
if (rvals == null)
+ {
return null;
return null;
+ }
while (rvals.hasNext())
{
try
while (rvals.hasNext())
{
try
@@
-178,31
+176,33
@@
private SequenceI parseFeaturesJson(List<String> queries)
return seq;
}
return seq;
}
-
-/**
- * Returns the first non-null attribute found (if any) as a string
+ /**
+ * Returns the first non-null attribute found (if any) as a string, formatted
+ * suitably for display as feature description or tooltip. Answers null if
+ * none of the attribute keys is present.
*
* @param obj
* @param keys
* @return
*/
*
* @param obj
* @param keys
* @return
*/
+ @SuppressWarnings("unchecked")
protected String getFirstNotNull(Map<String, Object> obj, String... keys)
{
protected String getFirstNotNull(Map<String, Object> obj, String... keys)
{
- String desc = null;
-
for (String key : keys)
{
Object val = obj.get(key);
if (val != null)
{
for (String key : keys)
{
Object val = obj.get(key);
if (val != null)
{
- String s = val.toString();
+ String s = val instanceof List<?>
+ ? JSONUtils.arrayToStringList((List<Object>) val)
+ : val.toString();
if (!s.isEmpty())
{
return s;
}
}
}
if (!s.isEmpty())
{
return s;
}
}
}
- return desc;
+ return null;
}
/**
}
/**