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 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
[jalview.git]
/
src
/
jalview
/
io
/
SequenceAnnotationReport.java
diff --git
a/src/jalview/io/SequenceAnnotationReport.java
b/src/jalview/io/SequenceAnnotationReport.java
index
1f92428
..
6b82671
100644
(file)
--- a/
src/jalview/io/SequenceAnnotationReport.java
+++ b/
src/jalview/io/SequenceAnnotationReport.java
@@
-210,11
+210,12
@@
public class SequenceAnnotationReport
FeatureColourI fc = fr.getFeatureColours().get(feature.getType());
if (fc != null && fc.isColourByAttribute())
{
FeatureColourI fc = fr.getFeatureColours().get(feature.getType());
if (fc != null && fc.isColourByAttribute())
{
- String attName = fc.getAttributeName();
+ String[] attName = fc.getAttributeName();
String attVal = feature.getValueAsString(attName);
if (attVal != null)
{
String attVal = feature.getValueAsString(attName);
if (attVal != null)
{
- sb.append("; ").append(attName).append("=").append(attVal);
+ sb.append("; ").append(String.join(":", attName)).append("=")
+ .append(attVal);
}
}
}
}
}
}
@@
-301,7
+302,7
@@
public class SequenceAnnotationReport
*/
Collection<List<String>> createLinksFrom(SequenceI seq, String link)
{
*/
Collection<List<String>> createLinksFrom(SequenceI seq, String link)
{
- Map<String, List<String>> urlSets = new LinkedHashMap<String, List<String>>();
+ Map<String, List<String>> urlSets = new LinkedHashMap<>();
UrlLink urlLink = new UrlLink(link);
if (!urlLink.isValid())
{
UrlLink urlLink = new UrlLink(link);
if (!urlLink.isValid())
{