X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FUrlLink.java;fp=src%2Fjalview%2Futil%2FUrlLink.java;h=007da86f5d00fb2b2b9d3303972dd45839a07e77;hb=be762d8d9c71a7aa3121e845c45911c7192b7827;hp=0529c73790acf1a05841714563d0b1755b59a44f;hpb=d1bb7a31fc091606aedbc255a5766ac79e36fa91;p=jalview.git diff --git a/src/jalview/util/UrlLink.java b/src/jalview/util/UrlLink.java index 0529c73..007da86 100644 --- a/src/jalview/util/UrlLink.java +++ b/src/jalview/util/UrlLink.java @@ -176,8 +176,12 @@ public class UrlLink String var = (usesDBaccession ? DB_ACCESSION : SEQUENCE_ID); return urlPrefix - + (dynamic ? (DELIM + var + ((regexReplace != null) ? EQUALS - + regexReplace + EQUALS + DELIM : DELIM)) : "") + + (dynamic + ? (DELIM + var + + ((regexReplace != null) + ? EQUALS + regexReplace + EQUALS + DELIM + : DELIM)) + : "") + ((urlSuffix == null) ? "" : urlSuffix); } @@ -262,8 +266,8 @@ public class UrlLink { if (regexReplace != null) { - com.stevesoft.pat.Regex rg = com.stevesoft.pat.Regex.perlCode("/" - + regexReplace + "/"); + com.stevesoft.pat.Regex rg = com.stevesoft.pat.Regex + .perlCode("/" + regexReplace + "/"); if (rg.search(idstring)) { int ns = rg.numSubs(); @@ -321,8 +325,8 @@ public class UrlLink if (rg.matchedFrom(s) > -1) { subs.addElement(rg.stringMatched(s)); - subs.addElement(urlPrefix + rg.stringMatched(s) - + urlSuffix); + subs.addElement( + urlPrefix + rg.stringMatched(s) + urlSuffix); } s++; } @@ -470,8 +474,8 @@ public class UrlLink regexReplace = link.substring(sqidPos + startLength, p); try { - com.stevesoft.pat.Regex rg = com.stevesoft.pat.Regex.perlCode("/" - + regexReplace + "/"); + com.stevesoft.pat.Regex rg = com.stevesoft.pat.Regex + .perlCode("/" + regexReplace + "/"); if (rg == null) { invalidMessage = "Invalid Regular Expression : '" + regexReplace @@ -573,7 +577,8 @@ public class UrlLink { // collect matching db-refs DBRefEntry[] dbr = DBRefUtils.selectRefs(seq.getDBRefs(), - new String[] { target }); + new String[] + { target }); // if there are any dbrefs which match up with the link if (dbr != null)