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 'bug/JAL-98consensusMemory' into develop
[jalview.git]
/
src
/
jalview
/
util
/
UrlLink.java
diff --git
a/src/jalview/util/UrlLink.java
b/src/jalview/util/UrlLink.java
index
f9dda09
..
872f432
100644
(file)
--- 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
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()
{
@Override
public String toString()
{
+ String var = (uses_seq_id ? SEQUENCE_ID : SEQUENCE_NAME);
+
return label
+ "|"
+ url_prefix
return label
+ "|"
+ url_prefix
- + (dynamic ? ("$" + SEQUENCE_ID + ((regexReplace != null) ? "="
+ + (dynamic ? ("$" + var + ((regexReplace != null) ? "="
+ regexReplace + "=$" : "$")) : "")
+ ((url_suffix == null) ? "" : url_suffix);
+ regexReplace + "=$" : "$")) : "")
+ ((url_suffix == null) ? "" : url_suffix);
-
}
/**
}
/**