From cd06f45d5fedf6fcc87c0d77aa6c2b1fb6ea7a46 Mon Sep 17 00:00:00 2001 From: kiramt Date: Wed, 2 Nov 2016 15:22:45 +0000 Subject: [PATCH] JAL-2281 Use DBRefs.selectRefs to uppercase URL link target --- src/jalview/util/DBRefUtils.java | 4 ++-- src/jalview/util/UrlLink.java | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/jalview/util/DBRefUtils.java b/src/jalview/util/DBRefUtils.java index e6aa472..04cb75e 100755 --- a/src/jalview/util/DBRefUtils.java +++ b/src/jalview/util/DBRefUtils.java @@ -100,14 +100,14 @@ public class DBRefUtils HashSet srcs = new HashSet(); for (String src : sources) { - srcs.add(src); + srcs.add(src.toUpperCase()); } List res = new ArrayList(); for (DBRefEntry dbr : dbrefs) { String source = getCanonicalName(dbr.getSource()); - if (srcs.contains(source)) + if (srcs.contains(source.toUpperCase())) { res.add(dbr); } diff --git a/src/jalview/util/UrlLink.java b/src/jalview/util/UrlLink.java index b8e3eeb..3ee6432 100644 --- a/src/jalview/util/UrlLink.java +++ b/src/jalview/util/UrlLink.java @@ -104,8 +104,6 @@ public class UrlLink label = label.trim(); target = target.trim(); - target = target.toUpperCase(); // DBRefEntry uppercases DB names - // NB getCanonicalName might be better but does not currently change case } /** -- 1.7.10.2