X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Futil%2FUrlLink.java;h=429709097569f5c7db4bfb4a46df116f3e86e747;hb=fc9aecdad8fb4d6ac38e504b094b29cf2223b32b;hp=f9dda09c5ab2f96e69cf09ecc4dc8387ef12ecee;hpb=e2e909ef04c5ec3d5b87cd6cc6fe5d6cc4cb3ac6;p=jalview.git diff --git a/src/jalview/util/UrlLink.java b/src/jalview/util/UrlLink.java index f9dda09..872f432 100644 --- a/src/jalview/util/UrlLink.java +++ b/src/jalview/util/UrlLink.java @@ -86,6 +86,7 @@ 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 } /** @@ -261,13 +262,14 @@ public class UrlLink @Override public String toString() { + String var = (uses_seq_id ? SEQUENCE_ID : SEQUENCE_NAME); + return label + "|" + url_prefix - + (dynamic ? ("$" + SEQUENCE_ID + ((regexReplace != null) ? "=" + + (dynamic ? ("$" + var + ((regexReplace != null) ? "=" + regexReplace + "=$" : "$")) : "") + ((url_suffix == null) ? "" : url_suffix); - } /**